--- branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp	2004/01/02 13:18:28	1301
+++ branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp	2004/01/26 05:49:42	1334
@@ -19,7 +19,7 @@
  *  along with this program ; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  *
- * $Id: CXvidDecoder.cpp,v 1.1.2.8 2004-01-02 13:18:28 syskin Exp $
+ * $Id: CXvidDecoder.cpp,v 1.1.2.12 2004-01-26 05:49:42 syskin Exp $
  *
  ****************************************************************************/
 
@@ -212,6 +212,8 @@
 	memset(&init, 0, sizeof(init));
 	init.version = XVID_VERSION;
 
+	ar_x = ar_y = 0;
+
 	m_hdll = LoadLibrary(XVID_DLL_NAME);
 	if (m_hdll == NULL) {
 		DPRINTF("dll load failed");
@@ -250,11 +252,12 @@
 
 	// Set the default post-processing settings
 	REG_GET_N("Brightness", PPSettings.nBrightness, 25)
-	REG_GET_N("Deblock_Y",  PPSettings.bDeblock_Y, 1)
-	REG_GET_N("Deblock_UV", PPSettings.bDeblock_UV, 1)
-	REG_GET_N("Dering",  PPSettings.bDering, 1)
-	REG_GET_N("FilmEffect", PPSettings.bFilmEffect, 1)
+	REG_GET_N("Deblock_Y",  PPSettings.nDeblock_Y, 0)
+	REG_GET_N("Deblock_UV", PPSettings.nDeblock_UV, 0)
+	REG_GET_N("Dering",  PPSettings.nDering, 0)
+	REG_GET_N("FilmEffect", PPSettings.nFilmEffect, 0)
 	REG_GET_N("ForceColorspace", PPSettings.nForceColorspace, 0)
+	REG_GET_N("FlipVideo",  PPSettings.nFlipVideo, 0)
 
 	RegCloseKey(hKey);
 
@@ -337,11 +340,17 @@
 	{
 		VIDEOINFOHEADER * vih = (VIDEOINFOHEADER *) mtIn->Format();
 		hdr = &vih->bmiHeader;
+		/* PAR (x:y) is (1/ppm_X):(1/ppm_Y) where ppm is pixels-per-meter
+		   which is equal to ppm_Y:ppm_X */
+		ar_x = vih->bmiHeader.biYPelsPerMeter*hdr->biWidth;
+		ar_y = vih->bmiHeader.biXPelsPerMeter*hdr->biHeight;
 	}
 	else if (*mtIn->FormatType() == FORMAT_VideoInfo2)
 	{
 		VIDEOINFOHEADER2 * vih2 = (VIDEOINFOHEADER2 *) mtIn->Format();
 		hdr = &vih2->bmiHeader;
+		ar_x = vih2->dwPictAspectRatioX;
+		ar_y = vih2->dwPictAspectRatioY;
 	}
 	else
 	{
@@ -390,7 +399,7 @@
 		return E_UNEXPECTED;
 	}
 
-	VIDEOINFOHEADER * vih = (VIDEOINFOHEADER *) mtOut->ReallocFormatBuffer(sizeof(VIDEOINFOHEADER));
+	VIDEOINFOHEADER2 * vih = (VIDEOINFOHEADER2 *) mtOut->ReallocFormatBuffer(sizeof(VIDEOINFOHEADER2));
 	if (vih == NULL)
 	{
 		return E_OUTOFMEMORY;
@@ -409,23 +418,8 @@
 
 	switch(iPosition)
 	{
-	case 0	:
-if ( USE_IYUV )
-{
-		vih->bmiHeader.biCompression = CLSID_MEDIASUBTYPE_IYUV.Data1;
-		vih->bmiHeader.biBitCount = 12;
-		mtOut->SetSubtype(&CLSID_MEDIASUBTYPE_IYUV);
-		break;
-}
-	case 1	:
-if ( USE_YV12 )
-{
-		vih->bmiHeader.biCompression = MEDIASUBTYPE_YV12.Data1;
-		vih->bmiHeader.biBitCount = 12;
-		mtOut->SetSubtype(&MEDIASUBTYPE_YV12);
-		break;
-}
-	case 2:
+
+	case 0:
 if ( USE_YUY2 )
 {
 		vih->bmiHeader.biCompression = MEDIASUBTYPE_YUY2.Data1;
@@ -433,7 +427,7 @@
 		mtOut->SetSubtype(&MEDIASUBTYPE_YUY2);
 		break;
 }
-	case 3 :
+	case 1 :
 if ( USE_YVYU )
 {
 		vih->bmiHeader.biCompression = MEDIASUBTYPE_YVYU.Data1;
@@ -441,7 +435,7 @@
 		mtOut->SetSubtype(&MEDIASUBTYPE_YVYU);
 		break;
 }
-	case 4 :
+	case 2 :
 if ( USE_UYVY )
 {
 		vih->bmiHeader.biCompression = MEDIASUBTYPE_UYVY.Data1;
@@ -449,6 +443,22 @@
 		mtOut->SetSubtype(&MEDIASUBTYPE_UYVY);
 		break;
 }
+	case 3	:
+		if ( USE_IYUV )
+{
+		vih->bmiHeader.biCompression = CLSID_MEDIASUBTYPE_IYUV.Data1;
+		vih->bmiHeader.biBitCount = 12;
+		mtOut->SetSubtype(&CLSID_MEDIASUBTYPE_IYUV);
+		break;
+}
+	case 4	:
+if ( USE_YV12 )
+{
+		vih->bmiHeader.biCompression = MEDIASUBTYPE_YV12.Data1;
+		vih->bmiHeader.biBitCount = 12;
+		mtOut->SetSubtype(&MEDIASUBTYPE_YV12);
+		break;
+}
 	case 5 :
 if ( USE_RGB32 )
 {
@@ -487,8 +497,16 @@
 
 	vih->bmiHeader.biSizeImage = GetBitmapSize(&vih->bmiHeader);
 
+	if (ar_x != 0 && ar_y != 0) {
+		vih->dwPictAspectRatioX = ar_x;
+		vih->dwPictAspectRatioY = ar_y;
+	} else { // just to be safe
+		vih->dwPictAspectRatioX = m_create.width;
+		vih->dwPictAspectRatioY = m_create.height;
+	}
+
 	mtOut->SetType(&MEDIATYPE_Video);
-	mtOut->SetFormatType(&FORMAT_VideoInfo);
+	mtOut->SetFormatType(&FORMAT_VideoInfo2);
 	mtOut->SetTemporalCompression(FALSE);
 	mtOut->SetSampleSize(vih->bmiHeader.biSizeImage);
 
@@ -687,30 +705,20 @@
 	if (pIn->IsDiscontinuity() == S_OK)
 		m_frame.general = XVID_DISCONTINUITY;
 
-	if (PPSettings.bDeblock_Y)
+	if (PPSettings.nDeblock_Y)
 		m_frame.general |= XVID_DEBLOCKY;
 
-	if (PPSettings.bDeblock_UV)
+	if (PPSettings.nDeblock_UV)
 		m_frame.general |= XVID_DEBLOCKUV;
 /*
-	if (PPSettings.bDering)
+	if (PPSettings.nDering)
 		m_frame.general |= XVID_DERING;
 */
-	if (PPSettings.bFilmEffect)
+	if (PPSettings.nFilmEffect)
 		m_frame.general |= XVID_FILMEFFECT;
 
-	if (PPSettings.bFlipVideo) {
-		if (rgb_flip)
-			m_frame.output.csp &= ~XVID_CSP_VFLIP;
-		else
-			m_frame.output.csp |= XVID_CSP_VFLIP;
-	}
-	else {
-		if (rgb_flip)
-			m_frame.output.csp |= XVID_CSP_VFLIP;
-		else
-			m_frame.output.csp &= ~XVID_CSP_VFLIP;
-	}
+	m_frame.output.csp &= ~XVID_CSP_VFLIP;
+	m_frame.output.csp |= rgb_flip^(PPSettings.nFlipVideo ? XVID_CSP_VFLIP : 0);
 
 repeat :