[svn] / trunk / xvidcore / dshow / src / CXvidDecoder.h Repository:
ViewVC logotype

Diff of /trunk/xvidcore/dshow/src/CXvidDecoder.h

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

revision 1949, Mon Feb 14 16:59:16 2011 UTC revision 2133, Fri Jan 8 18:01:44 2016 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-2010 Peter Ross <pross@xvid.org>   *  Copyright(C) 2002-2012 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.h,v 1.10 2011-02-14 16:59:16 Isibaar Exp $   * $Id$
23   *   *
24   ****************************************************************************/   ****************************************************************************/
25    
26  #ifndef _FILTER_H_  #ifndef _FILTER_H_
27  #define _FILTER_H_  #define _FILTER_H_
28    
29    #include <time.h>
30  #include <xvid.h>  #include <xvid.h>
31  #include "IXvidDecoder.h"  #include "IXvidDecoder.h"
32    
33  #define XVID_NAME_L             L"Xvid MPEG-4 Video Decoder"  #define XVID_NAME_L             L"Xvid MPEG-4 Video Decoder"
34    #define XVID_NAME_MFT_L L"Xvid MPEG-4 Video Decoder MFT"
35    
36  /* --- fourcc --- */  /* --- fourcc --- */
37    
# Line 153  Line 155 
155    
156  private :  private :
157    
158          HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format);          HRESULT ChangeColorspace(GUID subtype, GUID formattype, void * format, int *bitdepth, int noflip);
159          HRESULT OpenLib();          HRESULT OpenLib();
160          void CloseLib();          void CloseLib();
161    
# Line 166  Line 168 
168          int ar_x, ar_y;          int ar_x, ar_y;
169          bool forced_ar;          bool forced_ar;
170    
171            int interlaced;
172    
173          int rgb_flip;          int rgb_flip;
174          int out_stride;          int out_stride;
175    
176            clock_t m_startClock;
177            int m_tray_icon;
178    
179          /* mft stuff */          /* mft stuff */
180  #if defined(XVID_USE_MFT)  #if defined(XVID_USE_MFT)
181          BOOL HasPendingOutput() const { return m_frame.output.plane[1] != NULL; }          BOOL HasPendingOutput() const { return m_frame.output.plane[1] != NULL; }
# Line 176  Line 183 
183          HRESULT OnSetInputType(IMFMediaType *pmt);          HRESULT OnSetInputType(IMFMediaType *pmt);
184          HRESULT OnCheckInputType(IMFMediaType *pmt);          HRESULT OnCheckInputType(IMFMediaType *pmt);
185    
186          HRESULT OnSetOutputType(IMFMediaType *pmt);          HRESULT OnSetOutputType(IMFMediaType *pmt, int bitdepth);
187    
188          IMFMediaType *m_pInputType;          IMFMediaType *m_pInputType;
189          IMFMediaType *m_pOutputType;          IMFMediaType *m_pOutputType;
190            int m_pOutputTypeBPP;
191    
192          CRITICAL_SECTION m_mft_lock;          CRITICAL_SECTION m_mft_lock;
193          REFERENCE_TIME m_timestamp;          REFERENCE_TIME m_timestamp;
# Line 191  Line 199 
199          REFERENCE_TIME m_rtFrame;          REFERENCE_TIME m_rtFrame;
200          MFRatio m_frameRate;          MFRatio m_frameRate;
201          UINT64 m_duration;          UINT64 m_duration;
 #endif  
202    
203  #ifdef XVID_USE_TRAYICON          HANDLE m_thread_handle;
204          HWND MSG_hwnd; /* message handler window */  #endif
205  };  };
206  #define WM_ICONMESSAGE (WM_USER + 1)  #define WM_ICONMESSAGE (WM_USER + 1)
 #else  
 };  
 #endif  
207    
208  static const int PARS[][2] = {  static const int PARS[][2] = {
209          {1, 1},          {1, 1},

Legend:
Removed from v.1949  
changed lines
  Added in v.2133

No admin address has been configured
ViewVC Help
Powered by ViewVC 1.0.4