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

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

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

revision 1054, Mon Jun 9 13:55:56 2003 UTC revision 1353, Sat Feb 7 03:57:39 2004 UTC
# 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.h,v 1.1.2.2 2003-06-09 13:49:00 edgomez Exp $   * $Id: CXvidDecoder.h,v 1.1.2.9 2004-02-07 03:57:39 syskin Exp $
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
# Line 29  Line 29 
29  #include <xvid.h>  #include <xvid.h>
30  #include "IXvidDecoder.h"  #include "IXvidDecoder.h"
31    
 #ifdef _DEBUG  
 #include <stdio.h>      /* vsprintf */  
 #define DPRINTF_BUF_SZ  1024  
 static __inline void  
 DPRINTF(char *fmt, ...)  
 {  
         va_list args;  
         char buf[DPRINTF_BUF_SZ];  
   
         va_start(args, fmt);  
         vsprintf(buf, fmt, args);  
         OutputDebugString(buf);  
 }  
 #else  
 static __inline void  
 DPRINTF(char *fmt, ...) { }  
 #endif  
32    
33  #define XVID_NAME_L             L"XviD MPEG-4 Video Decoder"  #define XVID_NAME_L             L"XviD MPEG-4 Video Decoder"
34    
# Line 54  Line 37 
37  #define FOURCC_XVID     mmioFOURCC('X','V','I','D')  #define FOURCC_XVID     mmioFOURCC('X','V','I','D')
38  #define FOURCC_DIVX     mmioFOURCC('D','I','V','X')  #define FOURCC_DIVX     mmioFOURCC('D','I','V','X')
39  #define FOURCC_DX50     mmioFOURCC('D','X','5','0')  #define FOURCC_DX50     mmioFOURCC('D','X','5','0')
40    #define FOURCC_MP4V     mmioFOURCC('m','p','4','v')
41    
42  /* --- media uids --- */  /* --- media uids --- */
43    
# Line 63  Line 47 
47  DEFINE_GUID(CLSID_DIVX_UC,      mmioFOURCC('D','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  DEFINE_GUID(CLSID_DIVX_UC,      mmioFOURCC('D','I','V','X'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
48  DEFINE_GUID(CLSID_DX50,         mmioFOURCC('d','x','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  DEFINE_GUID(CLSID_DX50,         mmioFOURCC('d','x','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
49  DEFINE_GUID(CLSID_DX50_UC,      mmioFOURCC('D','X','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);  DEFINE_GUID(CLSID_DX50_UC,      mmioFOURCC('D','X','5','0'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
50    DEFINE_GUID(CLSID_MP4V,         mmioFOURCC('m','p','4','v'), 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
51    
52    
53    /* MEDIATYPE_IYUV is not always defined in the directx headers */
54    DEFINE_GUID(CLSID_MEDIASUBTYPE_IYUV, 0x56555949, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
55    
56    
57  class CXvidDecoder : public CVideoTransformFilter, public IXvidDecoder, public ISpecifyPropertyPages  class CXvidDecoder : public CVideoTransformFilter, public IXvidDecoder, public ISpecifyPropertyPages
# Line 93  Line 82 
82    
83          HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format);          HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format);
84    
85          // data          xvid_dec_create_t m_create;
86            xvid_dec_frame_t m_frame;
87    
88          HINSTANCE m_hdll;          HINSTANCE m_hdll;
89          int (*m_xvid_global)(void *, int, void *, void *);          int (*xvid_global_func)(void *handle, int opt, void *param1, void *param2);
90          int (*m_xvid_decore)(void *, int, void *, void *);          int (*xvid_decore_func)(void *handle, int opt, void *param1, void *param2);
91            int ar_x, ar_y;
92    
93          xvid_dec_create_t m_create;          int rgb_flip;
         xvid_dec_frame_t m_frame;  
94  };  };
95    
96    
Legend:
Removed from v.1054  
changed lines
  Added in v.1353
No admin address has been configured
 ViewVC Help
Powered by ViewVC 1.0.4