[svn] / branches / dev-api-4 / xvidcore / dshow / src / CXvidDecoder.cpp Repository:
ViewVC logotype

Diff of /branches/dev-api-4/xvidcore/dshow/src/CXvidDecoder.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1343, Fri Jan 30 13:13:10 2004 UTC revision 1353, Sat Feb 7 03:57:39 2004 UTC
# Line 3  Line 3 
3   *  XVID MPEG-4 VIDEO CODEC   *  XVID MPEG-4 VIDEO CODEC
4   *  - XviD Decoder part of the DShow Filter  -   *  - XviD Decoder part of the DShow Filter  -
5   *   *
6   *  Copyright(C) 2002-2003 Peter Ross <pross@xvid.org>   *  Copyright(C) 2002-2004 Peter Ross <pross@xvid.org>
7   *   *
8   *  This program is free software ; you can redistribute it and/or modify   *  This program is free software ; you can redistribute it and/or modify
9   *  it under the terms of the GNU General Public License as published by   *  it under the terms of the GNU General Public License as published by
# Line 19  Line 19 
19   *  along with this program ; if not, write to the Free Software   *  along with this program ; if not, write to the Free Software
20   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
21   *   *
22   * $Id: CXvidDecoder.cpp,v 1.1.2.15 2004-01-30 13:13:10 syskin Exp $   * $Id: CXvidDecoder.cpp,v 1.1.2.18 2004-02-07 03:57:39 syskin Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 60  Line 60 
60  #include "IXvidDecoder.h"  #include "IXvidDecoder.h"
61  #include "CXvidDecoder.h"  #include "CXvidDecoder.h"
62  #include "CAbout.h"  #include "CAbout.h"
63    #include "config.h"
64    #include "debug.h"
65    
66  // Externs defined here  static bool USE_IYUV;
67  PostProcessing_Settings PPSettings;  static bool USE_YV12;
68  unsigned int supported_4cc;  static bool USE_YUY2;
69  int rgb_flip;  static bool USE_YVYU;
70    static bool USE_UYVY;
71    static bool USE_RGB32;
72  bool USE_IYUV;  static bool USE_RGB24;
73  bool USE_YV12;  static bool USE_RG555;
74  bool USE_YUY2;  static bool USE_RG565;
 bool USE_YVYU;  
 bool USE_UYVY;  
 bool USE_RGB32;  
 bool USE_RGB24;  
 bool USE_RG555;  
 bool USE_RG565;  
75    
76  const AMOVIESETUP_MEDIATYPE sudInputPinTypes[] =  const AMOVIESETUP_MEDIATYPE sudInputPinTypes[] =
77  {  {
# Line 152  Line 148 
148    
149  };  };
150    
151    
152    /* note: g_cTemplates must be global; used by strmbase.lib(dllentry.cpp,dllsetup.cpp) */
153  int g_cTemplates = sizeof(g_Templates) / sizeof(CFactoryTemplate);  int g_cTemplates = sizeof(g_Templates) / sizeof(CFactoryTemplate);
154    
155    
# Line 248  Line 246 
246          memset(&m_frame, 0, sizeof(m_frame));          memset(&m_frame, 0, sizeof(m_frame));
247          m_frame.version = XVID_VERSION;          m_frame.version = XVID_VERSION;
248    
249          HKEY hKey;          LoadRegistryInfo();
         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.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)  
         REG_GET_N("Supported_4CC",  supported_4cc, 0)  
   
         RegCloseKey(hKey);  
250    
251          USE_IYUV = false;          USE_IYUV = false;
252          USE_YV12 = false;          USE_YV12 = false;
# Line 274  Line 258 
258          USE_RG555 = false;          USE_RG555 = false;
259          USE_RG565 = false;          USE_RG565 = false;
260    
261          switch ( PPSettings.nForceColorspace )          switch ( g_config.nForceColorspace )
262          {          {
263          case FORCE_NONE:          case FORCE_NONE:
264                  USE_IYUV = true;                  USE_IYUV = true;
# Line 345  Line 329 
329                  hdr = &vih->bmiHeader;                  hdr = &vih->bmiHeader;
330                  /* PAR (x:y) is (1/ppm_X):(1/ppm_Y) where ppm is pixels-per-meter                  /* PAR (x:y) is (1/ppm_X):(1/ppm_Y) where ppm is pixels-per-meter
331                     which is equal to ppm_Y:ppm_X */                     which is equal to ppm_Y:ppm_X */
332                  ar_x = vih->bmiHeader.biYPelsPerMeter*hdr->biWidth;                  ar_x = vih->bmiHeader.biYPelsPerMeter * abs(hdr->biWidth);
333                  ar_y = vih->bmiHeader.biXPelsPerMeter*hdr->biHeight;                  ar_y = vih->bmiHeader.biXPelsPerMeter * abs(hdr->biHeight);
334          }          }
335          else if (*mtIn->FormatType() == FORMAT_VideoInfo2)          else if (*mtIn->FormatType() == FORMAT_VideoInfo2)
336          {          {
# Line 373  Line 357 
357          {          {
358    
359          case FOURCC_MP4V:          case FOURCC_MP4V:
360                  if (!(supported_4cc & SUPPORT_MP4V)) return VFW_E_TYPE_NOT_ACCEPTED;                  if (!(g_config.supported_4cc & SUPPORT_MP4V)) return VFW_E_TYPE_NOT_ACCEPTED;
361                  break;                  break;
362          case FOURCC_DIVX :          case FOURCC_DIVX :
363                  if (!(supported_4cc & SUPPORT_DIVX)) return VFW_E_TYPE_NOT_ACCEPTED;                  if (!(g_config.supported_4cc & SUPPORT_DIVX)) return VFW_E_TYPE_NOT_ACCEPTED;
364                  break;                  break;
365          case FOURCC_DX50 :          case FOURCC_DX50 :
366                  if (!(supported_4cc & SUPPORT_DX50)) return VFW_E_TYPE_NOT_ACCEPTED;                  if (!(g_config.supported_4cc & SUPPORT_DX50)) return VFW_E_TYPE_NOT_ACCEPTED;
367          case FOURCC_XVID :          case FOURCC_XVID :
368                  break;                  break;
369    
# Line 415  Line 399 
399                  return E_OUTOFMEMORY;                  return E_OUTOFMEMORY;
400          }          }
401    
402          ZeroMemory(vih, sizeof (VIDEOINFOHEADER));          ZeroMemory(vih, sizeof (VIDEOINFOHEADER2));
403          vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);          vih->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
404          vih->bmiHeader.biWidth  = m_create.width;          vih->bmiHeader.biWidth  = m_create.width;
405          vih->bmiHeader.biHeight = m_create.height;          vih->bmiHeader.biHeight = m_create.height;
# Line 512  Line 496 
496                  vih->dwPictAspectRatioY = ar_y;                  vih->dwPictAspectRatioY = ar_y;
497          } else { // just to be safe          } else { // just to be safe
498                  vih->dwPictAspectRatioX = m_create.width;                  vih->dwPictAspectRatioX = m_create.width;
499                  vih->dwPictAspectRatioY = m_create.height;                  vih->dwPictAspectRatioY = abs(m_create.height);
500          }          }
501    
502          mtOut->SetType(&MEDIATYPE_Video);          mtOut->SetType(&MEDIATYPE_Video);
# Line 720  Line 704 
704          if (pIn->IsDiscontinuity() == S_OK)          if (pIn->IsDiscontinuity() == S_OK)
705                  m_frame.general = XVID_DISCONTINUITY;                  m_frame.general = XVID_DISCONTINUITY;
706    
707          if (PPSettings.nDeblock_Y)          if (g_config.nDeblock_Y)
708                  m_frame.general |= XVID_DEBLOCKY;                  m_frame.general |= XVID_DEBLOCKY;
709    
710          if (PPSettings.nDeblock_UV)          if (g_config.nDeblock_UV)
711                  m_frame.general |= XVID_DEBLOCKUV;                  m_frame.general |= XVID_DEBLOCKUV;
712  /*  /*
713          if (PPSettings.nDering)          if (g_config.nDering)
714                  m_frame.general |= XVID_DERING;                  m_frame.general |= XVID_DERING;
715  */  */
716          if (PPSettings.nFilmEffect)          if (g_config.nFilmEffect)
717                  m_frame.general |= XVID_FILMEFFECT;                  m_frame.general |= XVID_FILMEFFECT;
718    
719          m_frame.output.csp &= ~XVID_CSP_VFLIP;          m_frame.output.csp &= ~XVID_CSP_VFLIP;
720          m_frame.output.csp |= rgb_flip^(PPSettings.nFlipVideo ? XVID_CSP_VFLIP : 0);          m_frame.output.csp |= rgb_flip^(g_config.nFlipVideo ? XVID_CSP_VFLIP : 0);
721    
722  repeat :  repeat :
723    
Legend:
Removed from v.1343  
changed lines
  Added in v.1353
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4