diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-08-01 19:46:29 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2011-08-01 19:46:29 +0400 |
| commit | 460745e33007c2f1611c611d36e15b5235f63ba3 (patch) | |
| tree | d7badc5bcc15f89959311b560c4c143cc0d26208 /src | |
| parent | 6d9a33bd19702d360445efcebfef3a11decd502f (diff) | |
whitespace cleanup, headers cleanup, copyright year update
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@3526 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
108 files changed, 282 insertions, 320 deletions
diff --git a/src/DSUtil/DSUtil.cpp b/src/DSUtil/DSUtil.cpp index 453a1ee18..23ae890c3 100644 --- a/src/DSUtil/DSUtil.cpp +++ b/src/DSUtil/DSUtil.cpp @@ -32,7 +32,7 @@ #include <emmintrin.h>
#include <math.h>
#include <initguid.h>
-#include <D3D9Types.h>
+#include <d3d9types.h>
#include <dxva.h>
#include <dxva2api.h>
@@ -255,8 +255,6 @@ bool IsVideoRenderer(IBaseFilter* pBF) return(clsid == CLSID_VideoRenderer || clsid == CLSID_VideoRendererDefault);
}
-#include <initguid.h>
-
DEFINE_GUID(CLSID_ReClock,
0x9dc15360, 0x914c, 0x46b8, 0xb9, 0xdf, 0xbf, 0xe6, 0x7f, 0xd3, 0x6c, 0x6a);
@@ -396,7 +394,6 @@ IPin* FindPin(IBaseFilter* pBF, PIN_DIRECTION direction, const AM_MEDIA_TYPE* pR return NULL;
}
-
CStringW GetFilterName(IBaseFilter* pBF)
{
CStringW name;
@@ -1105,7 +1102,6 @@ bool ExtractAvgTimePerFrame(const AM_MEDIA_TYPE* pmt, REFERENCE_TIME& rtAvgTimeP return true;
}
-
bool ExtractBIH(IMediaSample* pMS, BITMAPINFOHEADER* bih)
{
AM_MEDIA_TYPE* pmt = NULL;
@@ -2398,7 +2394,6 @@ void UnRegisterSourceFilter(const GUID& subtype) DeleteRegKey(_T("Media Type\\") + CStringFromGUID(MEDIATYPE_Stream), CStringFromGUID(subtype));
}
-
typedef struct {
const GUID* Guid;
const LPCTSTR Description;
@@ -2587,6 +2582,7 @@ DWORD YCrCbToRGB_Rec601(BYTE A, BYTE Y, BYTE Cr, BYTE Cb) const double Rec709_Kr = 0.2125;
const double Rec709_Kb = 0.0721;
const double Rec709_Kg = 0.7154;
+
COLORREF YCrCbToRGB_Rec709(BYTE Y, BYTE Cr, BYTE Cb)
{
@@ -2607,7 +2603,6 @@ DWORD YCrCbToRGB_Rec709(BYTE A, BYTE Y, BYTE Cr, BYTE Cb) return D3DCOLOR_ARGB (A, (BYTE)fabs(rp), (BYTE)fabs(gp), (BYTE)fabs(bp));
}
-
void TraceFilterInfo(IBaseFilter* pBF)
{
FILTER_INFO Info;
@@ -2622,7 +2617,6 @@ void TraceFilterInfo(IBaseFilter* pBF) }
}
-
void TracePinInfo(IPin* pPin)
{
PIN_INFO PinInfo;
@@ -2646,7 +2640,6 @@ void TracePinInfo(IPin* pPin) PinInfo.pFilter->Release();
}
-
const wchar_t *StreamTypeToName(PES_STREAM_TYPE _Type)
{
switch (_Type) {
diff --git a/src/DSUtil/DSUtil.h b/src/DSUtil/DSUtil.h index 8d22e5dbb..dde63d69d 100644 --- a/src/DSUtil/DSUtil.h +++ b/src/DSUtil/DSUtil.h @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* 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
@@ -26,12 +26,11 @@ #include "NullRenderers.h"
#include "HdmvClipInfo.h"
#include "H264Nalu.h"
-//#include "MediaTypes.h"
#include "MediaTypeEx.h"
#include "vd.h"
#include "text.h"
-#define LCID_NOSUBTITLES -1
+#define LCID_NOSUBTITLES -1
extern void DumpStreamConfig(TCHAR* fn, IAMStreamConfig* pAMVSCCap);
extern int CountPins(IBaseFilter* pBF, int& nIn, int& nOut, int& nInC, int& nOutC);
diff --git a/src/DSUtil/GolombBuffer.cpp b/src/DSUtil/GolombBuffer.cpp index 4fd1a4a52..38a630617 100644 --- a/src/DSUtil/GolombBuffer.cpp +++ b/src/DSUtil/GolombBuffer.cpp @@ -32,7 +32,6 @@ CGolombBuffer::CGolombBuffer(BYTE* pBuffer, int nSize) Reset();
}
-
UINT64 CGolombBuffer::BitRead(int nBits, bool fPeek)
{
// ASSERT(nBits >= 0 && nBits <= 64);
@@ -60,7 +59,6 @@ UINT64 CGolombBuffer::BitRead(int nBits, bool fPeek) return ret;
}
-
UINT64 CGolombBuffer::UExpGolombRead()
{
int n = -1;
@@ -76,7 +74,6 @@ INT64 CGolombBuffer::SExpGolombRead() return ((k&1) ? 1 : -1) * ((k + 1) >> 1);
}
-
void CGolombBuffer::BitByteAlign()
{
m_bitlen &= ~7;
@@ -87,7 +84,6 @@ __int64 CGolombBuffer::GetPos() return m_nBitPos - (m_bitlen>>3);
}
-
void CGolombBuffer::ReadBuffer(BYTE* pDest, int nSize)
{
ASSERT (m_nBitPos + nSize <= m_nSize);
diff --git a/src/DSUtil/H264Nalu.cpp b/src/DSUtil/H264Nalu.cpp index 78c79456e..3799689af 100644 --- a/src/DSUtil/H264Nalu.cpp +++ b/src/DSUtil/H264Nalu.cpp @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
diff --git a/src/DSUtil/H264Nalu.h b/src/DSUtil/H264Nalu.h index a7a41c0d0..d95ea99d9 100644 --- a/src/DSUtil/H264Nalu.h +++ b/src/DSUtil/H264Nalu.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -38,7 +38,6 @@ typedef enum { NALU_TYPE_FILL = 12
} NALU_TYPE;
-
class CH264Nalu
{
private :
@@ -60,34 +59,34 @@ private : bool MoveToNextRTPStartcode();
public :
- NALU_TYPE GetType() const {
+ NALU_TYPE GetType() const {
return nal_unit_type;
};
- bool IsRefFrame() const {
+ bool IsRefFrame() const {
return (nal_reference_idc != 0);
};
- int GetDataLength() const {
+ int GetDataLength() const {
return m_nCurPos - m_nNALDataPos;
};
- BYTE* GetDataBuffer() {
+ BYTE* GetDataBuffer() {
return m_pBuffer + m_nNALDataPos;
};
- int GetRoundedDataLength() const {
- int nSize = m_nCurPos - m_nNALDataPos;
+ int GetRoundedDataLength() const {
+ int nSize = m_nCurPos - m_nNALDataPos;
return nSize + 128 - (nSize %128);
}
- int GetLength() const {
+ int GetLength() const {
return m_nCurPos - m_nNALStartPos;
};
- BYTE* GetNALBuffer() {
+ BYTE* GetNALBuffer() {
return m_pBuffer + m_nNALStartPos;
};
- bool IsEOF() const {
+ bool IsEOF() const {
return m_nCurPos >= m_nSize;
};
- void SetBuffer (BYTE* pBuffer, int nSize, int nNALSize);
- bool ReadNext();
+ void SetBuffer (BYTE* pBuffer, int nSize, int nNALSize);
+ bool ReadNext();
};
diff --git a/src/DSUtil/HdmvClipInfo.cpp b/src/DSUtil/HdmvClipInfo.cpp index baf16ebae..0d968d746 100644 --- a/src/DSUtil/HdmvClipInfo.cpp +++ b/src/DSUtil/HdmvClipInfo.cpp @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -159,7 +159,6 @@ HRESULT CHdmvClipInfo::ReadProgramInfo() return S_OK;
}
-
HRESULT CHdmvClipInfo::ReadInfo(LPCTSTR strFile)
{
BYTE Buff[100];
@@ -248,7 +247,6 @@ LPCTSTR CHdmvClipInfo::Stream::Format() }
}
-
HRESULT CHdmvClipInfo::ReadPlaylist(CString strPlaylistFile, REFERENCE_TIME& rtDuration, CAtlList<PlaylistItem>& Playlist)
{
@@ -402,7 +400,6 @@ HRESULT CHdmvClipInfo::ReadChapters(CString strPlaylistFile, CAtlList<CHdmvClipI return AmHresultFromWin32(GetLastError());
}
-
HRESULT CHdmvClipInfo::FindMainMovie(LPCTSTR strFolder, CString& strPlaylistFile, CAtlList<PlaylistItem>& MainPlaylist)
{
HRESULT hr = E_FAIL;
diff --git a/src/DSUtil/HdmvClipInfo.h b/src/DSUtil/HdmvClipInfo.h index 5a0d732f9..33fb874a6 100644 --- a/src/DSUtil/HdmvClipInfo.h +++ b/src/DSUtil/HdmvClipInfo.h @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -79,7 +79,6 @@ typedef unsigned long uint32; typedef long int32;
-
class CHdmvClipInfo
{
public:
diff --git a/src/DSUtil/MediaTypes.h b/src/DSUtil/MediaTypes.h index 4a97d86ac..eb7f3440a 100644 --- a/src/DSUtil/MediaTypes.h +++ b/src/DSUtil/MediaTypes.h @@ -30,6 +30,7 @@ struct VIH { int size;
const GUID* subtype;
};
+
struct VIH2 {
VIDEOINFOHEADER2 vih;
UINT mask[3];
diff --git a/src/DSUtil/Mpeg2Def.h b/src/DSUtil/Mpeg2Def.h index 803f8f199..1aa36becd 100644 --- a/src/DSUtil/Mpeg2Def.h +++ b/src/DSUtil/Mpeg2Def.h @@ -1,5 +1,5 @@ /*
- * $Id: Mpeg2Def.h 1288 2009-09-27 15:50:30Z casimir666 $
+ * $Id$
*
* (C) 2006-2010 see AUTHORS
*
@@ -72,7 +72,6 @@ enum PES_STREAM_TYPE { VIDEO_STREAM_VC1 = 0xea
};
-
enum MPEG2_PID {
PID_PAT = 0x000, // Program Association Table
PID_CAT = 0x001, // Conditional Access Table
@@ -111,7 +110,6 @@ enum DVB_SI { SI_EIT_os8, SI_EIT_os9, SI_EIT_osa, SI_EIT_osb, SI_EIT_osc, SI_EIT_osd, SI_EIT_ose, SI_EIT_osf
};
-
enum MPEG2_DESCRIPTOR {
// http://www.coolstf.com/tsreader/descriptors.html
DT_VIDEO_STREAM = 0x02,
@@ -156,5 +154,4 @@ enum MPEG2_DESCRIPTOR { DT_HD_SIMCAST_LOG_CHANNEL = 0x88
};
-
-extern const wchar_t *StreamTypeToName(PES_STREAM_TYPE _Type);
\ No newline at end of file +extern const wchar_t *StreamTypeToName(PES_STREAM_TYPE _Type);
diff --git a/src/DSUtil/NullRenderers.cpp b/src/DSUtil/NullRenderers.cpp index 16542eef9..34a1c8044 100644 --- a/src/DSUtil/NullRenderers.cpp +++ b/src/DSUtil/NullRenderers.cpp @@ -29,11 +29,10 @@ #ifdef USE_DXVA
-#include <D3D9.h>
+#include <d3d9.h>
#include <dxva.h>
#include <dxva2api.h> // DXVA2
#include <evr.h>
-//#include <mfidl.h>
#include <mfapi.h> // API Media Foundation
#include <Mferror.h>
diff --git a/src/SubPic/DX9SubPic.cpp b/src/SubPic/DX9SubPic.cpp index 4189b4203..a7b0de61d 100644 --- a/src/SubPic/DX9SubPic.cpp +++ b/src/SubPic/DX9SubPic.cpp @@ -23,7 +23,7 @@ #include "stdafx.h"
#include <d3d9.h>
-#include <Vmr9.h>
+#include <vmr9.h>
#include "DX9SubPic.h"
//
@@ -358,13 +358,11 @@ CDX9SubPicAllocator::CDX9SubPicAllocator(IDirect3DDevice9* pD3DDev, SIZE maxsize CCritSec CDX9SubPicAllocator::ms_SurfaceQueueLock;
-
CDX9SubPicAllocator::~CDX9SubPicAllocator()
{
ClearCache();
}
-
void CDX9SubPicAllocator::GetStats(int &_nFree, int &_nAlloc)
{
CAutoLock Lock(&ms_SurfaceQueueLock);
diff --git a/src/SubPic/MemSubPic.h b/src/SubPic/MemSubPic.h index 252bed509..62f383fe9 100644 --- a/src/SubPic/MemSubPic.h +++ b/src/SubPic/MemSubPic.h @@ -62,4 +62,3 @@ class CMemSubPicAllocator : public CSubPicAllocatorImpl public:
CMemSubPicAllocator(int type, SIZE maxsize);
};
-
diff --git a/src/filters/Filters.h b/src/filters/Filters.h index 58332ce13..f05edb730 100644 --- a/src/filters/Filters.h +++ b/src/filters/Filters.h @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* 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
@@ -56,4 +56,3 @@ #include "parser/SSFSplitter/SSFSplitter.h"
#include "renderer/MpcAudioRenderer/MpcAudioRenderer.h"
#include "renderer/SyncClock/SyncClock.h"
-
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxer.cpp b/src/filters/muxer/BaseMuxer/BaseMuxer.cpp index 4bcc3f90c..c5ff73bf0 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxer.cpp +++ b/src/filters/muxer/BaseMuxer/BaseMuxer.cpp @@ -396,6 +396,7 @@ STDMETHODIMP CBaseMuxerFilter::GetCapabilities(DWORD* pCapabilities) {
return pCapabilities ? *pCapabilities = AM_SEEKING_CanGetDuration|AM_SEEKING_CanGetCurrentPos, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseMuxerFilter::CheckCapabilities(DWORD* pCapabilities)
{
CheckPointer(pCapabilities, E_POINTER);
@@ -407,26 +408,32 @@ STDMETHODIMP CBaseMuxerFilter::CheckCapabilities(DWORD* pCapabilities) caps &= *pCapabilities;
return caps == 0 ? E_FAIL : caps == *pCapabilities ? S_OK : S_FALSE;
}
+
STDMETHODIMP CBaseMuxerFilter::IsFormatSupported(const GUID* pFormat)
{
return !pFormat ? E_POINTER : *pFormat == TIME_FORMAT_MEDIA_TIME ? S_OK : S_FALSE;
}
+
STDMETHODIMP CBaseMuxerFilter::QueryPreferredFormat(GUID* pFormat)
{
return GetTimeFormat(pFormat);
}
+
STDMETHODIMP CBaseMuxerFilter::GetTimeFormat(GUID* pFormat)
{
return pFormat ? *pFormat = TIME_FORMAT_MEDIA_TIME, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseMuxerFilter::IsUsingTimeFormat(const GUID* pFormat)
{
return IsFormatSupported(pFormat);
}
+
STDMETHODIMP CBaseMuxerFilter::SetTimeFormat(const GUID* pFormat)
{
return S_OK == IsFormatSupported(pFormat) ? S_OK : E_INVALIDARG;
}
+
STDMETHODIMP CBaseMuxerFilter::GetDuration(LONGLONG* pDuration)
{
CheckPointer(pDuration, E_POINTER);
@@ -440,20 +447,24 @@ STDMETHODIMP CBaseMuxerFilter::GetDuration(LONGLONG* pDuration) }
return S_OK;
}
+
STDMETHODIMP CBaseMuxerFilter::GetStopPosition(LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseMuxerFilter::GetCurrentPosition(LONGLONG* pCurrent)
{
CheckPointer(pCurrent, E_POINTER);
*pCurrent = m_rtCurrent;
return S_OK;
}
+
STDMETHODIMP CBaseMuxerFilter::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseMuxerFilter::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
FILTER_STATE fs;
@@ -476,22 +487,27 @@ STDMETHODIMP CBaseMuxerFilter::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentF return VFW_E_WRONG_STATE;
}
+
STDMETHODIMP CBaseMuxerFilter::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseMuxerFilter::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseMuxerFilter::SetRate(double dRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseMuxerFilter::GetRate(double* pdRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseMuxerFilter::GetPreroll(LONGLONG* pllPreroll)
{
return E_NOTIMPL;
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxer.h b/src/filters/muxer/BaseMuxer/BaseMuxer.h index 6cd8221e1..dbb8a8fcb 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxer.h +++ b/src/filters/muxer/BaseMuxer/BaseMuxer.h @@ -108,4 +108,3 @@ public: STDMETHODIMP GetRate(double* pdRate);
STDMETHODIMP GetPreroll(LONGLONG* pllPreroll);
};
-
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp b/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp index e100bfe81..d2dee81cc 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp +++ b/src/filters/muxer/BaseMuxer/BaseMuxerInputPin.cpp @@ -282,4 +282,3 @@ STDMETHODIMP CBaseMuxerInputPin::EndOfStream() return hr;
}
-
diff --git a/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h b/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h index d86985190..997d1129e 100644 --- a/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h +++ b/src/filters/muxer/BaseMuxer/BaseMuxerRelatedPin.h @@ -40,4 +40,4 @@ public: STDMETHODIMP SetRelatedPin(CBasePin* pPin);
STDMETHODIMP_(CBasePin*) GetRelatedPin();
-};
\ No newline at end of file +};
diff --git a/src/filters/muxer/BaseMuxer/stdafx.cpp b/src/filters/muxer/BaseMuxer/stdafx.cpp index d58a51550..bea3f980a 100644 --- a/src/filters/muxer/BaseMuxer/stdafx.cpp +++ b/src/filters/muxer/BaseMuxer/stdafx.cpp @@ -20,4 +20,3 @@ */
#include "stdafx.h"
-
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp index d79d30b04..bf0be4067 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.cpp @@ -222,6 +222,7 @@ STDMETHODIMP CMatroskaMuxerFilter::GetCapabilities(DWORD* pCapabilities) AM_SEEKING_CanGetDuration|
AM_SEEKING_CanGetCurrentPos, S_OK : E_POINTER;
}
+
STDMETHODIMP CMatroskaMuxerFilter::CheckCapabilities(DWORD* pCapabilities)
{
CheckPointer(pCapabilities, E_POINTER);
@@ -233,26 +234,32 @@ STDMETHODIMP CMatroskaMuxerFilter::CheckCapabilities(DWORD* pCapabilities) caps &= *pCapabilities;
return caps == 0 ? E_FAIL : caps == *pCapabilities ? S_OK : S_FALSE;
}
+
STDMETHODIMP CMatroskaMuxerFilter::IsFormatSupported(const GUID* pFormat)
{
return !pFormat ? E_POINTER : *pFormat == TIME_FORMAT_MEDIA_TIME ? S_OK : S_FALSE;
}
+
STDMETHODIMP CMatroskaMuxerFilter::QueryPreferredFormat(GUID* pFormat)
{
return GetTimeFormat(pFormat);
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetTimeFormat(GUID* pFormat)
{
return pFormat ? *pFormat = TIME_FORMAT_MEDIA_TIME, S_OK : E_POINTER;
}
+
STDMETHODIMP CMatroskaMuxerFilter::IsUsingTimeFormat(const GUID* pFormat)
{
return IsFormatSupported(pFormat);
}
+
STDMETHODIMP CMatroskaMuxerFilter::SetTimeFormat(const GUID* pFormat)
{
return S_OK == IsFormatSupported(pFormat) ? S_OK : E_INVALIDARG;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetDuration(LONGLONG* pDuration)
{
CheckPointer(pDuration, E_POINTER);
@@ -266,40 +273,49 @@ STDMETHODIMP CMatroskaMuxerFilter::GetDuration(LONGLONG* pDuration) }
return S_OK;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetStopPosition(LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetCurrentPosition(LONGLONG* pCurrent)
{
CheckPointer(pCurrent, E_POINTER);
*pCurrent = m_rtCurrent;
return S_OK;
}
+
STDMETHODIMP CMatroskaMuxerFilter::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::SetRate(double dRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetRate(double* pdRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CMatroskaMuxerFilter::GetPreroll(LONGLONG* pllPreroll)
{
return E_NOTIMPL;
@@ -1388,5 +1404,3 @@ STDMETHODIMP CMatroskaMuxerOutputPin::Notify(IBaseFilter* pSender, Quality q) {
return E_NOTIMPL;
}
-
-
diff --git a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h index 4c8eddbd4..0ab6fd9c9 100644 --- a/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h +++ b/src/filters/muxer/MatroskaMuxer/MatroskaMuxer.h @@ -157,4 +157,3 @@ public: STDMETHODIMP CorrectTimeOffset(bool fNegative, bool fPositive);
};
-
diff --git a/src/filters/muxer/MatroskaMuxer/stdafx.cpp b/src/filters/muxer/MatroskaMuxer/stdafx.cpp index 4bbe643da..bea3f980a 100644 --- a/src/filters/muxer/MatroskaMuxer/stdafx.cpp +++ b/src/filters/muxer/MatroskaMuxer/stdafx.cpp @@ -19,6 +19,4 @@ *
*/
-
#include "stdafx.h"
-
diff --git a/src/filters/muxer/WavDest/stdafx.cpp b/src/filters/muxer/WavDest/stdafx.cpp index d58a51550..bea3f980a 100644 --- a/src/filters/muxer/WavDest/stdafx.cpp +++ b/src/filters/muxer/WavDest/stdafx.cpp @@ -20,4 +20,3 @@ */
#include "stdafx.h"
-
diff --git a/src/filters/parser/AviSplitter/AviFile.cpp b/src/filters/parser/AviSplitter/AviFile.cpp index 6fcd48344..92e510e1e 100644 --- a/src/filters/parser/AviSplitter/AviFile.cpp +++ b/src/filters/parser/AviSplitter/AviFile.cpp @@ -91,7 +91,6 @@ HRESULT CAviFile::BuildAMVIndex() return S_OK;
}
-
HRESULT CAviFile::Parse(DWORD parentid, __int64 end)
{
HRESULT hr = S_OK;
diff --git a/src/filters/parser/AviSplitter/AviReportWnd.cpp b/src/filters/parser/AviSplitter/AviReportWnd.cpp index d522ebbee..4007e33cf 100644 --- a/src/filters/parser/AviSplitter/AviReportWnd.cpp +++ b/src/filters/parser/AviSplitter/AviReportWnd.cpp @@ -355,4 +355,3 @@ void CAviPlotterWnd::OnPaint() dc.BitBlt(0, 0, r.Width(), r.Height(), &m_dc, 0, 0, SRCCOPY);
m_dc.SelectObject(pOld);
}
-
diff --git a/src/filters/parser/AviSplitter/AviReportWnd.h b/src/filters/parser/AviSplitter/AviReportWnd.h index c68e6f618..2f27b2d79 100644 --- a/src/filters/parser/AviSplitter/AviReportWnd.h +++ b/src/filters/parser/AviSplitter/AviReportWnd.h @@ -45,5 +45,3 @@ public: afx_msg void OnClose();
afx_msg void OnMouseMove(UINT nFlags, CPoint point);
};
-
-
diff --git a/src/filters/parser/AviSplitter/AviSplitter.cpp b/src/filters/parser/AviSplitter/AviSplitter.cpp index 3dd2c7052..e5c70bc68 100644 --- a/src/filters/parser/AviSplitter/AviSplitter.cpp +++ b/src/filters/parser/AviSplitter/AviSplitter.cpp @@ -904,4 +904,3 @@ HRESULT CAviSplitterOutputPin::CheckConnect(IPin* pPin) return __super::CheckConnect(pPin);
}
-
diff --git a/src/filters/parser/BaseSplitter/AsyncReader.cpp b/src/filters/parser/BaseSplitter/AsyncReader.cpp index cfe36e69a..c0217ae4d 100644 --- a/src/filters/parser/BaseSplitter/AsyncReader.cpp +++ b/src/filters/parser/BaseSplitter/AsyncReader.cpp @@ -53,6 +53,7 @@ CAsyncFileReader::CAsyncFileReader(CAtlList<CHdmvClipInfo::PlaylistItem>& Items, m_len = GetLength();
}
}
+
STDMETHODIMP CAsyncFileReader::NonDelegatingQueryInterface(REFIID riid, void** ppv)
{
CheckPointer(ppv, E_POINTER);
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.cpp b/src/filters/parser/BaseSplitter/BaseSplitter.cpp index c7bbbd1aa..ee2b82649 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitter.cpp @@ -671,66 +671,82 @@ STDMETHODIMP CBaseSplitterOutputPin::GetCapabilities(DWORD* pCapabilities) {
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetCapabilities(pCapabilities);
}
+
STDMETHODIMP CBaseSplitterOutputPin::CheckCapabilities(DWORD* pCapabilities)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->CheckCapabilities(pCapabilities);
}
+
STDMETHODIMP CBaseSplitterOutputPin::IsFormatSupported(const GUID* pFormat)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->IsFormatSupported(pFormat);
}
+
STDMETHODIMP CBaseSplitterOutputPin::QueryPreferredFormat(GUID* pFormat)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->QueryPreferredFormat(pFormat);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetTimeFormat(GUID* pFormat)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetTimeFormat(pFormat);
}
+
STDMETHODIMP CBaseSplitterOutputPin::IsUsingTimeFormat(const GUID* pFormat)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->IsUsingTimeFormat(pFormat);
}
+
STDMETHODIMP CBaseSplitterOutputPin::SetTimeFormat(const GUID* pFormat)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->SetTimeFormat(pFormat);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetDuration(LONGLONG* pDuration)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetDuration(pDuration);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetStopPosition(LONGLONG* pStop)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetStopPosition(pStop);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetCurrentPosition(LONGLONG* pCurrent)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetCurrentPosition(pCurrent);
}
+
STDMETHODIMP CBaseSplitterOutputPin::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->ConvertTimeFormat(pTarget, pTargetFormat, Source, pSourceFormat);
}
+
STDMETHODIMP CBaseSplitterOutputPin::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->SetPositionsInternal(this, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetPositions(pCurrent, pStop);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetAvailable(pEarliest, pLatest);
}
+
STDMETHODIMP CBaseSplitterOutputPin::SetRate(double dRate)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->SetRate(dRate);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetRate(double* pdRate)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetRate(pdRate);
}
+
STDMETHODIMP CBaseSplitterOutputPin::GetPreroll(LONGLONG* pllPreroll)
{
return (static_cast<CBaseSplitterFilter*>(m_pFilter))->GetPreroll(pllPreroll);
@@ -1273,6 +1289,7 @@ STDMETHODIMP CBaseSplitterFilter::GetCapabilities(DWORD* pCapabilities) AM_SEEKING_CanSeekForwards|
AM_SEEKING_CanSeekBackwards, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseSplitterFilter::CheckCapabilities(DWORD* pCapabilities)
{
CheckPointer(pCapabilities, E_POINTER);
@@ -1289,48 +1306,59 @@ STDMETHODIMP CBaseSplitterFilter::CheckCapabilities(DWORD* pCapabilities) }
return S_FALSE;
}
+
STDMETHODIMP CBaseSplitterFilter::IsFormatSupported(const GUID* pFormat)
{
return !pFormat ? E_POINTER : *pFormat == TIME_FORMAT_MEDIA_TIME ? S_OK : S_FALSE;
}
+
STDMETHODIMP CBaseSplitterFilter::QueryPreferredFormat(GUID* pFormat)
{
return GetTimeFormat(pFormat);
}
+
STDMETHODIMP CBaseSplitterFilter::GetTimeFormat(GUID* pFormat)
{
return pFormat ? *pFormat = TIME_FORMAT_MEDIA_TIME, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseSplitterFilter::IsUsingTimeFormat(const GUID* pFormat)
{
return IsFormatSupported(pFormat);
}
+
STDMETHODIMP CBaseSplitterFilter::SetTimeFormat(const GUID* pFormat)
{
return S_OK == IsFormatSupported(pFormat) ? S_OK : E_INVALIDARG;
}
+
STDMETHODIMP CBaseSplitterFilter::GetDuration(LONGLONG* pDuration)
{
CheckPointer(pDuration, E_POINTER);
*pDuration = m_rtDuration;
return S_OK;
}
+
STDMETHODIMP CBaseSplitterFilter::GetStopPosition(LONGLONG* pStop)
{
return GetDuration(pStop);
}
+
STDMETHODIMP CBaseSplitterFilter::GetCurrentPosition(LONGLONG* pCurrent)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseSplitterFilter::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CBaseSplitterFilter::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
return SetPositionsInternal(this, pCurrent, dwCurrentFlags, pStop, dwStopFlags);
}
+
STDMETHODIMP CBaseSplitterFilter::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
if(pCurrent) {
@@ -1341,6 +1369,7 @@ STDMETHODIMP CBaseSplitterFilter::GetPositions(LONGLONG* pCurrent, LONGLONG* pSt }
return S_OK;
}
+
STDMETHODIMP CBaseSplitterFilter::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
if(pEarliest) {
@@ -1348,14 +1377,17 @@ STDMETHODIMP CBaseSplitterFilter::GetAvailable(LONGLONG* pEarliest, LONGLONG* pL }
return GetDuration(pLatest);
}
+
STDMETHODIMP CBaseSplitterFilter::SetRate(double dRate)
{
return dRate > 0 ? m_dRate = dRate, S_OK : E_INVALIDARG;
}
+
STDMETHODIMP CBaseSplitterFilter::GetRate(double* pdRate)
{
return pdRate ? *pdRate = m_dRate, S_OK : E_POINTER;
}
+
STDMETHODIMP CBaseSplitterFilter::GetPreroll(LONGLONG* pllPreroll)
{
return pllPreroll ? *pllPreroll = 0, S_OK : E_POINTER;
diff --git a/src/filters/parser/BaseSplitter/BaseSplitter.h b/src/filters/parser/BaseSplitter/BaseSplitter.h index 255f7af72..5d929e609 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitter.h +++ b/src/filters/parser/BaseSplitter/BaseSplitter.h @@ -427,4 +427,3 @@ public: STDMETHODIMP GetStatus(int i, int& samples, int& size);
STDMETHODIMP_(DWORD) GetPriority();
};
-
diff --git a/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp b/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp index 36521c465..4e8f55d5a 100644 --- a/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp +++ b/src/filters/parser/BaseSplitter/BaseSplitterFile.cpp @@ -247,4 +247,3 @@ HRESULT CBaseSplitterFile::HasMoreData(__int64 len, DWORD ms) return S_OK;
}
-
diff --git a/src/filters/parser/BaseSplitter/MultiFiles.cpp b/src/filters/parser/BaseSplitter/MultiFiles.cpp index 853fca54c..98b335d59 100644 --- a/src/filters/parser/BaseSplitter/MultiFiles.cpp +++ b/src/filters/parser/BaseSplitter/MultiFiles.cpp @@ -82,7 +82,6 @@ BOOL CMultiFiles::OpenFiles(CAtlList<CHdmvClipInfo::PlaylistItem>& files, UINT n return TRUE;
}
-
ULONGLONG CMultiFiles::Seek(LONGLONG lOff, UINT nFrom)
{
LARGE_INTEGER llNewPos;
@@ -191,7 +190,6 @@ BOOL CMultiFiles::OpenPart(int nPart) }
}
-
void CMultiFiles::ClosePart()
{
if (m_hFile != INVALID_HANDLE_VALUE) {
diff --git a/src/filters/parser/BaseSplitter/MultiFiles.h b/src/filters/parser/BaseSplitter/MultiFiles.h index dbb700fed..6113e0489 100644 --- a/src/filters/parser/BaseSplitter/MultiFiles.h +++ b/src/filters/parser/BaseSplitter/MultiFiles.h @@ -22,7 +22,6 @@ #pragma once
-//#include <atlbase.h>
#include <atlcoll.h>
#include "../../../DSUtil/DSUtil.h"
diff --git a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp index b46bc4cd2..ba0abb7f5 100644 --- a/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp +++ b/src/filters/parser/DSMSplitter/DSMSplitterFile.cpp @@ -400,4 +400,3 @@ __int64 CDSMSplitterFile::FindSyncPoint(REFERENCE_TIME rt) return ret;
}
-
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.cpp b/src/filters/parser/FLVSplitter/FLVSplitter.cpp index 75725a765..39274fc56 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.cpp +++ b/src/filters/parser/FLVSplitter/FLVSplitter.cpp @@ -767,6 +767,3 @@ CFLVSourceFilter::CFLVSourceFilter(LPUNKNOWN pUnk, HRESULT* phr) m_clsid = __uuidof(this);
m_pInput.Free();
}
-
-
-
diff --git a/src/filters/parser/FLVSplitter/FLVSplitter.h b/src/filters/parser/FLVSplitter/FLVSplitter.h index 3e1690384..da28edf7e 100644 --- a/src/filters/parser/FLVSplitter/FLVSplitter.h +++ b/src/filters/parser/FLVSplitter/FLVSplitter.h @@ -23,6 +23,7 @@ #include <atlcoll.h>
#include "../BaseSplitter/BaseSplitter.h"
+#include "../../transform/BaseVideoFilter/BaseVideoFilter.h"
class __declspec(uuid("47E792CF-0BBE-4F7A-859C-194B0768650A"))
CFLVSplitterFilter : public CBaseSplitterFilter
@@ -86,5 +87,3 @@ class __declspec(uuid("C9ECE7B3-1D8E-41F5-9F24-B255DF16C087")) public:
CFLVSourceFilter(LPUNKNOWN pUnk, HRESULT* phr);
};
-
-#include "../../transform/BaseVideoFilter/BaseVideoFilter.h"
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp index 8fc4b7afa..8756efa98 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaFile.cpp @@ -1452,19 +1452,23 @@ void CMatroskaNode::SeekTo(MatroskaReader::QWORD pos) {
m_pMF->Seek(pos);
}
+
MatroskaReader::QWORD CMatroskaNode::GetPos()
{
return m_pMF->GetPos();
}
+
MatroskaReader::QWORD CMatroskaNode::GetLength()
{
return m_pMF->GetLength();
}
+
template <class T>
HRESULT CMatroskaNode::Read(T& var)
{
return m_pMF->Read(var);
}
+
HRESULT CMatroskaNode::Read(BYTE* pData, MatroskaReader::QWORD len)
{
return m_pMF->ByteRead(pData, len);
diff --git a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp index 6d971214e..dd825e054 100644 --- a/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp +++ b/src/filters/parser/MatroskaSplitter/MatroskaSplitter.cpp @@ -26,6 +26,7 @@ #include <initguid.h>
#include <moreuuids.h>
+#include <vector>
using namespace MatroskaReader;
@@ -99,8 +100,6 @@ STDMETHODIMP CMatroskaSplitterFilter::NonDelegatingQueryInterface(REFIID riid, v __super::NonDelegatingQueryInterface(riid, ppv);
}
-#include <vector>
-
HRESULT CMatroskaSplitterFilter::CreateOutputs(IAsyncReader* pAsyncReader)
{
CheckPointer(pAsyncReader, E_POINTER);
diff --git a/src/filters/parser/MpegSplitter/MpegSplitter.cpp b/src/filters/parser/MpegSplitter/MpegSplitter.cpp index 8561fc708..3a7a02993 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitter.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitter.cpp @@ -599,7 +599,6 @@ STDMETHODIMP CMpegSplitterFilter::Load(LPCOLESTR pszFileName, const AM_MEDIA_TYP return __super::Load (pszFileName, pmt);
}
-
HRESULT CMpegSplitterFilter::DemuxNextPacket(REFERENCE_TIME rtStartOffset)
{
HRESULT hr;
@@ -1432,6 +1431,7 @@ STDMETHODIMP CMpegSplitterFilter::SetFastStreamChange(BOOL nValue) m_useFastStreamChange = nValue;
return S_OK;
}
+
STDMETHODIMP_(BOOL) CMpegSplitterFilter::GetFastStreamChange()
{
CAutoLock cAutoLock(&m_csProps);
@@ -1457,6 +1457,7 @@ STDMETHODIMP CMpegSplitterFilter::SetAudioLanguageOrder(WCHAR *nValue) m_csAudioLanguageOrder = nValue;
return S_OK;
}
+
STDMETHODIMP_(WCHAR *) CMpegSplitterFilter::GetAudioLanguageOrder()
{
CAutoLock cAutoLock(&m_csProps);
@@ -1469,6 +1470,7 @@ STDMETHODIMP CMpegSplitterFilter::SetSubtitlesLanguageOrder(WCHAR *nValue) m_csSubtitlesLanguageOrder = nValue;
return S_OK;
}
+
STDMETHODIMP_(WCHAR *) CMpegSplitterFilter::GetSubtitlesLanguageOrder()
{
CAutoLock cAutoLock(&m_csProps);
@@ -1481,6 +1483,7 @@ STDMETHODIMP CMpegSplitterFilter::SetVC1_GuidFlag(int nValue) m_nVC1_GuidFlag = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMpegSplitterFilter::GetVC1_GuidFlag()
{
CAutoLock cAutoLock(&m_csProps);
@@ -1951,7 +1954,6 @@ HRESULT CMpegSplitterOutputPin::DeliverPacket(CAutoPtr<Packet> p) return __super::DeliverPacket(p);
}
-
STDMETHODIMP CMpegSplitterOutputPin::Connect(IPin* pReceivePin, const AM_MEDIA_TYPE* pmt)
{
HRESULT hr;
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp index c1691703f..0255e05be 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp +++ b/src/filters/parser/MpegSplitter/MpegSplitterFile.cpp @@ -697,7 +697,6 @@ DWORD CMpegSplitterFile::AddStream(WORD pid, BYTE pesid, DWORD len) return s;
}
-
void CMpegSplitterFile::AddHdmvPGStream(WORD pid, const char* language_code)
{
stream s;
@@ -711,8 +710,6 @@ void CMpegSplitterFile::AddHdmvPGStream(WORD pid, const char* language_code) }
}
-
-
CAtlList<CMpegSplitterFile::stream>* CMpegSplitterFile::GetMasterStream()
{
return
@@ -894,7 +891,6 @@ void CMpegSplitterFile::UpdatePrograms(CGolombBuffer gb, WORD pid, bool UpdateLa }
}
-
uint32 SwapLE(const uint32 &_Value)
{
return (_Value & 0xFF) << 24 | ((_Value>>8) & 0xFF) << 16 | ((_Value>>16) & 0xFF) << 8 | ((_Value>>24) & 0xFF) << 0;
diff --git a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h index 18e0c935e..0d75a6e39 100644 --- a/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h +++ b/src/filters/parser/MpegSplitter/MpegSplitterSettingsWnd.h @@ -24,6 +24,7 @@ #include "../../InternalPropertyPage.h"
#include "IMpegSplitterFilter.h"
#include <afxcmn.h>
+
class __declspec(uuid("44FCB62D-3AEB-401C-A7E1-8A984C017923"))
CMpegSplitterSettingsWnd : public CInternalPropertyPageWnd
{
diff --git a/src/filters/parser/OggSplitter/OggFile.cpp b/src/filters/parser/OggSplitter/OggFile.cpp index d90237a22..03850eade 100644 --- a/src/filters/parser/OggSplitter/OggFile.cpp +++ b/src/filters/parser/OggSplitter/OggFile.cpp @@ -1,5 +1,5 @@ #include "stdafx.h"
-#include "./oggfile.h"
+#include "oggfile.h"
COggFile::COggFile(IAsyncReader* pAsyncReader, HRESULT& hr)
: CBaseSplitterFile(pAsyncReader, hr, DEFAULT_CACHE_LENGTH, false)
diff --git a/src/filters/parser/OggSplitter/OggSplitter.cpp b/src/filters/parser/OggSplitter/OggSplitter.cpp index 1d5796456..43ab21317 100644 --- a/src/filters/parser/OggSplitter/OggSplitter.cpp +++ b/src/filters/parser/OggSplitter/OggSplitter.cpp @@ -955,7 +955,6 @@ COggFlacOutputPin::COggFlacOutputPin(BYTE* h, int nCount, LPCWSTR pName, CBaseFi *phr = S_OK;
}
-
REFERENCE_TIME COggFlacOutputPin::GetRefTime(__int64 granule_position)
{
REFERENCE_TIME rt = (granule_position * UNITS) / m_nSamplesPerSec;
@@ -1290,4 +1289,3 @@ HRESULT COggTheoraOutputPin::UnpackPacket(CAutoPtr<OggPacket>& p, BYTE* pData, i return S_OK;
}
-
diff --git a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp index 0844d1119..cb130c26e 100644 --- a/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp +++ b/src/filters/parser/RealMediaSplitter/RealMediaSplitter.cpp @@ -1077,7 +1077,6 @@ HRESULT CRMFile::Read(MediaPacketHeader& mph, bool fFull) return S_OK;
}
-
HRESULT CRMFile::Init()
{
Seek(0);
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp b/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp index 3ca6b5489..8e5e09192 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.cpp @@ -267,6 +267,7 @@ STDMETHODIMP CStreamDriveThruFilter::GetCapabilities(DWORD* pCapabilities) {
return pCapabilities ? *pCapabilities = AM_SEEKING_CanGetCurrentPos|AM_SEEKING_CanGetStopPos|AM_SEEKING_CanGetDuration, S_OK : E_POINTER;
}
+
STDMETHODIMP CStreamDriveThruFilter::CheckCapabilities(DWORD* pCapabilities)
{
CheckPointer(pCapabilities, E_POINTER);
@@ -282,26 +283,32 @@ STDMETHODIMP CStreamDriveThruFilter::CheckCapabilities(DWORD* pCapabilities) return caps2 == 0 ? E_FAIL : caps2 == *pCapabilities ? S_OK : S_FALSE;
}
+
STDMETHODIMP CStreamDriveThruFilter::IsFormatSupported(const GUID* pFormat)
{
return !pFormat ? E_POINTER : *pFormat == TIME_FORMAT_MEDIA_TIME ? S_OK : S_FALSE;
}
+
STDMETHODIMP CStreamDriveThruFilter::QueryPreferredFormat(GUID* pFormat)
{
return GetTimeFormat(pFormat);
}
+
STDMETHODIMP CStreamDriveThruFilter::GetTimeFormat(GUID* pFormat)
{
return pFormat ? *pFormat = TIME_FORMAT_MEDIA_TIME, S_OK : E_POINTER;
}
+
STDMETHODIMP CStreamDriveThruFilter::IsUsingTimeFormat(const GUID* pFormat)
{
return IsFormatSupported(pFormat);
}
+
STDMETHODIMP CStreamDriveThruFilter::SetTimeFormat(const GUID* pFormat)
{
return S_OK == IsFormatSupported(pFormat) ? S_OK : E_INVALIDARG;
}
+
STDMETHODIMP CStreamDriveThruFilter::GetDuration(LONGLONG* pDuration)
{
CheckPointer(pDuration, E_POINTER);
@@ -317,38 +324,47 @@ STDMETHODIMP CStreamDriveThruFilter::GetDuration(LONGLONG* pDuration) return E_NOINTERFACE;
}
+
STDMETHODIMP CStreamDriveThruFilter::GetStopPosition(LONGLONG* pStop)
{
return GetDuration(pStop);
}
+
STDMETHODIMP CStreamDriveThruFilter::GetCurrentPosition(LONGLONG* pCurrent)
{
return pCurrent ? *pCurrent = m_position, S_OK : E_POINTER;
}
+
STDMETHODIMP CStreamDriveThruFilter::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CStreamDriveThruFilter::SetPositions(LONGLONG* pCurrent, DWORD dwCurrentFlags, LONGLONG* pStop, DWORD dwStopFlags)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CStreamDriveThruFilter::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CStreamDriveThruFilter::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CStreamDriveThruFilter::SetRate(double dRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CStreamDriveThruFilter::GetRate(double* pdRate)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CStreamDriveThruFilter::GetPreroll(LONGLONG* pllPreroll)
{
return pllPreroll ? *pllPreroll = 0, S_OK : E_POINTER;
diff --git a/src/filters/parser/StreamDriveThru/StreamDriveThru.h b/src/filters/parser/StreamDriveThru/StreamDriveThru.h index 62bd97bcd..435bb7371 100644 --- a/src/filters/parser/StreamDriveThru/StreamDriveThru.h +++ b/src/filters/parser/StreamDriveThru/StreamDriveThru.h @@ -124,4 +124,3 @@ public: STDMETHODIMP GetRate(double* pdRate);
STDMETHODIMP GetPreroll(LONGLONG* pllPreroll);
};
-
diff --git a/src/filters/reader/CDDAReader/CDDAReader.cpp b/src/filters/reader/CDDAReader/CDDAReader.cpp index d0515786b..93c2813e1 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.cpp +++ b/src/filters/reader/CDDAReader/CDDAReader.cpp @@ -154,14 +154,17 @@ STDMETHODIMP CCDDAReader::GetTypeInfoCount(UINT* pctinfo) {
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::GetTypeInfo(UINT itinfo, LCID lcid, ITypeInfo** pptinfo)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::GetIDsOfNames(REFIID riid, OLECHAR** rgszNames, UINT cNames, LCID lcid, DISPID* rgdispid)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::Invoke(DISPID dispidMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pdispparams, VARIANT* pvarResult, EXCEPINFO* pexcepinfo, UINT* puArgErr)
{
return E_NOTIMPL;
@@ -193,42 +196,52 @@ STDMETHODIMP CCDDAReader::get_Rating(BSTR* pbstrRating) {
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_Description(BSTR* pbstrDescription)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_Copyright(BSTR* pbstrCopyright)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_BaseURL(BSTR* pbstrBaseURL)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_LogoURL(BSTR* pbstrLogoURL)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_LogoIconURL(BSTR* pbstrLogoURL)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_WatermarkURL(BSTR* pbstrWatermarkURL)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_MoreInfoURL(BSTR* pbstrMoreInfoURL)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_MoreInfoBannerImage(BSTR* pbstrMoreInfoBannerImage)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_MoreInfoBannerURL(BSTR* pbstrMoreInfoBannerURL)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CCDDAReader::get_MoreInfoText(BSTR* pbstrMoreInfoText)
{
return E_NOTIMPL;
@@ -485,4 +498,3 @@ void CCDDAStream::Unlock() {
m_csLock.Unlock();
}
-
diff --git a/src/filters/reader/CDDAReader/CDDAReader.h b/src/filters/reader/CDDAReader/CDDAReader.h index f491b38ce..d8634530c 100644 --- a/src/filters/reader/CDDAReader/CDDAReader.h +++ b/src/filters/reader/CDDAReader/CDDAReader.h @@ -130,4 +130,3 @@ public: STDMETHODIMP get_MoreInfoBannerURL(BSTR* pbstrMoreInfoBannerURL);
STDMETHODIMP get_MoreInfoText(BSTR* pbstrMoreInfoText);
};
-
diff --git a/src/filters/reader/VTSReader/VTSReader.cpp b/src/filters/reader/VTSReader/VTSReader.cpp index 424cc1b90..89150182e 100644 --- a/src/filters/reader/VTSReader/VTSReader.cpp +++ b/src/filters/reader/VTSReader/VTSReader.cpp @@ -222,4 +222,3 @@ void CVTSStream::Unlock() {
m_csLock.Unlock();
}
-
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp index 0466d2324..902c3209a 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.cpp @@ -1,7 +1,7 @@ /*
* $Id$
*
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -191,7 +191,6 @@ CMpcAudioRenderer::CMpcAudioRenderer(LPUNKNOWN punk, HRESULT *phr) }
}
-
CMpcAudioRenderer::~CMpcAudioRenderer()
{
Stop();
@@ -219,7 +218,6 @@ CMpcAudioRenderer::~CMpcAudioRenderer() }
}
-
HRESULT CMpcAudioRenderer::CheckInputType(const CMediaType *pmt)
{
return CheckMediaType(pmt);
@@ -330,7 +328,6 @@ HRESULT CMpcAudioRenderer::DoRenderSample(IMediaSample *pMediaSample) }
}
-
STDMETHODIMP CMpcAudioRenderer::NonDelegatingQueryInterface(REFIID riid, void **ppv)
{
if (riid == IID_IReferenceClock) {
@@ -485,7 +482,6 @@ STDMETHODIMP CMpcAudioRenderer::Stop() return CBaseRenderer::Stop();
};
-
STDMETHODIMP CMpcAudioRenderer::Pause()
{
if (m_pDSBuffer) {
@@ -667,8 +663,6 @@ HRESULT CMpcAudioRenderer::GetReferenceClockInterface(REFIID riid, void **ppv) return GetReferenceClockInterface(riid, ppv);
}
-
-
HRESULT CMpcAudioRenderer::EndOfStream(void)
{
if (m_pDSBuffer) {
@@ -685,7 +679,6 @@ HRESULT CMpcAudioRenderer::EndOfStream(void) }
-
#pragma region // ==== DirectSound
HRESULT CMpcAudioRenderer::CreateDSBuffer()
@@ -743,8 +736,6 @@ HRESULT CMpcAudioRenderer::CreateDSBuffer() return hr;
}
-
-
HRESULT CMpcAudioRenderer::ClearBuffer()
{
HRESULT hr = S_FALSE;
@@ -1335,7 +1326,6 @@ HRESULT CMpcAudioRenderer::InitAudioClient(WAVEFORMATEX *pWaveFormatEx, IAudioCl return hr;
}
-
HRESULT CMpcAudioRenderer::CreateAudioClient(IMMDevice *pMMDevice, IAudioClient **ppAudioClient)
{
HRESULT hr = S_OK;
@@ -1364,4 +1354,3 @@ HRESULT CMpcAudioRenderer::CreateAudioClient(IMMDevice *pMMDevice, IAudioClient }
return hr;
}
-
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h index 4c07cf7a7..4759e3368 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRenderer.h @@ -28,10 +28,10 @@ #include <MMReg.h> //must be before other Wasapi headers
#include <strsafe.h>
#include <mmdeviceapi.h>
-#include <Avrt.h>
+#include <avrt.h>
#include <audioclient.h>
-#include <Endpointvolume.h>
-#include <Functiondiscoverykeys_devpkey.h>
+#include <endpointvolume.h>
+#include <FunctionDiscoveryKeys_devpkey.h>
#include "MpcAudioRendererSettingsWnd.h"
#include "SoundTouch/include/SoundTouch.h"
@@ -158,4 +158,3 @@ private: PTR_AvRevertMmThreadCharacteristics pfAvRevertMmThreadCharacteristics;
};
-
diff --git a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp index bf1b5dccf..6b6ca3571 100644 --- a/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp +++ b/src/filters/renderer/MpcAudioRenderer/MpcAudioRendererSettingsWnd.cpp @@ -145,5 +145,3 @@ bool CMpcAudioRendererSettingsWnd::OnApply() BEGIN_MESSAGE_MAP(CMpcAudioRendererSettingsWnd, CInternalPropertyPageWnd)
END_MESSAGE_MAP()
-
-
diff --git a/src/filters/renderer/MpcAudioRenderer/stdafx.cpp b/src/filters/renderer/MpcAudioRenderer/stdafx.cpp index 0ac102726..d4680f2cd 100644 --- a/src/filters/renderer/MpcAudioRenderer/stdafx.cpp +++ b/src/filters/renderer/MpcAudioRenderer/stdafx.cpp @@ -20,5 +20,4 @@ *
*/
-
#include "stdafx.h"
diff --git a/src/filters/renderer/SyncClock/SyncClock.cpp b/src/filters/renderer/SyncClock/SyncClock.cpp index fcd760db8..a9b7764be 100644 --- a/src/filters/renderer/SyncClock/SyncClock.cpp +++ b/src/filters/renderer/SyncClock/SyncClock.cpp @@ -68,7 +68,6 @@ STDMETHODIMP CSyncClockFilter::GetStartTime(REFERENCE_TIME *startTime) return S_OK;
}
-
STDMETHODIMP CSyncClockFilter::NonDelegatingQueryInterface( REFIID riid, void ** ppv )
{
CheckPointer(ppv, E_POINTER);
diff --git a/src/filters/renderer/SyncClock/SyncClock.h b/src/filters/renderer/SyncClock/SyncClock.h index fdb90420e..a921460ad 100644 --- a/src/filters/renderer/SyncClock/SyncClock.h +++ b/src/filters/renderer/SyncClock/SyncClock.h @@ -53,4 +53,3 @@ private: CSyncClock m_Clock;
CCritSec m_Lock;
};
-
diff --git a/src/filters/renderer/SyncClock/stdafx.cpp b/src/filters/renderer/SyncClock/stdafx.cpp index 0385cc615..a85fc6920 100644 --- a/src/filters/renderer/SyncClock/stdafx.cpp +++ b/src/filters/renderer/SyncClock/stdafx.cpp @@ -19,11 +19,4 @@ *
*/
-// stdafx.cpp : source file that includes just the standard includes
-// shoutcastsource.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/filters/renderer/SyncClock/stdafx.h b/src/filters/renderer/SyncClock/stdafx.h index a9f666228..b0fde19fa 100644 --- a/src/filters/renderer/SyncClock/stdafx.h +++ b/src/filters/renderer/SyncClock/stdafx.h @@ -19,11 +19,6 @@ *
*/
-// stdafx.h : include file for standard system include files,
-// or project specific include files that are used frequently, but
-// are changed infrequently
-//
-
#pragma once
#include "../../../DSUtil/SharedInclude.h"
@@ -36,8 +31,5 @@ #include <afx.h>
#include <afxwin.h> // MFC core and standard components
-
-// TODO: reference additional headers your program requires here
-
#include <streams.h>
#include <dvdmedia.h>
diff --git a/src/filters/renderer/VideoRenderers/AllocatorCommon.h b/src/filters/renderer/VideoRenderers/AllocatorCommon.h index fd0ea9091..f16ac941f 100644 --- a/src/filters/renderer/VideoRenderers/AllocatorCommon.h +++ b/src/filters/renderer/VideoRenderers/AllocatorCommon.h @@ -25,7 +25,7 @@ #include <d3d9.h>
#include <d3dx9.h>
-#include <Vmr9.h>
+#include <vmr9.h>
#include "../../../SubPic/ISubPic.h"
#include "PixelShaderCompiler.h"
@@ -74,4 +74,3 @@ public IUnknown { public:
virtual STDMETHODIMP support_ffdshow(void) = 0;
};
-
diff --git a/src/filters/renderer/VideoRenderers/D3DFont.cpp b/src/filters/renderer/VideoRenderers/D3DFont.cpp index 46d9fdbc7..5b741ad30 100644 --- a/src/filters/renderer/VideoRenderers/D3DFont.cpp +++ b/src/filters/renderer/VideoRenderers/D3DFont.cpp @@ -78,7 +78,6 @@ inline FONT3DVERTEX InitFont3DVertex( const D3DXVECTOR3& p, const D3DXVECTOR3& n -
//-----------------------------------------------------------------------------
// Name: CD3DFont()
// Desc: Font class constructor
@@ -101,7 +100,6 @@ CD3DFont::CD3DFont( const TCHAR* strFontName, DWORD dwHeight, DWORD dwFlags ) -
//-----------------------------------------------------------------------------
// Name: ~CD3DFont()
// Desc: Font class destructor
@@ -114,7 +112,6 @@ CD3DFont::~CD3DFont() -
//-----------------------------------------------------------------------------
// Name: CreateGDIFont
// Desc: Create a font based on the current state of related member variables
@@ -143,7 +140,6 @@ HRESULT CD3DFont::CreateGDIFont( HDC hDC, HFONT* pFont ) -
//-----------------------------------------------------------------------------
// Name: PaintAlphabet
// Desc: Paint the printable characters for the given GDI font onto the
@@ -202,8 +198,6 @@ HRESULT CD3DFont::PaintAlphabet( HDC hDC, BOOL bMeasureOnly ) -
-
//-----------------------------------------------------------------------------
// Name: InitDeviceObjects()
// Desc: Initializes device-dependent objects, including the vertex buffer used
@@ -358,7 +352,6 @@ LCleanReturn: -
//-----------------------------------------------------------------------------
// Name: RestoreDeviceObjects()
// Desc:
@@ -454,7 +447,6 @@ HRESULT CD3DFont::RestoreDeviceObjects() -
//-----------------------------------------------------------------------------
// Name: InvalidateDeviceObjects()
// Desc: Destroys all device-dependent objects
@@ -470,7 +462,6 @@ HRESULT CD3DFont::InvalidateDeviceObjects() -
//-----------------------------------------------------------------------------
// Name: DeleteDeviceObjects()
// Desc: Destroys all device-dependent objects
@@ -485,7 +476,6 @@ HRESULT CD3DFont::DeleteDeviceObjects() -
//-----------------------------------------------------------------------------
// Name: GetTextExtent()
// Desc: Get the dimensions of a text string
@@ -531,7 +521,6 @@ HRESULT CD3DFont::GetTextExtent( const TCHAR* strText, SIZE* pSize ) -
//-----------------------------------------------------------------------------
// Name: DrawTextScaled()
// Desc: Draws scaled 2D text. Note that x and y are in viewport coordinates
@@ -668,7 +657,6 @@ HRESULT CD3DFont::DrawTextScaled( FLOAT x, FLOAT y, FLOAT z, -
//-----------------------------------------------------------------------------
// Name: DrawText()
// Desc: Draws 2D text. Note that sx and sy are in pixels
@@ -792,7 +780,6 @@ HRESULT CD3DFont::DrawText( FLOAT sx, FLOAT sy, DWORD dwColor, -
//-----------------------------------------------------------------------------
// Name: Render3DText()
// Desc: Renders 3D text
diff --git a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp index 420355842..10bcf8dca 100644 --- a/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/DX9AllocatorPresenter.cpp @@ -574,7 +574,6 @@ void CDX9AllocatorPresenter::VSyncThread() // if (pfAvRevertMmThreadCharacteristics) pfAvRevertMmThreadCharacteristics (hAvrt);
}
-
DWORD WINAPI CDX9AllocatorPresenter::VSyncThreadStatic(LPVOID lpParam)
{
SetThreadName((DWORD)-1, "CDX9Presenter::VSyncThread");
@@ -1433,7 +1432,6 @@ int CDX9AllocatorPresenter::GetVBlackPos() }
}
-
bool CDX9AllocatorPresenter::WaitForVBlank(bool &_Waited, bool &_bTakenLock)
{
CRenderersSettings& s = GetRenderersSettings();
@@ -1950,7 +1948,6 @@ void CDX9AllocatorPresenter::DrawText(const RECT &rc, const CString &strText, in m_pFont->DrawText( m_pSprite, strText, -1, &Rect1, DT_NOCLIP, Color1);
}
-
void CDX9AllocatorPresenter::DrawStats()
{
CRenderersSettings& s = GetRenderersSettings();
diff --git a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp index 950fe4cb3..c0a9c8bd9 100644 --- a/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp +++ b/src/filters/renderer/VideoRenderers/DX9RenderingEngine.cpp @@ -35,6 +35,7 @@ struct MYD3DVERTEX { float u, v;
} t[texcoords];
};
+
template<>
struct MYD3DVERTEX<0> {
float x, y, z, rhw;
diff --git a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp index 31f1d7169..383685024 100644 --- a/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/EVRAllocatorPresenter.cpp @@ -196,7 +196,6 @@ CEVRAllocatorPresenter::~CEVRAllocatorPresenter(void) m_pD3DManager = NULL;
}
-
void CEVRAllocatorPresenter::ResetStats()
{
m_pcFrames = 0;
@@ -206,7 +205,6 @@ void CEVRAllocatorPresenter::ResetStats() m_piDev = 0;
}
-
HRESULT CEVRAllocatorPresenter::CheckShutdown() const
{
if (m_nRenderState == Shutdown) {
@@ -216,7 +214,6 @@ HRESULT CEVRAllocatorPresenter::CheckShutdown() const }
}
-
void CEVRAllocatorPresenter::StartWorkerThreads()
{
DWORD dwThreadId;
@@ -273,7 +270,6 @@ void CEVRAllocatorPresenter::StopWorkerThreads() m_nRenderState = Shutdown;
}
-
STDMETHODIMP CEVRAllocatorPresenter::CreateRenderer(IUnknown** ppRenderer)
{
CheckPointer(ppRenderer, E_POINTER);
@@ -376,7 +372,6 @@ STDMETHODIMP CEVRAllocatorPresenter::NonDelegatingQueryInterface(REFIID riid, vo return hr;
}
-
// IMFClockStateSink
STDMETHODIMP CEVRAllocatorPresenter::OnClockStart(MFTIME hnsSystemTime, LONGLONG llClockStartOffset)
{
@@ -421,14 +416,12 @@ STDMETHODIMP CEVRAllocatorPresenter::OnClockRestart(MFTIME hnsSystemTime) return S_OK;
}
-
STDMETHODIMP CEVRAllocatorPresenter::OnClockSetRate(MFTIME hnsSystemTime, float flRate)
{
ASSERT (FALSE);
return E_NOTIMPL;
}
-
// IBaseFilter delegate
bool CEVRAllocatorPresenter::GetState( DWORD dwMilliSecsTimeout, FILTER_STATE *State, HRESULT &_ReturnValue)
{
@@ -478,8 +471,8 @@ STDMETHODIMP CEVRAllocatorPresenter::get_DevSyncOffset(int *piDev) return S_OK;
}
-
// IMFRateSupport
+
STDMETHODIMP CEVRAllocatorPresenter::GetSlowestRate(MFRATE_DIRECTION eDirection, BOOL fThin, float *pflRate)
{
// TODO : not finished...
@@ -547,7 +540,6 @@ STDMETHODIMP CEVRAllocatorPresenter::IsRateSupported(BOOL fThin, float flRate, f return hr;
}
-
float CEVRAllocatorPresenter::GetMaxRate(BOOL bThin)
{
float fMaxRate = FLT_MAX; // Default.
@@ -649,7 +641,6 @@ STDMETHODIMP CEVRAllocatorPresenter::ProcessMessage(MFVP_MESSAGE_TYPE eMessage, return hr;
}
-
HRESULT CEVRAllocatorPresenter::IsMediaTypeSupported(IMFMediaType* pMixerType)
{
HRESULT hr;
@@ -693,7 +684,6 @@ HRESULT CEVRAllocatorPresenter::IsMediaTypeSupported(IMFMediaType* pMixerType) return hr;
}
-
HRESULT CEVRAllocatorPresenter::CreateProposedOutputType(IMFMediaType* pMixerType, IMFMediaType** pType)
{
HRESULT hr;
@@ -1078,7 +1068,6 @@ HRESULT CEVRAllocatorPresenter::RenegotiateMediaType() return hr;
}
-
bool CEVRAllocatorPresenter::GetImageFromMixer()
{
MFT_OUTPUT_DATA_BUFFER Buffer;
@@ -1153,8 +1142,6 @@ bool CEVRAllocatorPresenter::GetImageFromMixer() return bDoneSomething;
}
-
-
STDMETHODIMP CEVRAllocatorPresenter::GetCurrentMediaType(__deref_out IMFVideoMediaType **ppMediaType)
{
HRESULT hr = S_OK;
@@ -1172,8 +1159,6 @@ STDMETHODIMP CEVRAllocatorPresenter::GetCurrentMediaType(__deref_out IMFVideoMe return hr;
}
-
-
// IMFTopologyServiceLookupClient
STDMETHODIMP CEVRAllocatorPresenter::InitServicePointers(/* [in] */ __in IMFTopologyServiceLookup *pLookup)
{
@@ -1205,7 +1190,6 @@ STDMETHODIMP CEVRAllocatorPresenter::ReleaseServicePointers() return S_OK;
}
-
// IMFVideoDeviceID
STDMETHODIMP CEVRAllocatorPresenter::GetDeviceID(/* [out] */ __out IID *pDeviceID)
{
@@ -1214,7 +1198,6 @@ STDMETHODIMP CEVRAllocatorPresenter::GetDeviceID(/* [out] */ __out IID *pDevice return S_OK;
}
-
// IMFGetService
STDMETHODIMP CEVRAllocatorPresenter::GetService (/* [in] */ __RPC__in REFGUID guidService,
/* [in] */ __RPC__in REFIID riid,
@@ -1229,7 +1212,6 @@ STDMETHODIMP CEVRAllocatorPresenter::GetService (/* [in] */ __RPC__in REFGUID gu return E_NOINTERFACE;
}
-
// IMFAsyncCallback
STDMETHODIMP CEVRAllocatorPresenter::GetParameters( /* [out] */ __RPC__out DWORD *pdwFlags, /* [out] */ __RPC__out DWORD *pdwQueue)
{
@@ -1241,7 +1223,6 @@ STDMETHODIMP CEVRAllocatorPresenter::Invoke ( /* [in] */ __RPC__in_opt IMFAsyn return E_NOTIMPL;
}
-
// IMFVideoDisplayControl
STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(SIZE *pszVideo, SIZE *pszARVideo)
{
@@ -1255,6 +1236,7 @@ STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(SIZE *pszVideo, SIZE *ps }
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetIdealVideoSize(SIZE *pszMin, SIZE *pszMax)
{
if (pszMin) {
@@ -1274,10 +1256,12 @@ STDMETHODIMP CEVRAllocatorPresenter::GetIdealVideoSize(SIZE *pszMin, SIZE *pszMa return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetVideoPosition(const MFVideoNormalizedRect *pnrcSource, const LPRECT prcDest)
{
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetVideoPosition(MFVideoNormalizedRect *pnrcSource, LPRECT prcDest)
{
// Always all source rectangle ?
@@ -1294,66 +1278,78 @@ STDMETHODIMP CEVRAllocatorPresenter::GetVideoPosition(MFVideoNormalizedRect *pnr return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetAspectRatioMode(DWORD dwAspectRatioMode)
{
m_dwVideoAspectRatioMode = (MFVideoAspectRatioMode)dwAspectRatioMode;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetAspectRatioMode(DWORD *pdwAspectRatioMode)
{
CheckPointer (pdwAspectRatioMode, E_POINTER);
*pdwAspectRatioMode = m_dwVideoAspectRatioMode;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetVideoWindow(HWND hwndVideo)
{
ASSERT (m_hWnd == hwndVideo); // What if not ??
// m_hWnd = hwndVideo;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetVideoWindow(HWND *phwndVideo)
{
CheckPointer (phwndVideo, E_POINTER);
*phwndVideo = m_hWnd;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::RepaintVideo()
{
Paint (true);
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetCurrentImage(BITMAPINFOHEADER *pBih, BYTE **pDib, DWORD *pcbDib, LONGLONG *pTimeStamp)
{
ASSERT (FALSE);
return E_NOTIMPL;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetBorderColor(COLORREF Clr)
{
m_BorderColor = Clr;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetBorderColor(COLORREF *pClr)
{
CheckPointer (pClr, E_POINTER);
*pClr = m_BorderColor;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetRenderingPrefs(DWORD dwRenderFlags)
{
m_dwVideoRenderPrefs = (MFVideoRenderPrefs)dwRenderFlags;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetRenderingPrefs(DWORD *pdwRenderFlags)
{
CheckPointer(pdwRenderFlags, E_POINTER);
*pdwRenderFlags = m_dwVideoRenderPrefs;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetFullscreen(BOOL fFullscreen)
{
ASSERT (FALSE);
return E_NOTIMPL;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetFullscreen(BOOL *pfFullscreen)
{
ASSERT (FALSE);
@@ -1368,16 +1364,19 @@ STDMETHODIMP CEVRAllocatorPresenter::IsInTrustedVideoMode(BOOL *pYes) *pYes = TRUE;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::CanConstrict(BOOL *pYes)
{
CheckPointer(pYes, E_POINTER);
*pYes = TRUE;
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::SetConstriction(DWORD dwKPix)
{
return S_OK;
}
+
STDMETHODIMP CEVRAllocatorPresenter::DisableImageExport(BOOL bDisable)
{
return S_OK;
@@ -1390,31 +1389,37 @@ STDMETHODIMP CEVRAllocatorPresenter::ResetDevice(IDirect3DDevice9 *pDevice,UINT HRESULT hr = m_pD3DManager->ResetDevice (pDevice, resetToken);
return hr;
}
+
STDMETHODIMP CEVRAllocatorPresenter::OpenDeviceHandle(HANDLE *phDevice)
{
HRESULT hr = m_pD3DManager->OpenDeviceHandle (phDevice);
return hr;
}
+
STDMETHODIMP CEVRAllocatorPresenter::CloseDeviceHandle(HANDLE hDevice)
{
HRESULT hr = m_pD3DManager->CloseDeviceHandle(hDevice);
return hr;
}
+
STDMETHODIMP CEVRAllocatorPresenter::TestDevice(HANDLE hDevice)
{
HRESULT hr = m_pD3DManager->TestDevice(hDevice);
return hr;
}
+
STDMETHODIMP CEVRAllocatorPresenter::LockDevice(HANDLE hDevice, IDirect3DDevice9 **ppDevice, BOOL fBlock)
{
HRESULT hr = m_pD3DManager->LockDevice(hDevice, ppDevice, fBlock);
return hr;
}
+
STDMETHODIMP CEVRAllocatorPresenter::UnlockDevice(HANDLE hDevice, BOOL fSaveState)
{
HRESULT hr = m_pD3DManager->UnlockDevice(hDevice, fSaveState);
return hr;
}
+
STDMETHODIMP CEVRAllocatorPresenter::GetVideoService(HANDLE hDevice, REFIID riid, void **ppService)
{
HRESULT hr = m_pD3DManager->GetVideoService(hDevice, riid, ppService);
@@ -1432,7 +1437,6 @@ STDMETHODIMP CEVRAllocatorPresenter::GetVideoService(HANDLE hDevice, REFIID riid return hr;
}
-
STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(LONG* lpWidth, LONG* lpHeight, LONG* lpARWidth, LONG* lpARHeight)
{
// This function should be called...
@@ -1453,7 +1457,6 @@ STDMETHODIMP CEVRAllocatorPresenter::GetNativeVideoSize(LONG* lpWidth, LONG* lpH return S_OK;
}
-
STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType)
{
HRESULT hr;
@@ -1495,7 +1498,6 @@ STDMETHODIMP CEVRAllocatorPresenter::InitializeDevice(IMFMediaType* pMediaType) return hr;
}
-
DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam)
{
SetThreadName((DWORD)-1, "CEVRPresenter::MixerThread");
@@ -1504,7 +1506,6 @@ DWORD WINAPI CEVRAllocatorPresenter::GetMixerThreadStatic(LPVOID lpParam) return 0;
}
-
DWORD WINAPI CEVRAllocatorPresenter::PresentThread(LPVOID lpParam)
{
SetThreadName((DWORD)-1, "CEVRPresenter::PresentThread");
@@ -1513,7 +1514,6 @@ DWORD WINAPI CEVRAllocatorPresenter::PresentThread(LPVOID lpParam) return 0;
}
-
void CEVRAllocatorPresenter::CheckWaitingSampleFromMixer()
{
if (m_bWaitingSample) {
@@ -1522,7 +1522,6 @@ void CEVRAllocatorPresenter::CheckWaitingSampleFromMixer() }
}
-
bool ExtractInterlaced(const AM_MEDIA_TYPE* pmt)
{
if (pmt->formattype==FORMAT_VideoInfo) {
@@ -1538,7 +1537,6 @@ bool ExtractInterlaced(const AM_MEDIA_TYPE* pmt) }
}
-
void CEVRAllocatorPresenter::GetMixerThread()
{
//HANDLE hAvrt;
@@ -2305,7 +2303,6 @@ HRESULT CEVRAllocatorPresenter::GetFreeSample(IMFSample** ppSample) return hr;
}
-
HRESULT CEVRAllocatorPresenter::GetScheduledSample(IMFSample** ppSample, int &_Count)
{
CAutoLock lock(&m_SampleQueueLock);
@@ -2322,7 +2319,6 @@ HRESULT CEVRAllocatorPresenter::GetScheduledSample(IMFSample** ppSample, int &_C return hr;
}
-
void CEVRAllocatorPresenter::MoveToFreeList(IMFSample* pSample, bool bTail)
{
CAutoLock lock(&m_SampleQueueLock);
@@ -2338,7 +2334,6 @@ void CEVRAllocatorPresenter::MoveToFreeList(IMFSample* pSample, bool bTail) }
}
-
void CEVRAllocatorPresenter::MoveToScheduledList(IMFSample* pSample, bool _bSorted)
{
@@ -2572,8 +2567,6 @@ void CEVRAllocatorPresenter::MoveToScheduledList(IMFSample* pSample, bool _bSort }
}
-
-
void CEVRAllocatorPresenter::FlushSamples()
{
CAutoLock lock(this);
diff --git a/src/filters/renderer/VideoRenderers/IPinHook.cpp b/src/filters/renderer/VideoRenderers/IPinHook.cpp index dd5099825..42531bb1d 100644 --- a/src/filters/renderer/VideoRenderers/IPinHook.cpp +++ b/src/filters/renderer/VideoRenderers/IPinHook.cpp @@ -202,7 +202,6 @@ static HRESULT STDMETHODCALLTYPE ReceiveMine(IMemInputPinC * This, IMediaSample return ReceiveMineI(This,pSample);
}
-
void UnhookNewSegmentAndReceive()
{
BOOL res;
@@ -701,7 +700,6 @@ inline static void LogDXVA_Bitstream(BYTE* pBuffer, int nSize) {} #endif
-
#ifdef _DEBUG
static HRESULT STDMETHODCALLTYPE GetVideoAcceleratorGUIDsMine(IAMVideoAcceleratorC * This, LPDWORD pdwNumGuidsSupported, LPGUID pGuidsSupported)
{
@@ -1101,10 +1099,8 @@ void HookAMVideoAccelerator(IAMVideoAcceleratorC* pAMVideoAcceleratorC) }
-
// === Hook for DXVA2
-
#ifdef _DEBUG
static void LogDecodeBufferDesc(DXVA2_DecodeBufferDesc* pDecodeBuff)
{
diff --git a/src/filters/renderer/VideoRenderers/OuterEVR.cpp b/src/filters/renderer/VideoRenderers/OuterEVR.cpp index ecfb8041c..1c2a487ec 100644 --- a/src/filters/renderer/VideoRenderers/OuterEVR.cpp +++ b/src/filters/renderer/VideoRenderers/OuterEVR.cpp @@ -131,7 +131,6 @@ STDMETHODIMP COuterEVR::GetState(DWORD dwMilliSecsTimeout, __out FILTER_STATE * return E_NOTIMPL;
}
-
STDMETHODIMP COuterEVR::SetSyncSource(__in_opt IReferenceClock *pClock) {
CComPtr<IBaseFilter> pEVRBase;
if (m_pEVR) {
@@ -165,7 +164,6 @@ STDMETHODIMP COuterEVR::GetClassID(__RPC__out CLSID *pClassID) { return E_NOTIMPL;
}
-
STDMETHODIMP COuterEVR::GetAlphaBitmapParameters(VMR9AlphaBitmap* pBmpParms)
{
CheckPointer(pBmpParms, E_POINTER);
diff --git a/src/filters/renderer/VideoRenderers/RenderersSettings.h b/src/filters/renderer/VideoRenderers/RenderersSettings.h index 3b94bd685..9768ccc83 100644 --- a/src/filters/renderer/VideoRenderers/RenderersSettings.h +++ b/src/filters/renderer/VideoRenderers/RenderersSettings.h @@ -142,7 +142,6 @@ public: void UpdateData(bool fSave);
};
-
class CRenderersData
{
HINSTANCE m_hD3DX9Dll;
diff --git a/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h b/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h index 62ff11e70..419f07611 100644 --- a/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h +++ b/src/filters/renderer/VideoRenderers/SyncAllocatorPresenter.h @@ -32,4 +32,4 @@ public IUnknown { STDMETHOD (AdviseSyncClock)(ISyncClock* sC) PURE;
};
-HRESULT CreateSyncRenderer(const CLSID& clsid, HWND hWnd, bool bFullscreen, ISubPicAllocatorPresenter** ppAP);
\ No newline at end of file +HRESULT CreateSyncRenderer(const CLSID& clsid, HWND hWnd, bool bFullscreen, ISubPicAllocatorPresenter** ppAP);
diff --git a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp index 527433362..3640f1c22 100644 --- a/src/filters/renderer/VideoRenderers/SyncRenderer.cpp +++ b/src/filters/renderer/VideoRenderers/SyncRenderer.cpp @@ -28,11 +28,11 @@ #include "../../../apps/mplayerc/resource.h"
#include "../../../DSUtil/DSUtil.h"
#include <strsafe.h> // Required in CGenlock
-#include <Videoacc.h>
+#include <videoacc.h>
#include <initguid.h>
#include <d3d9.h>
#include <d3dx9.h>
-#include <Vmr9.h>
+#include <vmr9.h>
#include <evr.h>
#include <mfapi.h>
#include <Mferror.h>
@@ -2391,7 +2391,6 @@ STDMETHODIMP CBaseAP::SetPixelShader2(LPCSTR pSrcData, LPCSTR pTarget, bool bScr return S_OK;
}
-
CSyncAP::CSyncAP(HWND hWnd, bool bFullscreen, HRESULT& hr, CString &_Error): CBaseAP(hWnd, bFullscreen, hr, _Error)
{
HMODULE hLib;
@@ -2710,26 +2709,31 @@ STDMETHODIMP CSyncAP::get_FramesDroppedInRenderer(int *pcFrames) *pcFrames = m_pcFramesDropped;
return S_OK;
}
+
STDMETHODIMP CSyncAP::get_FramesDrawn(int *pcFramesDrawn)
{
*pcFramesDrawn = m_pcFramesDrawn;
return S_OK;
}
+
STDMETHODIMP CSyncAP::get_AvgFrameRate(int *piAvgFrameRate)
{
*piAvgFrameRate = (int)(m_fAvrFps * 100);
return S_OK;
}
+
STDMETHODIMP CSyncAP::get_Jitter(int *iJitter)
{
*iJitter = (int)((m_fJitterStdDev/10000.0) + 0.5);
return S_OK;
}
+
STDMETHODIMP CSyncAP::get_AvgSyncOffset(int *piAvg)
{
*piAvg = (int)((m_fSyncOffsetAvr/10000.0) + 0.5);
return S_OK;
}
+
STDMETHODIMP CSyncAP::get_DevSyncOffset(int *piDev)
{
*piDev = (int)((m_fSyncOffsetStdDev/10000.0) + 0.5);
@@ -3228,7 +3232,6 @@ STDMETHODIMP CSyncAP::GetService( __RPC__in REFGUID guidService, __RPC__in REFII return E_NOINTERFACE;
}
-
// IMFAsyncCallback
STDMETHODIMP CSyncAP::GetParameters( __RPC__out DWORD *pdwFlags, __RPC__out DWORD *pdwQueue)
{
@@ -3272,10 +3275,12 @@ STDMETHODIMP CSyncAP::GetIdealVideoSize(SIZE *pszMin, SIZE *pszMax) }
return S_OK;
}
+
STDMETHODIMP CSyncAP::SetVideoPosition(const MFVideoNormalizedRect *pnrcSource, const LPRECT prcDest)
{
return S_OK;
}
+
STDMETHODIMP CSyncAP::GetVideoPosition(MFVideoNormalizedRect *pnrcSource, LPRECT prcDest)
{
if (pnrcSource) {
@@ -3289,65 +3294,77 @@ STDMETHODIMP CSyncAP::GetVideoPosition(MFVideoNormalizedRect *pnrcSource, LPRECT }
return S_OK;
}
+
STDMETHODIMP CSyncAP::SetAspectRatioMode(DWORD dwAspectRatioMode)
{
m_dwVideoAspectRatioMode = (MFVideoAspectRatioMode)dwAspectRatioMode;
return S_OK;
}
+
STDMETHODIMP CSyncAP::GetAspectRatioMode(DWORD *pdwAspectRatioMode)
{
CheckPointer (pdwAspectRatioMode, E_POINTER);
*pdwAspectRatioMode = m_dwVideoAspectRatioMode;
return S_OK;
}
+
STDMETHODIMP CSyncAP::SetVideoWindow(HWND hwndVideo)
{
ASSERT (m_hWnd == hwndVideo);
return S_OK;
}
+
STDMETHODIMP CSyncAP::GetVideoWindow(HWND *phwndVideo)
{
CheckPointer(phwndVideo, E_POINTER);
*phwndVideo = m_hWnd;
return S_OK;
}
+
STDMETHODIMP CSyncAP::RepaintVideo()
{
Paint(true);
return S_OK;
}
+
STDMETHODIMP CSyncAP::GetCurrentImage(BITMAPINFOHEADER *pBih, BYTE **pDib, DWORD *pcbDib, LONGLONG *pTimeStamp)
{
ASSERT (FALSE);
return E_NOTIMPL;
}
+
STDMETHODIMP CSyncAP::SetBorderColor(COLORREF Clr)
{
m_BorderColor = Clr;
return S_OK;
}
+
STDMETHODIMP CSyncAP::GetBorderColor(COLORREF *pClr)
{
CheckPointer (pClr, E_POINTER);
*pClr = m_BorderColor;
return S_OK;
}
+
STDMETHODIMP CSyncAP::SetRenderingPrefs(DWORD dwRenderFlags)
{
m_dwVideoRenderPrefs = (MFVideoRenderPrefs)dwRenderFlags;
return S_OK;
}
+
STDMETHODIMP CSyncAP::GetRenderingPrefs(DWORD *pdwRenderFlags)
{
CheckPointer(pdwRenderFlags, E_POINTER);
*pdwRenderFlags = m_dwVideoRenderPrefs;
return S_OK;
}
+
STDMETHODIMP CSyncAP::SetFullscreen(BOOL fFullscreen)
{
ASSERT (FALSE);
return E_NOTIMPL;
}
+
STDMETHODIMP CSyncAP::GetFullscreen(BOOL *pfFullscreen)
{
ASSERT (FALSE);
diff --git a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp index 8a503e17d..13a60ed19 100644 --- a/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR7AllocatorPresenter.cpp @@ -324,10 +324,12 @@ STDMETHODIMP CVMR7AllocatorPresenter::GetMinIdealVideoSize(LONG* lpWidth, LONG* {
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::GetMaxIdealVideoSize(LONG* lpWidth, LONG* lpHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::SetVideoPosition(const LPRECT lpSRCRect, const LPRECT lpDSTRect)
{
return E_NOTIMPL; // we have our own method for this
@@ -354,22 +356,27 @@ STDMETHODIMP CVMR7AllocatorPresenter::SetAspectRatioMode(DWORD AspectRatioMode) {
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::SetVideoClippingWindow(HWND hwnd)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::RepaintVideo(HWND hwnd, HDC hdc)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::DisplayModeChanged()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::GetCurrentImage(BYTE** lpDib)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::SetBorderColor(COLORREF Clr)
{
return E_NOTIMPL;
@@ -387,6 +394,7 @@ STDMETHODIMP CVMR7AllocatorPresenter::SetColorKey(COLORREF Clr) {
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR7AllocatorPresenter::GetColorKey(COLORREF* lpClr)
{
return E_NOTIMPL;
diff --git a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp index 939958d51..39e3e632f 100644 --- a/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp +++ b/src/filters/renderer/VideoRenderers/VMR9AllocatorPresenter.cpp @@ -340,7 +340,6 @@ STDMETHODIMP CVMR9AllocatorPresenter::StopPresenting(DWORD_PTR dwUserID) return S_OK;
}
-
STDMETHODIMP CVMR9AllocatorPresenter::PresentImage(DWORD_PTR dwUserID, VMR9PresentationInfo* lpPresInfo)
{
SetThreadName((DWORD)-1, "CVMR9AllocatorPresenter");
@@ -498,24 +497,29 @@ STDMETHODIMP CVMR9AllocatorPresenter::GetNativeVideoSize(LONG* lpWidth, LONG* lp }
return S_OK;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::GetMinIdealVideoSize(LONG* lpWidth, LONG* lpHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::GetMaxIdealVideoSize(LONG* lpWidth, LONG* lpHeight)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::SetVideoPosition(const LPRECT lpSRCRect, const LPRECT lpDSTRect)
{
return E_NOTIMPL; // we have our own method for this
}
+
STDMETHODIMP CVMR9AllocatorPresenter::GetVideoPosition(LPRECT lpSRCRect, LPRECT lpDSTRect)
{
CopyRect(lpSRCRect, CRect(CPoint(0, 0), GetVisibleVideoSize()));
CopyRect(lpDSTRect, &m_VideoRect);
return S_OK;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::GetAspectRatioMode(DWORD* lpAspectRatioMode)
{
if(lpAspectRatioMode) {
@@ -523,30 +527,37 @@ STDMETHODIMP CVMR9AllocatorPresenter::GetAspectRatioMode(DWORD* lpAspectRatioMod }
return S_OK;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::SetAspectRatioMode(DWORD AspectRatioMode)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::SetVideoClippingWindow(HWND hwnd)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::RepaintVideo(HWND hwnd, HDC hdc)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::DisplayModeChanged()
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::GetCurrentImage(BYTE** lpDib)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::SetBorderColor(COLORREF Clr)
{
return E_NOTIMPL;
}
+
STDMETHODIMP CVMR9AllocatorPresenter::GetBorderColor(COLORREF* lpClr)
{
if(lpClr) {
diff --git a/src/filters/source/D2VSource/MPEG2Dec.cpp b/src/filters/source/D2VSource/MPEG2Dec.cpp index 190768532..684ef46c6 100644 --- a/src/filters/source/D2VSource/MPEG2Dec.cpp +++ b/src/filters/source/D2VSource/MPEG2Dec.cpp @@ -596,7 +596,6 @@ void CMPEG2Dec::Next_File() _read(Infile[File_Flag], Rdbfr + Read, BUFFER_SIZE - Read);
}
-
unsigned int CMPEG2Dec::Show_Bits(unsigned int N)
{
if (N <= BitsLeft)
@@ -2884,7 +2883,6 @@ void CMPEG2Dec::motion_vectors(int PMV[2][2][2],int dmvector[2], }
}
-
/* ISO/IEC 13818-2 section 7.6.3.6: Dual prime additional arithmetic */
void CMPEG2Dec::Dual_Prime_Arithmetic(int DMV[][2],int *dmvector, int mvx,int mvy)
{
diff --git a/src/filters/source/D2VSource/stdafx.cpp b/src/filters/source/D2VSource/stdafx.cpp index 0d549c051..a27b824da 100644 --- a/src/filters/source/D2VSource/stdafx.cpp +++ b/src/filters/source/D2VSource/stdafx.cpp @@ -1,8 +1 @@ -// stdafx.cpp : source file that includes just the standard includes
-// d2vsource.pch will be the pre-compiled header
-// stdafx.obj will contain the pre-compiled type information
-
#include "stdafx.h"
-
-// TODO: reference any additional headers you need in STDAFX.H
-// and not in this file
diff --git a/src/filters/source/FLACSource/FLACSource.cpp b/src/filters/source/FLACSource/FLACSource.cpp index 7a7e83aa8..006e831fb 100644 --- a/src/filters/source/FLACSource/FLACSource.cpp +++ b/src/filters/source/FLACSource/FLACSource.cpp @@ -162,7 +162,6 @@ CFLACStream::~CFLACStream() {
}
-
HRESULT CFLACStream::DecideBufferSize(IMemAllocator* pAlloc, ALLOCATOR_PROPERTIES* pProperties)
{
ASSERT(pAlloc);
@@ -219,8 +218,6 @@ HRESULT CFLACStream::FillBuffer(IMediaSample* pSample, int nFrame, BYTE* pOut, l return S_OK;
}
-
-
HRESULT CFLACStream::GetMediaType(int iPosition, CMediaType* pmt)
{
CAutoLock cAutoLock(m_pFilter->pStateLock());
@@ -259,7 +256,6 @@ HRESULT CFLACStream::CheckMediaType(const CMediaType* pmt) }
}
-
void CFLACStream::UpdateFromMetadata (void* pBuffer)
{
const FLAC__StreamMetadata* pMetadata = (const FLAC__StreamMetadata*) pBuffer;
@@ -278,7 +274,6 @@ void CFLACStream::UpdateFromMetadata (void* pBuffer) m_AvgTimePerFrame = (m_nMaxFrameSize + pMetadata->data.stream_info.min_framesize) * m_rtDuration / 2 / m_llFileSize;
}
-
FLAC__StreamDecoderReadStatus StreamDecoderRead(const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], size_t *bytes, void *client_data)
{
CFLACStream* pThis = static_cast<CFLACStream*> (client_data);
@@ -327,7 +322,6 @@ FLAC__bool StreamDecoderEof(const FLAC__StreamDecoder *decoder, void *client_dat return pThis->m_bIsEOF;
}
-
FLAC__StreamDecoderWriteStatus StreamDecoderWrite(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
{
CFLACStream* pThis = static_cast<CFLACStream*> (client_data);
@@ -340,7 +334,6 @@ void StreamDecoderError(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderE {
}
-
void StreamDecoderMetadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
{
CFLACStream* pThis = static_cast<CFLACStream*> (client_data);
@@ -349,4 +342,3 @@ void StreamDecoderMetadata(const FLAC__StreamDecoder *decoder, const FLAC__Strea pThis->UpdateFromMetadata ((void*)metadata);
}
}
-
diff --git a/src/filters/source/FLACSource/FLACSource.h b/src/filters/source/FLACSource/FLACSource.h index a4f2ebbf1..4983f559f 100644 --- a/src/filters/source/FLACSource/FLACSource.h +++ b/src/filters/source/FLACSource/FLACSource.h @@ -34,7 +34,6 @@ public: virtual ~CFLACSource();
};
-
class CGolombBuffer;
class CFLACStream : public CBaseStream
diff --git a/src/filters/source/FLICSource/FLICSource.h b/src/filters/source/FLICSource/FLICSource.h index 6df23ec7e..b28199adf 100644 --- a/src/filters/source/FLICSource/FLICSource.h +++ b/src/filters/source/FLICSource/FLICSource.h @@ -149,4 +149,3 @@ public: STDMETHODIMP Notify(IBaseFilter* pSender, Quality q);
};
-
diff --git a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp index 13a9ca345..2e51c3174 100644 --- a/src/filters/source/ShoutcastSource/ShoutcastSource.cpp +++ b/src/filters/source/ShoutcastSource/ShoutcastSource.cpp @@ -35,12 +35,14 @@ static const DWORD s_bitrate[2][16] = { {1,8,16,24,32,40,48,56,64,80,96,112,128,144,160,0},
{1,32,40,48,56,64,80,96,112,128,160,192,224,256,320,0}
};
+
static const DWORD s_freq[4][4] = {
{11025,12000,8000,0},
{0,0,0,0},
{22050,24000,16000,0},
{44100,48000,32000,0}
};
+
static const BYTE s_channels[4] = {
2,2,2,1 // stereo, joint stereo, dual, mono
};
diff --git a/src/filters/source/SubtitleSource/SubtitleSource.h b/src/filters/source/SubtitleSource/SubtitleSource.h index 071a13e4a..1115aea02 100644 --- a/src/filters/source/SubtitleSource/SubtitleSource.h +++ b/src/filters/source/SubtitleSource/SubtitleSource.h @@ -150,4 +150,3 @@ public: HRESULT GetMediaType(CMediaType* pmt);
};
-
diff --git a/src/filters/switcher/AudioSwitcher/Audio.cpp b/src/filters/switcher/AudioSwitcher/Audio.cpp index a163816c1..8f5a905ef 100644 --- a/src/filters/switcher/AudioSwitcher/Audio.cpp +++ b/src/filters/switcher/AudioSwitcher/Audio.cpp @@ -127,7 +127,6 @@ static long audio_downsample_mono16(void *dst, void *src, long *filter_bank, int return accum;
}
-
static int permute_index(int a, int b)
{
return (b-(a>>8)-1) + (a&255)*b;
diff --git a/src/filters/switcher/AudioSwitcher/Audio.h b/src/filters/switcher/AudioSwitcher/Audio.h index 5cb098ed0..14ee1d778 100644 --- a/src/filters/switcher/AudioSwitcher/Audio.h +++ b/src/filters/switcher/AudioSwitcher/Audio.h @@ -51,4 +51,3 @@ public: long Downsample(void* input, long samplesin, void* output, long samplesout);
};
-
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp index 8b62ada0a..d03faad70 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.cpp @@ -129,66 +129,82 @@ STDMETHODIMP CStreamSwitcherPassThru::GetCapabilities(DWORD* pCaps) {
CallPeerSeeking(GetCapabilities(pCaps));
}
+
STDMETHODIMP CStreamSwitcherPassThru::CheckCapabilities(DWORD* pCaps)
{
CallPeerSeeking(CheckCapabilities(pCaps));
}
+
STDMETHODIMP CStreamSwitcherPassThru::IsFormatSupported(const GUID* pFormat)
{
CallPeerSeeking(IsFormatSupported(pFormat));
}
+
STDMETHODIMP CStreamSwitcherPassThru::QueryPreferredFormat(GUID* pFormat)
{
CallPeerSeeking(QueryPreferredFormat(pFormat));
}
+
STDMETHODIMP CStreamSwitcherPassThru::SetTimeFormat(const GUID* pFormat)
{
CallPeerSeeking(SetTimeFormat(pFormat));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetTimeFormat(GUID* pFormat)
{
CallPeerSeeking(GetTimeFormat(pFormat));
}
+
STDMETHODIMP CStreamSwitcherPassThru::IsUsingTimeFormat(const GUID* pFormat)
{
CallPeerSeeking(IsUsingTimeFormat(pFormat));
}
+
STDMETHODIMP CStreamSwitcherPassThru::ConvertTimeFormat(LONGLONG* pTarget, const GUID* pTargetFormat, LONGLONG Source, const GUID* pSourceFormat)
{
CallPeerSeeking(ConvertTimeFormat(pTarget, pTargetFormat, Source, pSourceFormat));
}
+
STDMETHODIMP CStreamSwitcherPassThru::SetPositions(LONGLONG* pCurrent, DWORD CurrentFlags, LONGLONG* pStop, DWORD StopFlags)
{
CallPeerSeekingAll(SetPositions(pCurrent, CurrentFlags, pStop, StopFlags));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetPositions(LONGLONG* pCurrent, LONGLONG* pStop)
{
CallPeerSeeking(GetPositions(pCurrent, pStop));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetCurrentPosition(LONGLONG* pCurrent)
{
CallPeerSeeking(GetCurrentPosition(pCurrent));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetStopPosition(LONGLONG* pStop)
{
CallPeerSeeking(GetStopPosition(pStop));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetDuration(LONGLONG* pDuration)
{
CallPeerSeeking(GetDuration(pDuration));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetPreroll(LONGLONG* pllPreroll)
{
CallPeerSeeking(GetPreroll(pllPreroll));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetAvailable(LONGLONG* pEarliest, LONGLONG* pLatest)
{
CallPeerSeeking(GetAvailable(pEarliest, pLatest));
}
+
STDMETHODIMP CStreamSwitcherPassThru::GetRate(double* pdRate)
{
CallPeerSeeking(GetRate(pdRate));
}
+
STDMETHODIMP CStreamSwitcherPassThru::SetRate(double dRate)
{
if(0.0 == dRate) {
@@ -203,34 +219,42 @@ STDMETHODIMP CStreamSwitcherPassThru::get_Duration(REFTIME* plength) {
CallPeer(get_Duration(plength));
}
+
STDMETHODIMP CStreamSwitcherPassThru::get_CurrentPosition(REFTIME* pllTime)
{
CallPeer(get_CurrentPosition(pllTime));
}
+
STDMETHODIMP CStreamSwitcherPassThru::put_CurrentPosition(REFTIME llTime)
{
CallPeerAll(put_CurrentPosition(llTime));
}
+
STDMETHODIMP CStreamSwitcherPassThru::get_StopTime(REFTIME* pllTime)
{
CallPeer(get_StopTime(pllTime));
}
+
STDMETHODIMP CStreamSwitcherPassThru::put_StopTime(REFTIME llTime)
{
CallPeerAll(put_StopTime(llTime));
}
+
STDMETHODIMP CStreamSwitcherPassThru::get_PrerollTime(REFTIME * pllTime)
{
CallPeer(get_PrerollTime(pllTime));
}
+
STDMETHODIMP CStreamSwitcherPassThru::put_PrerollTime(REFTIME llTime)
{
CallPeerAll(put_PrerollTime(llTime));
}
+
STDMETHODIMP CStreamSwitcherPassThru::get_Rate(double* pdRate)
{
CallPeer(get_Rate(pdRate));
}
+
STDMETHODIMP CStreamSwitcherPassThru::put_Rate(double dRate)
{
if(0.0 == dRate) {
@@ -238,10 +262,12 @@ STDMETHODIMP CStreamSwitcherPassThru::put_Rate(double dRate) }
CallPeerAll(put_Rate(dRate));
}
+
STDMETHODIMP CStreamSwitcherPassThru::CanSeekForward(LONG* pCanSeekForward)
{
CallPeer(CanSeekForward(pCanSeekForward));
}
+
STDMETHODIMP CStreamSwitcherPassThru::CanSeekBackward(LONG* pCanSeekBackward)
{
CallPeer(CanSeekBackward(pCanSeekBackward));
@@ -1441,5 +1467,3 @@ STDMETHODIMP CStreamSwitcherFilter::Enable(long lIndex, DWORD dwFlags) return S_OK;
}
-
-//////////
diff --git a/src/filters/switcher/AudioSwitcher/StreamSwitcher.h b/src/filters/switcher/AudioSwitcher/StreamSwitcher.h index 714524b64..a90fd0cc0 100644 --- a/src/filters/switcher/AudioSwitcher/StreamSwitcher.h +++ b/src/filters/switcher/AudioSwitcher/StreamSwitcher.h @@ -290,4 +290,3 @@ public: STDMETHODIMP Info(long lIndex, AM_MEDIA_TYPE** ppmt, DWORD* pdwFlags, LCID* plcid, DWORD* pdwGroup, WCHAR** ppszName, IUnknown** ppObject, IUnknown** ppUnk);
STDMETHODIMP Enable(long lIndex, DWORD dwFlags);
};
-
diff --git a/src/filters/transform/AVI2AC3Filter/stdafx.cpp b/src/filters/transform/AVI2AC3Filter/stdafx.cpp index 9508867df..3a237086e 100644 --- a/src/filters/transform/AVI2AC3Filter/stdafx.cpp +++ b/src/filters/transform/AVI2AC3Filter/stdafx.cpp @@ -20,5 +20,4 @@ */
#include "stdafx.h"
-
#include <streams.h>
diff --git a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp index f9c607a51..02bacf384 100644 --- a/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp +++ b/src/filters/transform/BaseVideoFilter/BaseVideoFilter.cpp @@ -470,7 +470,6 @@ HRESULT CBaseVideoFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_ : NOERROR;
}
-
VIDEO_OUTPUT_FORMATS DefaultFormats[] = {
{&MEDIASUBTYPE_YV12, 3, 12, '21VY'},
{&MEDIASUBTYPE_I420, 3, 12, '024I'},
@@ -494,7 +493,6 @@ void CBaseVideoFilter::GetOutputFormats (int& nNumber, VIDEO_OUTPUT_FORMATS** pp *ppFormats = DefaultFormats;
}
-
HRESULT CBaseVideoFilter::GetMediaType(int iPosition, CMediaType* pmt)
{
VIDEO_OUTPUT_FORMATS* fmts;
diff --git a/src/filters/transform/DeCSSFilter/DeCSSFilter.h b/src/filters/transform/DeCSSFilter/DeCSSFilter.h index 58fbf1f2d..dc4d5c4a6 100644 --- a/src/filters/transform/DeCSSFilter/DeCSSFilter.h +++ b/src/filters/transform/DeCSSFilter/DeCSSFilter.h @@ -36,4 +36,3 @@ public: HRESULT DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROPERTIES* pProperties);
HRESULT GetMediaType(int iPosition, CMediaType* pmt);
};
-
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp index 42f55d590..50d29e964 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoder.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoder.cpp @@ -45,8 +45,6 @@ extern "C" nTry++; \
}
-
-
CDXVADecoder::CDXVADecoder (CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber)
{
m_nEngine = ENGINE_DXVA1;
@@ -57,7 +55,6 @@ CDXVADecoder::CDXVADecoder (CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* p Init (pFilter, nMode, nPicEntryNumber);
}
-
CDXVADecoder::CDXVADecoder (CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pDirectXVideoDec, DXVAMode nMode, int nPicEntryNumber, DXVA2_ConfigPictureDecode* pDXVA2Config)
{
m_nEngine = ENGINE_DXVA2;
@@ -201,7 +198,6 @@ CDXVADecoder* CDXVADecoder::CreateDecoder (CMPCVideoDecFilter* pFilter, IAMVideo return pDecoder;
}
-
CDXVADecoder* CDXVADecoder::CreateDecoder (CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pDirectXVideoDec, const GUID* guidDecoder, int nPicEntryNumber, DXVA2_ConfigPictureDecode* pDXVA2Config)
{
CDXVADecoder* pDecoder = NULL;
@@ -289,7 +285,6 @@ HRESULT CDXVADecoder::AddExecuteBuffer (DWORD CompressedBufferType, UINT nSize, return hr;
}
-
HRESULT CDXVADecoder::GetDeliveryBuffer(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, IMediaSample** ppSampleToDeliver)
{
HRESULT hr;
@@ -465,7 +460,6 @@ HRESULT CDXVADecoder::BeginFrame(int nSurfaceIndex, IMediaSample* pSampleToDeliv return hr;
}
-
HRESULT CDXVADecoder::EndFrame(int nSurfaceIndex)
{
HRESULT hr = E_INVALIDARG;
@@ -548,7 +542,6 @@ void CDXVADecoder::RemoveRefFrame (int nSurfaceIndex) }
}
-
int CDXVADecoder::FindOldestFrame()
{
REFERENCE_TIME rtMin = _I64_MAX;
@@ -601,7 +594,6 @@ void CDXVADecoder::SetTypeSpecificFlags(PICTURE_STORE* pPicture, IMediaSample* p pMS->SetTime(&pPicture->rtStart, &pPicture->rtStop);
}
-
HRESULT CDXVADecoder::DisplayNextFrame()
{
HRESULT hr = S_FALSE;
@@ -698,7 +690,6 @@ HRESULT CDXVADecoder::GetFreeSurfaceIndex(int& nSurfaceIndex, IMediaSample** ppS return hr;
}
-
void CDXVADecoder::FreePictureSlot (int nSurfaceIndex)
{
// TRACE ("Free : %d\n", nSurfaceIndex);
@@ -710,7 +701,6 @@ void CDXVADecoder::FreePictureSlot (int nSurfaceIndex) m_nWaitingPics--;
}
-
BYTE CDXVADecoder::GetConfigResidDiffAccelerator()
{
switch (m_nEngine) {
@@ -722,7 +712,6 @@ BYTE CDXVADecoder::GetConfigResidDiffAccelerator() return 0;
}
-
BYTE CDXVADecoder::GetConfigIntraResidUnsigned()
{
switch (m_nEngine) {
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp index 3afc2f745..49c77dd74 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderH264.cpp @@ -33,7 +33,6 @@ extern "C" #include "FfmpegContext.h"
}
-
CDXVADecoderH264::CDXVADecoderH264 (CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber)
: CDXVADecoder (pFilter, pAMVideoAccelerator, nMode, nPicEntryNumber)
{
@@ -323,7 +322,6 @@ void CDXVADecoderH264::SetExtraData (BYTE* pDataIn, UINT nSize) FFH264SetDxvaSliceLong (pAVCtx, m_pSliceLong);
}
-
void CDXVADecoderH264::ClearRefFramesList()
{
for (int i=0; i<m_nPicEntryNumber; i++) {
@@ -334,7 +332,6 @@ void CDXVADecoderH264::ClearRefFramesList() }
}
-
HRESULT CDXVADecoderH264::DisplayStatus()
{
HRESULT hr = E_INVALIDARG;
@@ -353,7 +350,6 @@ HRESULT CDXVADecoderH264::DisplayStatus() return hr;
}
-
int CDXVADecoderH264::FindOldestFrame()
{
int nPos = -1;
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp index af5e4d9a6..9b95eea5e 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderMpeg2.cpp @@ -36,21 +36,18 @@ extern "C" #endif
-
CDXVADecoderMpeg2::CDXVADecoderMpeg2 (CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber)
: CDXVADecoder (pFilter, pAMVideoAccelerator, nMode, nPicEntryNumber)
{
Init();
}
-
CDXVADecoderMpeg2::CDXVADecoderMpeg2 (CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pDirectXVideoDec, DXVAMode nMode, int nPicEntryNumber, DXVA2_ConfigPictureDecode* pDXVA2Config)
: CDXVADecoder (pFilter, pDirectXVideoDec, nMode, nPicEntryNumber, pDXVA2Config)
{
Init();
}
-
CDXVADecoderMpeg2::~CDXVADecoderMpeg2(void)
{
Flush();
@@ -184,7 +181,6 @@ void CDXVADecoderMpeg2::SetExtraData (BYTE* pDataIn, UINT nSize) m_PictureParams.wPicHeightInMBminus1 = m_pFilter->PictHeight() - 1;
}
-
void CDXVADecoderMpeg2::CopyBitstream(BYTE* pDXVABuffer, BYTE* pBuffer, UINT& nSize)
{
while (*((DWORD*)pBuffer) != 0x01010000) {
@@ -199,7 +195,6 @@ void CDXVADecoderMpeg2::CopyBitstream(BYTE* pDXVABuffer, BYTE* pBuffer, UINT& nS memcpy (pDXVABuffer, pBuffer, nSize);
}
-
void CDXVADecoderMpeg2::Flush()
{
m_nNextCodecIndex = INT_MIN;
@@ -217,7 +212,6 @@ void CDXVADecoderMpeg2::Flush() __super::Flush();
}
-
int CDXVADecoderMpeg2::FindOldestFrame()
{
int nPos = -1;
diff --git a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp index 212d18b6c..0eddec72c 100644 --- a/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp +++ b/src/filters/transform/MPCVideoDec/DXVADecoderVC1.cpp @@ -43,21 +43,18 @@ inline void SwapRT(REFERENCE_TIME& rtFirst, REFERENCE_TIME& rtSecond) rtSecond = rtTemp;
}
-
CDXVADecoderVC1::CDXVADecoderVC1 (CMPCVideoDecFilter* pFilter, IAMVideoAccelerator* pAMVideoAccelerator, DXVAMode nMode, int nPicEntryNumber)
: CDXVADecoder (pFilter, pAMVideoAccelerator, nMode, nPicEntryNumber)
{
Init();
}
-
CDXVADecoderVC1::CDXVADecoderVC1 (CMPCVideoDecFilter* pFilter, IDirectXVideoDecoder* pDirectXVideoDec, DXVAMode nMode, int nPicEntryNumber, DXVA2_ConfigPictureDecode* pDXVA2Config)
: CDXVADecoder (pFilter, pDirectXVideoDec, nMode, nPicEntryNumber, pDXVA2Config)
{
Init();
}
-
CDXVADecoderVC1::~CDXVADecoderVC1(void)
{
Flush();
@@ -210,7 +207,6 @@ void CDXVADecoderVC1::SetExtraData (BYTE* pDataIn, UINT nSize) (GetConfigResidDiffAccelerator() <<5); // iOHIT
}
-
BYTE* CDXVADecoderVC1::FindNextStartCode(BYTE* pBuffer, UINT nSize, UINT& nPacketSize)
{
BYTE* pStart = pBuffer;
diff --git a/src/filters/transform/MPCVideoDec/FfmpegContext.c b/src/filters/transform/MPCVideoDec/FfmpegContext.c index dcf3c6b07..e71fc7207 100644 --- a/src/filters/transform/MPCVideoDec/FfmpegContext.c +++ b/src/filters/transform/MPCVideoDec/FfmpegContext.c @@ -24,8 +24,8 @@ #define HAVE_AV_CONFIG_H
#define H264_MERGE_TESTING
-#include <windows.h>
-#include <winnt.h>
+#include <Windows.h>
+#include <WinNT.h>
#include <vfwmsgs.h>
#include "FfmpegContext.h"
#include "dsputil.h"
@@ -115,7 +115,6 @@ inline MpegEncContext* GetMpegEncContext(struct AVCodecContext* pAVCtx) return s;
}
-
void FFH264DecodeBuffer (struct AVCodecContext* pAVCtx, BYTE* pBuffer, UINT nSize, int* pFramePOC, int* pOutPOC, REFERENCE_TIME* pOutrtStart)
{
if (pBuffer != NULL) {
@@ -216,7 +215,6 @@ int FFH264CheckCompatibility(int nWidth, int nHeight, struct AVCodecContext* pAV return (video_is_level51 * no_level51_support * DXVA_UNSUPPORTED_LEVEL) + (too_much_ref_frames * DXVA_TOO_MANY_REF_FRAMES) + (profile_higher_than_high * DXVA_PROFILE_HIGHER_THAN_HIGH);
}
-
void CopyScalingMatrix(DXVA_Qmatrix_H264* pDest, DXVA_Qmatrix_H264* pSource, int nPCIVendor)
{
int i,j;
@@ -377,7 +375,6 @@ HRESULT FFH264BuildPicParams (DXVA_PicParams_H264* pDXVAPicParams, DXVA_Qmatrix_ return hr;
}
-
void FFH264SetCurrentPicture (int nIndex, DXVA_PicParams_H264* pDXVAPicParams, struct AVCodecContext* pAVCtx)
{
H264Context* h = (H264Context*) pAVCtx->priv_data;
@@ -389,7 +386,6 @@ void FFH264SetCurrentPicture (int nIndex, DXVA_PicParams_H264* pDXVAPicParams, s }
}
-
void FFH264UpdateRefFramesList (DXVA_PicParams_H264* pDXVAPicParams, struct AVCodecContext* pAVCtx)
{
H264Context* h = (H264Context*) pAVCtx->priv_data;
@@ -463,7 +459,6 @@ BOOL FFH264IsRefFrameInUse (int nFrameNum, struct AVCodecContext* pAVCtx) return FALSE;
}
-
void FF264UpdateRefFrameSliceLong(DXVA_PicParams_H264* pDXVAPicParams, DXVA_Slice_H264_Long* pSlice, struct AVCodecContext* pAVCtx)
{
H264Context* h = (H264Context*) pAVCtx->priv_data;
@@ -722,7 +717,6 @@ HRESULT FFMpeg2DecodeFrame (DXVA_PictureParameters* pPicParams, DXVA_QmatrixData return S_OK;
}
-
unsigned long FFGetMBNumber(struct AVCodecContext* pAVCtx)
{
MpegEncContext* s = GetMpegEncContext(pAVCtx);
@@ -777,7 +771,6 @@ BOOL FFSoftwareCheckCompatibility(struct AVCodecContext* pAVCtx) }
}
-
int FFGetCodedPicture(struct AVCodecContext* pAVCtx)
{
MpegEncContext* s = GetMpegEncContext(pAVCtx);
@@ -785,7 +778,6 @@ int FFGetCodedPicture(struct AVCodecContext* pAVCtx) return (s != NULL) ? s->current_picture.coded_picture_number : 0;
}
-
BOOL FFGetAlternateScan(struct AVCodecContext* pAVCtx)
{
MpegEncContext* s = GetMpegEncContext(pAVCtx);
diff --git a/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h b/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h index 011363214..8b81c00b0 100644 --- a/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h +++ b/src/filters/transform/MPCVideoDec/H264QuantizationMatrix.h @@ -29,7 +29,6 @@ typedef enum { QMatrix2,
} QMatrixH264Type;
-
const byte ZZ_SCAN[16] = {
0, 1, 4, 8, 5, 2, 3, 6, 9, 12, 13, 10, 7, 11, 14, 15
};
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp index 9c39fc8e9..679b1f854 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.cpp @@ -78,7 +78,6 @@ typedef struct { }
} FFMPEG_CODECS;
-
typedef enum {
ffYCbCr_RGB_coeff_ITUR_BT601 = 0,
ffYCbCr_RGB_coeff_ITUR_BT709 = 1,
@@ -720,7 +719,6 @@ void CMPCVideoDecFilter::DetectVideoCard(HWND hWnd) }
}
-
CMPCVideoDecFilter::~CMPCVideoDecFilter()
{
Cleanup();
@@ -751,7 +749,6 @@ void CMPCVideoDecFilter::UpdateFrameTime (REFERENCE_TIME& rtStart, REFERENCE_TIM rtStop = rtStart + m_rtAvrTimePerFrame;
}
-
void CMPCVideoDecFilter::GetOutputSize(int& w, int& h, int& arx, int& ary, int &RealWidth, int &RealHeight)
{
#if 1
@@ -793,7 +790,6 @@ int CMPCVideoDecFilter::PictHeightRounded() return ((m_nHeight + 15) / 16) * 16;
}
-
int CMPCVideoDecFilter::FindCodec(const CMediaType* mtIn)
{
for (int i=0; i<countof(ffCodecs); i++)
@@ -1012,7 +1008,6 @@ STDMETHODIMP CMPCVideoDecFilter::NonDelegatingQueryInterface(REFIID riid, void** -
HRESULT CMPCVideoDecFilter::CheckInputType(const CMediaType* mtIn)
{
for (int i=0; i<sizeof(sudPinTypesIn)/sizeof(AMOVIESETUP_MEDIATYPE); i++) {
@@ -1025,13 +1020,11 @@ HRESULT CMPCVideoDecFilter::CheckInputType(const CMediaType* mtIn) return VFW_E_TYPE_NOT_ACCEPTED;
}
-
bool CMPCVideoDecFilter::IsMultiThreadSupported(int nCodec)
{
return (nCodec==CODEC_ID_H264);
}
-
HRESULT CMPCVideoDecFilter::SetMediaType(PIN_DIRECTION direction,const CMediaType *pmt)
{
int nNewCodec;
@@ -1168,7 +1161,6 @@ HRESULT CMPCVideoDecFilter::SetMediaType(PIN_DIRECTION direction,const CMediaTyp return __super::SetMediaType(direction, pmt);
}
-
VIDEO_OUTPUT_FORMATS DXVAFormats[] = {
{&MEDIASUBTYPE_NV12, 1, 12, 'avxd'}, // DXVA2
{&MEDIASUBTYPE_NV12, 1, 12, 'AVXD'},
@@ -1183,7 +1175,6 @@ VIDEO_OUTPUT_FORMATS SoftwareFormats[] = { {&MEDIASUBTYPE_IYUV, 3, 12, 'VUYI'}
};
-
bool CMPCVideoDecFilter::IsDXVASupported()
{
if (m_nCodecNb != -1) {
@@ -1201,7 +1192,6 @@ bool CMPCVideoDecFilter::IsDXVASupported() return false;
}
-
void CMPCVideoDecFilter::BuildDXVAOutputFormat()
{
int nPos = 0;
@@ -1233,7 +1223,6 @@ void CMPCVideoDecFilter::BuildDXVAOutputFormat() }
}
-
int CMPCVideoDecFilter::GetPicEntryNumber()
{
if (IsDXVASupported()) {
@@ -1243,15 +1232,12 @@ int CMPCVideoDecFilter::GetPicEntryNumber() }
}
-
void CMPCVideoDecFilter::GetOutputFormats (int& nNumber, VIDEO_OUTPUT_FORMATS** ppFormats)
{
nNumber = m_nVideoOutputCount;
*ppFormats = m_pVideoOutputFormat;
}
-
-
void CMPCVideoDecFilter::AllocExtradata(AVCodecContext* pAVCtx, const CMediaType* pmt)
{
const BYTE* data = NULL;
@@ -1289,7 +1275,6 @@ void CMPCVideoDecFilter::AllocExtradata(AVCodecContext* pAVCtx, const CMediaType }
}
-
HRESULT CMPCVideoDecFilter::CompleteConnect(PIN_DIRECTION direction, IPin* pReceivePin)
{
LOG(_T("CMPCVideoDecFilter::CompleteConnect"));
@@ -1323,7 +1308,6 @@ HRESULT CMPCVideoDecFilter::CompleteConnect(PIN_DIRECTION direction, IPin* pRece return __super::CompleteConnect (direction, pReceivePin);
}
-
HRESULT CMPCVideoDecFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATOR_PROPERTIES* pProperties)
{
if (UseDXVA2()) {
@@ -1348,7 +1332,6 @@ HRESULT CMPCVideoDecFilter::DecideBufferSize(IMemAllocator* pAllocator, ALLOCATO }
}
-
HRESULT CMPCVideoDecFilter::NewSegment(REFERENCE_TIME rtStart, REFERENCE_TIME rtStop, double dRate)
{
CAutoLock cAutoLock(&m_csReceive);
@@ -1370,7 +1353,6 @@ HRESULT CMPCVideoDecFilter::NewSegment(REFERENCE_TIME rtStart, REFERENCE_TIME rt return __super::NewSegment (rtStart, rtStop, dRate);
}
-
HRESULT CMPCVideoDecFilter::BreakConnect(PIN_DIRECTION dir)
{
if (dir == PINDIR_INPUT) {
@@ -1705,7 +1687,6 @@ bool CMPCVideoDecFilter::FindPicture(int nIndex, int nStartCode) return false;
}
-
void CMPCVideoDecFilter::ResetBuffer()
{
m_nFFBufferPos = 0;
@@ -1785,7 +1766,6 @@ void CMPCVideoDecFilter::ShrinkBuffer() m_nFFPicEnd = (m_pFFBuffer[3] == 0x00) ? 0 : INT_MIN;
}
-
HRESULT CMPCVideoDecFilter::Transform(IMediaSample* pIn)
{
CAutoLock cAutoLock(&m_csReceive);
@@ -1897,7 +1877,6 @@ HRESULT CMPCVideoDecFilter::Transform(IMediaSample* pIn) return hr;
}
-
void CMPCVideoDecFilter::UpdateAspectRatio()
{
if(((m_nARMode) && (m_pAVCtx)) && ((m_pAVCtx->sample_aspect_ratio.num>0) && (m_pAVCtx->sample_aspect_ratio.den>0))) {
@@ -2016,7 +1995,6 @@ HRESULT CMPCVideoDecFilter::FindDXVA2DecoderConfiguration(IDirectXVideoDecoderSe return hr;
}
-
HRESULT CMPCVideoDecFilter::ConfigureDXVA2(IPin *pPin)
{
HRESULT hr = S_OK;
@@ -2114,7 +2092,6 @@ HRESULT CMPCVideoDecFilter::ConfigureDXVA2(IPin *pPin) return hr;
}
-
HRESULT CMPCVideoDecFilter::SetEVRForDXVA2(IPin *pPin)
{
HRESULT hr = S_OK;
@@ -2162,7 +2139,6 @@ HRESULT CMPCVideoDecFilter::SetEVRForDXVA2(IPin *pPin) return hr;
}
-
HRESULT CMPCVideoDecFilter::CreateDXVA2Decoder(UINT nNumRenderTargets, IDirect3DSurface9** pDecoderRenderTargets)
{
HRESULT hr;
@@ -2191,7 +2167,6 @@ HRESULT CMPCVideoDecFilter::CreateDXVA2Decoder(UINT nNumRenderTargets, IDirect3D return hr;
}
-
HRESULT CMPCVideoDecFilter::FindDXVA1DecoderConfiguration(IAMVideoAccelerator* pAMVideoAccelerator, const GUID* guidDecoder, DDPIXELFORMAT* pPixelFormat)
{
HRESULT hr = E_FAIL;
@@ -2273,8 +2248,6 @@ HRESULT CMPCVideoDecFilter::CreateDXVA1Decoder(IAMVideoAccelerator* pAMVideoAcc return S_OK;
}
-
-
// ISpecifyPropertyPages2
STDMETHODIMP CMPCVideoDecFilter::GetPages(CAUUID* pPages)
@@ -2315,7 +2288,6 @@ STDMETHODIMP CMPCVideoDecFilter::CreatePage(const GUID& guid, IPropertyPage** pp return *ppPage ? S_OK : E_FAIL;
}
-
// IFFmpegDecFilter
STDMETHODIMP CMPCVideoDecFilter::Apply()
{
@@ -2350,44 +2322,52 @@ STDMETHODIMP CMPCVideoDecFilter::SetThreadNumber(int nValue) m_nThreadNumber = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetThreadNumber()
{
CAutoLock cAutoLock(&m_csProps);
return m_nThreadNumber;
}
+
STDMETHODIMP CMPCVideoDecFilter::SetDiscardMode(int nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nDiscardMode = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetDiscardMode()
{
CAutoLock cAutoLock(&m_csProps);
return m_nDiscardMode;
}
+
STDMETHODIMP CMPCVideoDecFilter::SetErrorRecognition(int nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nErrorRecognition = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetErrorRecognition()
{
CAutoLock cAutoLock(&m_csProps);
return m_nErrorRecognition;
}
+
STDMETHODIMP CMPCVideoDecFilter::SetIDCTAlgo(int nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nIDCTAlgo = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetIDCTAlgo()
{
CAutoLock cAutoLock(&m_csProps);
return m_nIDCTAlgo;
}
+
STDMETHODIMP_(GUID*) CMPCVideoDecFilter::GetDXVADecoderGuid()
{
if (m_pGraph == NULL) {
@@ -2396,50 +2376,59 @@ STDMETHODIMP_(GUID*) CMPCVideoDecFilter::GetDXVADecoderGuid() return &m_DXVADecoderGUID;
}
}
+
STDMETHODIMP CMPCVideoDecFilter::SetActiveCodecs(MPC_VIDEO_CODEC nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nActiveCodecs = (int)nValue;
return S_OK;
}
+
STDMETHODIMP_(MPC_VIDEO_CODEC) CMPCVideoDecFilter::GetActiveCodecs()
{
CAutoLock cAutoLock(&m_csProps);
return (MPC_VIDEO_CODEC)m_nActiveCodecs;
}
+
STDMETHODIMP_(LPCTSTR) CMPCVideoDecFilter::GetVideoCardDescription()
{
CAutoLock cAutoLock(&m_csProps);
return m_strDeviceDescription;
}
+
STDMETHODIMP CMPCVideoDecFilter::SetARMode(int nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nARMode = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetARMode()
{
CAutoLock cAutoLock(&m_csProps);
return m_nARMode;
}
+
STDMETHODIMP CMPCVideoDecFilter::SetDXVACheckCompatibility(int nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nDXVACheckCompatibility = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetDXVACheckCompatibility()
{
CAutoLock cAutoLock(&m_csProps);
return m_nDXVACheckCompatibility;
}
+
STDMETHODIMP CMPCVideoDecFilter::SetDXVA_SD(int nValue)
{
CAutoLock cAutoLock(&m_csProps);
m_nDXVA_SD = nValue;
return S_OK;
}
+
STDMETHODIMP_(int) CMPCVideoDecFilter::GetDXVA_SD()
{
CAutoLock cAutoLock(&m_csProps);
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h index 19ec260a5..79810e10c 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecFilter.h @@ -23,7 +23,7 @@ #pragma once
#include <d3dx9.h>
-#include <Videoacc.h> // DXVA1
+#include <videoacc.h> // DXVA1
#include <dxva.h>
#include <dxva2api.h> // DXVA2
#include "../BaseVideoFilter/BaseVideoFilter.h"
@@ -50,7 +50,6 @@ typedef enum { MODE_DXVA2
} DXVA_MODE;
-
typedef struct {
REFERENCE_TIME rtStart;
REFERENCE_TIME rtStop;
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp index 5052fe96e..6568b6789 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.cpp @@ -55,7 +55,6 @@ int FindDiscardIndex(int nValue) return 1;
}
-
CMPCVideoDecSettingsWnd::CMPCVideoDecSettingsWnd()
{
}
@@ -243,10 +242,8 @@ BEGIN_MESSAGE_MAP(CMPCVideoDecSettingsWnd, CInternalPropertyPageWnd) END_MESSAGE_MAP()
-
// ====== Codec filter property page (for standalone filter only)
-
CMPCVideoDecCodecWnd::CMPCVideoDecCodecWnd()
{
}
diff --git a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h index a6b372002..9a9d3fe99 100644 --- a/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h +++ b/src/filters/transform/MPCVideoDec/MPCVideoDecSettingsWnd.h @@ -84,8 +84,6 @@ public: };
-
-
class __declspec(uuid("3C395D46-8B0F-440d-B962-2F4A97355453"))
CMPCVideoDecCodecWnd : public CInternalPropertyPageWnd
{
diff --git a/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp b/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp index 2ea37a49b..672bee9e4 100644 --- a/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp +++ b/src/filters/transform/MPCVideoDec/TlibavcodecExt.cpp @@ -45,6 +45,7 @@ int TlibavcodecExt::get_buffer(AVCodecContext *c, AVFrame *pic) }
return ret;
}
+
int TlibavcodecExt::reget_buffer(AVCodecContext *c, AVFrame *pic)
{
int ret=c->opaque->ff_avcodec_default_reget_buffer(c,pic);
@@ -53,11 +54,13 @@ int TlibavcodecExt::reget_buffer(AVCodecContext *c, AVFrame *pic) }
return ret;
}
+
void TlibavcodecExt::release_buffer(AVCodecContext *c, AVFrame *pic)
{
c->opaque->ff_avcodec_default_release_buffer(c,pic);
c->opaque->OnReleaseBuffer(pic);
}
+
void TlibavcodecExt::handle_user_data0(AVCodecContext *c, const uint8_t *buf,int buf_len)
{
c->opaque->HandleUserData(buf,buf_len);
diff --git a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp index 1d8579612..90114c70a 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp +++ b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.cpp @@ -50,7 +50,6 @@ STDMETHODIMP CDXVA2Sample::QueryInterface(REFIID riid, __deref_out void **ppv) }
}
-
STDMETHODIMP_(ULONG) CDXVA2Sample::AddRef()
{
return __super::AddRef();
@@ -82,8 +81,6 @@ STDMETHODIMP CDXVA2Sample::GetPointer(BYTE ** ppBuffer) return E_NOTIMPL;
}
-
-
// Sets the pointer to the Direct3D surface.
void CDXVA2Sample::SetSurface(DWORD surfaceId, IDirect3DSurface9 *pSurf)
{
@@ -96,7 +93,6 @@ STDMETHODIMP_(int) CDXVA2Sample::GetDXSurfaceId() return m_dwSurfaceId;
}
-
CVideoDecDXVAAllocator::CVideoDecDXVAAllocator(CMPCVideoDecFilter* pVideoDecFilter, HRESULT* phr)
: CBaseAllocator(NAME("CVideoDecDXVAAllocator"), NULL, phr)
{
diff --git a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h index 7b3206112..423aad07a 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h +++ b/src/filters/transform/MPCVideoDec/VideoDecDXVAAllocator.h @@ -72,7 +72,6 @@ private: };
-
class CVideoDecDXVAAllocator : public CBaseAllocator
{
public:
diff --git a/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp b/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp index 4fcc513dd..9e3bc02b1 100644 --- a/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp +++ b/src/filters/transform/MPCVideoDec/VideoDecOutputPin.cpp @@ -40,7 +40,6 @@ CVideoDecOutputPin::~CVideoDecOutputPin(void) {
}
-
HRESULT CVideoDecOutputPin::InitAllocator(IMemAllocator **ppAlloc)
{
TRACE("CVideoDecOutputPin::InitAllocator");
@@ -68,7 +67,6 @@ STDMETHODIMP CVideoDecOutputPin::NonDelegatingQueryInterface(REFIID riid, void** __super::NonDelegatingQueryInterface(riid, ppv);
}
-
// === IAMVideoAcceleratorNotify
STDMETHODIMP CVideoDecOutputPin::GetUncompSurfacesInfo(const GUID *pGuid, LPAMVAUncompBufferInfo pUncompBufferInfo)
{
diff --git a/src/filters/transform/MPCVideoDec/stdafx.h b/src/filters/transform/MPCVideoDec/stdafx.h index e2228b3a6..6864612f8 100644 --- a/src/filters/transform/MPCVideoDec/stdafx.h +++ b/src/filters/transform/MPCVideoDec/stdafx.h @@ -26,7 +26,7 @@ #include <d3dx9.h>
#include <evr.h>
#include <mfapi.h>
-#include <mferror.h>
+#include <Mferror.h>
#include <atlcoll.h>
#include <vector>
@@ -36,4 +36,4 @@ void LOG(LPCTSTR fmt, ...); inline void LOG(LPCTSTR fmt, ...) {}
#endif
-#define CHECK_HR(x) hr = ##x; if (FAILED (hr)) { TRACE("Error : 0x%08x\n", hr); ASSERT (hr==VFW_E_NOT_COMMITTED); return hr; }
+#define CHECK_HR(x) hr = ##x; if (FAILED (hr)) { TRACE("Error : 0x%08x\n", hr); ASSERT (hr==VFW_E_NOT_COMMITTED); return hr; }
diff --git a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp index 6436b86a2..0fe017dc9 100644 --- a/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp +++ b/src/filters/transform/MpaDecFilter/MpaDecFilter.cpp @@ -168,6 +168,7 @@ static struct scmap_t { BYTE ch[8];
DWORD dwChannelMask;
}
+
s_scmap_ac3[2*11] = {
{2, {0, 1,-1,-1,-1,-1,-1,-1}, 0}, // A52_CHANNEL
{1, {0,-1,-1,-1,-1,-1,-1,-1}, 0}, // A52_MONO
@@ -193,6 +194,7 @@ s_scmap_ac3[2*11] = { {2, {1, 0,-1,-1,-1,-1,-1,-1}, SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY}, // A52_CHANNEL2|A52_LFE
{3, {1, 2, 0,-1,-1,-1,-1,-1}, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_LOW_FREQUENCY}, // A52_DOLBY|A52_LFE
},
+
s_scmap_dts[2*10] = {
{1, {0,-1,-1,-1,-1,-1,-1,-1}, 0}, // DTS_MONO
{2, {0, 1,-1,-1,-1,-1,-1,-1}, 0}, // DTS_CHANNEL
@@ -216,6 +218,7 @@ s_scmap_dts[2*10] = { {5, {0, 1, 4, 2, 3,-1,-1,-1}, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT}, // DTS_2F2R|DTS_LFE
{6, {1, 2, 0, 5, 3, 4,-1,-1}, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT}, // DTS_3F2R|DTS_LFE
},
+
s_scmap_vorbis[6] = {
{1, {0,-1,-1,-1,-1,-1,-1,-1}, 0}, // 1F
{2, {0, 1,-1,-1,-1,-1,-1,-1}, 0}, // 2F
@@ -224,6 +227,7 @@ s_scmap_vorbis[6] = { {5, {0, 2, 1, 3, 4,-1,-1,-1}, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT}, // 3F2R
{6, {0, 2, 1, 5, 3, 4,-1,-1}, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT}, // 3F2R + LFE
},
+
s_scmap_hdmv[] = {
// FL FR FC LFe BL BR FLC FRC
{0, {-1,-1,-1,-1,-1,-1,-1,-1 }, 0}, // INVALID
@@ -239,6 +243,7 @@ s_scmap_hdmv[] = { {8, { 0, 1, 2, 3, 6, 4, 5,-1 }, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT|SPEAKER_SIDE_LEFT|SPEAKER_SIDE_RIGHT}, // 3/4 FL, FR, FC, BL, Bls, Brs, BR
{8, { 0, 1, 2, 7, 4, 5, 3, 6 }, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT|SPEAKER_SIDE_LEFT|SPEAKER_SIDE_RIGHT},// 3/4+LFe FL, FR, FC, BL, Bls, Brs, BR, LFe
},
+
m_scmap_default[] = {
// FL FR FC LFe BL BR FLC FRC
{1, { 0,-1,-1,-1,-1,-1,-1,-1 }, 0}, // Mono M1, 0
@@ -250,6 +255,7 @@ m_scmap_default[] = { {7, { 0, 1, 2, 3, 4, 5, 6,-1 }, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_SIDE_LEFT|SPEAKER_SIDE_RIGHT|SPEAKER_BACK_CENTER}, // 3/4 FL, FR, FC, BL, Bls, Brs, BR
{8, { 0, 1, 2, 3, 6, 7, 4, 5 }, SPEAKER_FRONT_LEFT|SPEAKER_FRONT_RIGHT|SPEAKER_FRONT_CENTER|SPEAKER_LOW_FREQUENCY|SPEAKER_SIDE_LEFT|SPEAKER_SIDE_RIGHT|SPEAKER_BACK_LEFT|SPEAKER_BACK_RIGHT},// 3/4+LFe FL, FR, FC, BL, Bls, Brs, BR, LFe
},
+
m_ffmpeg_ac3[] = {
// FL FR FC LFe BL BR FLC FRC
{2, {0, 1,-1,-1,-1,-1,-1,-1}, 0}, // AC3_CHMODE_DUALMONO
diff --git a/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h b/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h index 054337be6..180dd9a3e 100644 --- a/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h +++ b/src/filters/transform/Mpeg2DecFilter/IMpeg2DecFilter.h @@ -55,4 +55,3 @@ public IUnknown { STDMETHOD(EnableReadARFromStream(bool fEnable)) = 0;
STDMETHOD_(bool, IsReadARFromStreamEnabled()) = 0;
};
-
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp index 77ebf3d5c..987a6e5a3 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.cpp @@ -35,6 +35,7 @@ #include <initguid.h>
#include <moreuuids.h>
+#include <IFilterVersion.h>
#define EPSILON 1e-4
@@ -845,7 +846,6 @@ HRESULT CMpeg2DecFilter::DeliverNormal() return hr;
}
-
HRESULT CMpeg2DecFilter::Deliver(bool fRepeatLast)
{
CAutoLock cAutoLock(&m_csReceive);
@@ -918,8 +918,6 @@ HRESULT CMpeg2DecFilter::Deliver(bool fRepeatLast) return hr;
}
-#include <IFilterVersion.h>
-
HRESULT CMpeg2DecFilter::CheckConnect(PIN_DIRECTION dir, IPin* pPin)
{
if(dir == PINDIR_OUTPUT) {
diff --git a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h index 558fa60c6..e7c42a3f7 100644 --- a/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h +++ b/src/filters/transform/Mpeg2DecFilter/Mpeg2DecFilter.h @@ -22,7 +22,7 @@ #pragma once
#include <atlcoll.h>
-#include <Videoacc.h>
+#include <videoacc.h>
#include "../../../DeCSS/DeCSSInputPin.h"
#include "../BaseVideoFilter/BaseVideoFilter.h"
#include "IMpeg2DecFilter.h"
diff --git a/src/filters/transform/VSFilter/DirectVobSubFilter.h b/src/filters/transform/VSFilter/DirectVobSubFilter.h index 7d83f776b..51e313564 100644 --- a/src/filters/transform/VSFilter/DirectVobSubFilter.h +++ b/src/filters/transform/VSFilter/DirectVobSubFilter.h @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* 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
@@ -196,4 +196,3 @@ public: STDMETHODIMP JoinFilterGraph(IFilterGraph* pGraph, LPCWSTR pName);
HRESULT CheckInputType(const CMediaType* mtIn);
};
-
diff --git a/src/filters/transform/VSFilter/DirectVobSubPropPage.h b/src/filters/transform/VSFilter/DirectVobSubPropPage.h index 17dc3e95a..28b55f897 100644 --- a/src/filters/transform/VSFilter/DirectVobSubPropPage.h +++ b/src/filters/transform/VSFilter/DirectVobSubPropPage.h @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* 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
diff --git a/src/filters/transform/VSFilter/StyleEditorDialog.h b/src/filters/transform/VSFilter/StyleEditorDialog.h index ce6585d4b..4896980e3 100644 --- a/src/filters/transform/VSFilter/StyleEditorDialog.h +++ b/src/filters/transform/VSFilter/StyleEditorDialog.h @@ -23,8 +23,8 @@ #pragma once
#include "resource.h"
-#include "afxwin.h"
-#include "afxcmn.h"
+#include <afxwin.h>
+#include <afxcmn.h>
#include "../../../Subtitles/STS.h"
// CColorStatic dialog
diff --git a/src/filters/transform/VSFilter/Systray.cpp b/src/filters/transform/VSFilter/Systray.cpp index 8fcb10948..7c4e0e3bc 100644 --- a/src/filters/transform/VSFilter/Systray.cpp +++ b/src/filters/transform/VSFilter/Systray.cpp @@ -189,21 +189,25 @@ LRESULT CSystrayWindow::OnDVSPrevSub(WPARAM, LPARAM) StepSub(-1);
return 0;
}
+
LRESULT CSystrayWindow::OnDVSNextSub(WPARAM, LPARAM)
{
StepSub(+1);
return 0;
}
+
LRESULT CSystrayWindow::OnDVSHideSub(WPARAM, LPARAM)
{
ShowSub(false);
return 0;
}
+
LRESULT CSystrayWindow::OnDVSShowSub(WPARAM, LPARAM)
{
ShowSub(true);
return 0;
}
+
LRESULT CSystrayWindow::OnDVSShowHideSub(WPARAM, LPARAM)
{
ToggleSub();
diff --git a/src/filters/transform/VSFilter/VSFilter.cpp b/src/filters/transform/VSFilter/VSFilter.cpp index 6a476151b..a26e84bfd 100644 --- a/src/filters/transform/VSFilter/VSFilter.cpp +++ b/src/filters/transform/VSFilter/VSFilter.cpp @@ -2,7 +2,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* 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
diff --git a/src/filters/transform/VSFilter/csriapi.cpp b/src/filters/transform/VSFilter/csriapi.cpp index 498c1d592..1643926aa 100644 --- a/src/filters/transform/VSFilter/csriapi.cpp +++ b/src/filters/transform/VSFilter/csriapi.cpp @@ -40,8 +40,10 @@ extern "C" struct csri_vsfilter_inst { enum csri_pixfmt pixfmt;
size_t readorder;
};
+
typedef struct csri_vsfilter_inst csri_inst;
#include "csri.h"
+
#ifdef _VSMOD
static csri_rend csri_vsfilter = "vsfiltermod";
#else
@@ -77,7 +79,6 @@ CSRIAPI csri_inst *csri_open_file(csri_rend *renderer, const char *filename, str }
}
-
CSRIAPI csri_inst *csri_open_mem(csri_rend *renderer, const void *data, size_t length, struct csri_openflag *flags)
{
// This is actually less effecient than opening a file, since this first writes the memory data to a temp file,
@@ -96,7 +97,6 @@ CSRIAPI csri_inst *csri_open_mem(csri_rend *renderer, const void *data, size_t l }
}
-
CSRIAPI void csri_close(csri_inst *inst)
{
if (!inst) {
@@ -108,7 +108,6 @@ CSRIAPI void csri_close(csri_inst *inst) delete inst;
}
-
CSRIAPI int csri_request_fmt(csri_inst *inst, const struct csri_fmt *fmt)
{
if (!inst) {
@@ -136,7 +135,6 @@ CSRIAPI int csri_request_fmt(csri_inst *inst, const struct csri_fmt *fmt) return 0;
}
-
CSRIAPI void csri_render(csri_inst *inst, struct csri_frame *frame, double time)
{
const double arbitrary_framerate = 25.0;
@@ -184,7 +182,6 @@ CSRIAPI void csri_render(csri_inst *inst, struct csri_frame *frame, double time) inst->rts->Render(spd, (REFERENCE_TIME)(time*10000000), arbitrary_framerate, inst->video_rect);
}
-
// No extensions supported
CSRIAPI void *csri_query_ext(csri_rend *rend, csri_ext_id extname)
{
@@ -222,9 +219,11 @@ static struct csri_info csri_vsfilter_info = { "Gabest", // author
"Copyright (c) 2003-2010 by Gabest and others" // copyright
};
+
CSRIAPI struct csri_info *csri_renderer_info(csri_rend *rend) {
return &csri_vsfilter_info;
}
+
// Only one supported, obviously
CSRIAPI csri_rend *csri_renderer_byname(const char *name, const char *specific)
{
@@ -236,14 +235,15 @@ CSRIAPI csri_rend *csri_renderer_byname(const char *name, const char *specific) }
return &csri_vsfilter;
}
+
// Still just one
CSRIAPI csri_rend *csri_renderer_default()
{
return &csri_vsfilter;
}
+
// And no further
CSRIAPI csri_rend *csri_renderer_next(csri_rend *prev)
{
return 0;
}
-
diff --git a/src/filters/transform/VSFilter/vfr.cpp b/src/filters/transform/VSFilter/vfr.cpp index 08d449563..5f13a5aac 100644 --- a/src/filters/transform/VSFilter/vfr.cpp +++ b/src/filters/transform/VSFilter/vfr.cpp @@ -4,7 +4,7 @@ * $Id$
*
* (C) 2003-2006 Gabest
- * (C) 2006-2010 see AUTHORS
+ * (C) 2006-2011 see AUTHORS
*
* This file is part of mplayerc.
*
@@ -31,7 +31,6 @@ // Work with seconds per frame (spf) here instead of fps since that's more natural for the translation we're doing
-
class TimecodesV1 : public VFRTranslator
{
private:
@@ -126,7 +125,6 @@ public: };
-
class TimecodesV2 : public VFRTranslator
{
private:
@@ -169,7 +167,6 @@ public: };
-
VFRTranslator *GetVFRTranslator(const char *vfrfile)
{
char buf[32];
|