--- branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp 2003/12/27 14:33:13 1300 +++ branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp 2004/01/31 13:44:56 1345 @@ -3,7 +3,7 @@ * XVID MPEG-4 VIDEO CODEC * - XviD Decoder part of the DShow Filter - * - * Copyright(C) 2002-2003 Peter Ross + * Copyright(C) 2002-2004 Peter Ross * * This program is free software ; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -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.7 2003-12-27 14:33:13 Isibaar Exp $ + * $Id: CXvidDecoder.cpp,v 1.1.2.16 2004-01-31 13:44:33 suxen_drol Exp $ * ****************************************************************************/ @@ -60,21 +60,20 @@ #include "IXvidDecoder.h" #include "CXvidDecoder.h" #include "CAbout.h" +#include "config.h" +#include "debug.h" -// Externs defined here -PostProcessing_Settings PPSettings; -int rgb_flip; - -bool USE_IYUV; -bool USE_YV12; -bool USE_YUY2; -bool USE_YVYU; -bool USE_UYVY; -bool USE_RGB32; -bool USE_RGB24; -bool USE_RG555; -bool USE_RG565; +static int rgb_flip; +static bool USE_IYUV; +static bool USE_YV12; +static bool USE_YUY2; +static bool USE_YVYU; +static bool USE_UYVY; +static bool USE_RGB32; +static bool USE_RGB24; +static bool USE_RG555; +static bool USE_RG565; const AMOVIESETUP_MEDIATYPE sudInputPinTypes[] = { @@ -84,6 +83,7 @@ { &MEDIATYPE_Video, &CLSID_DIVX_UC }, { &MEDIATYPE_Video, &CLSID_DX50 }, { &MEDIATYPE_Video, &CLSID_DX50_UC }, + { &MEDIATYPE_Video, &CLSID_MP4V }, }; const AMOVIESETUP_MEDIATYPE sudOutputPinTypes[] = @@ -150,6 +150,8 @@ }; + +/* note: g_cTemplates must be global; used by strmbase.lib(dllentry.cpp,dllsetup.cpp) */ int g_cTemplates = sizeof(g_Templates) / sizeof(CFactoryTemplate); @@ -201,6 +203,8 @@ /* constructor */ +#define XVID_DLL_NAME "xvidcore.dll" + CXvidDecoder::CXvidDecoder(LPUNKNOWN punk, HRESULT *phr) : CVideoTransformFilter(NAME("CXvidDecoder"), punk, CLSID_XVID) { @@ -209,7 +213,29 @@ xvid_gbl_init_t init; memset(&init, 0, sizeof(init)); init.version = XVID_VERSION; - if (xvid_global(0, XVID_GBL_INIT, &init, NULL) < 0) + + ar_x = ar_y = 0; + + m_hdll = LoadLibrary(XVID_DLL_NAME); + if (m_hdll == NULL) { + DPRINTF("dll load failed"); + MessageBox(0, XVID_DLL_NAME " not found","Error", 0); + return; + } + + xvid_global_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_global"); + if (xvid_global_func == NULL) { + MessageBox(0, "xvid_global() not found", "Error", 0); + return; + } + + xvid_decore_func = (int (__cdecl *)(void *, int, void *, void *))GetProcAddress(m_hdll, "xvid_decore"); + if (xvid_decore_func == NULL) { + MessageBox(0, "xvid_decore() not found", "Error", 0); + return; + } + + if (xvid_global_func(0, XVID_GBL_INIT, &init, NULL) < 0) { MessageBox(0, "xvid_global() failed", "Error", 0); return; @@ -222,19 +248,7 @@ memset(&m_frame, 0, sizeof(m_frame)); m_frame.version = XVID_VERSION; - HKEY hKey; - DWORD size; - RegOpenKeyEx(XVID_REG_KEY, XVID_REG_SUBKEY, 0, KEY_READ, &hKey); - - // 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("ForceColorspace", PPSettings.nForceColorspace, 0) - - RegCloseKey(hKey); + LoadRegistryInfo(); USE_IYUV = false; USE_YV12 = false; @@ -246,7 +260,7 @@ USE_RG555 = false; USE_RG565 = false; - switch ( PPSettings.nForceColorspace ) + switch ( g_config.nForceColorspace ) { case FORCE_NONE: USE_IYUV = true; @@ -285,9 +299,15 @@ if (m_create.handle != NULL) { - xvid_decore(m_create.handle, XVID_DEC_DESTROY, 0, 0); + xvid_decore_func(m_create.handle, XVID_DEC_DESTROY, 0, 0); m_create.handle = NULL; } + + if (m_hdll != NULL) + { + FreeLibrary(m_hdll); + m_hdll = NULL; + } } @@ -309,11 +329,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 { @@ -331,10 +357,18 @@ switch(hdr->biCompression) { + + case FOURCC_MP4V: + if (!(g_config.supported_4cc & SUPPORT_MP4V)) return VFW_E_TYPE_NOT_ACCEPTED; + break; + case FOURCC_DIVX : + if (!(g_config.supported_4cc & SUPPORT_DIVX)) return VFW_E_TYPE_NOT_ACCEPTED; + break; + case FOURCC_DX50 : + if (!(g_config.supported_4cc & SUPPORT_DX50)) return VFW_E_TYPE_NOT_ACCEPTED; case FOURCC_XVID : -// case FOURCC_DIVX : -// case FOURCC_DX50 : break; + default : DPRINTF("Unknown fourcc: 0x%08x (%c%c%c%c)", @@ -345,7 +379,6 @@ (hdr->biCompression>>24)&0xff); return VFW_E_TYPE_NOT_ACCEPTED; } - return S_OK; } @@ -362,7 +395,7 @@ return E_UNEXPECTED; } - VIDEOINFOHEADER * vih = (VIDEOINFOHEADER *) mtOut->ReallocFormatBuffer(sizeof(VIDEOINFOHEADER)); + VIDEOINFOHEADER2 * vih = (VIDEOINFOHEADER2 *) mtOut->ReallocFormatBuffer(sizeof(VIDEOINFOHEADER2)); if (vih == NULL) { return E_OUTOFMEMORY; @@ -381,23 +414,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; @@ -405,7 +423,7 @@ mtOut->SetSubtype(&MEDIASUBTYPE_YUY2); break; } - case 3 : + case 1 : if ( USE_YVYU ) { vih->bmiHeader.biCompression = MEDIASUBTYPE_YVYU.Data1; @@ -413,7 +431,7 @@ mtOut->SetSubtype(&MEDIASUBTYPE_YVYU); break; } - case 4 : + case 2 : if ( USE_UYVY ) { vih->bmiHeader.biCompression = MEDIASUBTYPE_UYVY.Data1; @@ -421,6 +439,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 ) { @@ -459,8 +493,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); @@ -492,28 +534,33 @@ if (subtype == CLSID_MEDIASUBTYPE_IYUV) { DPRINTF("IYUV"); + rgb_flip = 0; m_frame.output.csp = XVID_CSP_I420; m_frame.output.stride[0] = (m_frame.output.stride[0] * 2) / 3; /* planar format fix */ } else if (subtype == MEDIASUBTYPE_YV12) { DPRINTF("YV12"); + rgb_flip = 0; m_frame.output.csp = XVID_CSP_YV12; m_frame.output.stride[0] = (m_frame.output.stride[0] * 2) / 3; /* planar format fix */ } else if (subtype == MEDIASUBTYPE_YUY2) { DPRINTF("YUY2"); + rgb_flip = 0; m_frame.output.csp = XVID_CSP_YUY2; } else if (subtype == MEDIASUBTYPE_YVYU) { DPRINTF("YVYU"); + rgb_flip = 0; m_frame.output.csp = XVID_CSP_YVYU; } else if (subtype == MEDIASUBTYPE_UYVY) { DPRINTF("UYVY"); + rgb_flip = 0; m_frame.output.csp = XVID_CSP_UYVY; } else if (subtype == MEDIASUBTYPE_RGB32) @@ -620,7 +667,7 @@ if (m_create.handle == NULL) { - if (xvid_decore(0, XVID_DEC_CREATE, &m_create, 0) < 0) + if (xvid_decore_func(0, XVID_DEC_CREATE, &m_create, 0) < 0) { DPRINTF("*** XVID_DEC_CREATE error"); return S_FALSE; @@ -659,36 +706,26 @@ if (pIn->IsDiscontinuity() == S_OK) m_frame.general = XVID_DISCONTINUITY; - if (PPSettings.bDeblock_Y) + if (g_config.nDeblock_Y) m_frame.general |= XVID_DEBLOCKY; - if (PPSettings.bDeblock_UV) + if (g_config.nDeblock_UV) m_frame.general |= XVID_DEBLOCKUV; /* - if (PPSettings.bDering) + if (g_config.nDering) m_frame.general |= XVID_DERING; */ - if (PPSettings.bFilmEffect) + if (g_config.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^(g_config.nFlipVideo ? XVID_CSP_VFLIP : 0); repeat : if (pIn->IsPreroll() != S_OK) { - length = xvid_decore(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats); + length = xvid_decore_func(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats); if (length < 0) { @@ -709,7 +746,7 @@ /* m_frame.general &= ~XVID_DERING; */ m_frame.general &= ~XVID_FILMEFFECT; - length = xvid_decore(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats); + length = xvid_decore_func(m_create.handle, XVID_DEC_DECODE, &m_frame, &stats); if (length < 0) { DPRINTF("*** XVID_DEC_DECODE"); @@ -720,7 +757,7 @@ m_frame.general = tmp_gen; } - if (stats.type == XVID_TYPE_NOTHING) { + if (stats.type == XVID_TYPE_NOTHING && length > 0) { DPRINTF("B-Frame decoder lag"); return S_FALSE; }