v4l2 access: setup the picture format (like the v4l2 demux)

[vlc] / modules / access / dshow / filter.cpp

diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp
index 1178225817797f36ec9431187822ef34b6f91800..caf8b511694b3fc9c4c701ad32d8cde3736b03b5 100644 (file)
--- a/modules/access/dshow/filter.cpp
+++ b/modules/access/dshow/filter.cpp
@@ -1,5 +1,5 @@
 /*****************************************************************************
- * filter.c : DirectShow access module for vlc
+ * filter.cpp : DirectShow access module for vlc
  *****************************************************************************
  * Copyright (C) 2002-2010 the VideoLAN team
  * $Id$
@@ -41,6 +41,11 @@
 #include "filter.h"
 #include "vlc_dshow.h"
 
+#include <initguid.h>
+DEFINE_GUID(MEDIASUBTYPE_HDYC ,0x43594448 /* CYDH */ , 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+DEFINE_GUID(MEDIASUBTYPE_DIVX ,0x58564944 /* XVID */ , 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71);
+
+
 #define DEBUG_DSHOW 1
 
 #define FILTER_NAME  L"VideoLAN Capture Filter"
@@ -330,7 +335,7 @@ STDMETHODIMP_(ULONG) CapturePin::Release()
 };
 
 /* IPin methods */
-STDMETHODIMP CapturePin::Connect( IPin * pReceivePin,
+STDMETHODIMP CapturePin::Connect( IPin *,
                                   const AM_MEDIA_TYPE *pmt )
 {
     if( State_Running == p_filter->state )
@@ -562,7 +567,7 @@ STDMETHODIMP CapturePin::EnumMediaTypes( IEnumMediaTypes **ppEnum )
 
     return NOERROR;
 }
-STDMETHODIMP CapturePin::QueryInternalConnections( IPin* *apPin, ULONG *nPin )
+STDMETHODIMP CapturePin::QueryInternalConnections( IPin**, ULONG * )
 {
 #ifdef DEBUG_DSHOW_L1
     msg_Dbg( p_input, "CapturePin::QueryInternalConnections" );
@@ -602,9 +607,7 @@ STDMETHODIMP CapturePin::EndFlush( void )
 
     return S_OK;
 }
-STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart,
-                                     REFERENCE_TIME tStop,
-                                     double dRate )
+STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME, REFERENCE_TIME, double )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CapturePin::NewSegment" );
@@ -613,7 +616,7 @@ STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart,
 }
 
 /* IMemInputPin methods */
-STDMETHODIMP CapturePin::GetAllocator( IMemAllocator **ppAllocator )
+STDMETHODIMP CapturePin::GetAllocator( IMemAllocator ** )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CapturePin::GetAllocator" );
@@ -621,8 +624,7 @@ STDMETHODIMP CapturePin::GetAllocator( IMemAllocator **ppAllocator )
 
     return VFW_E_NO_ALLOCATOR;
 }
-STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *pAllocator,
-                                          BOOL bReadOnly )
+STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *, BOOL )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CapturePin::NotifyAllocator" );
@@ -630,7 +632,7 @@ STDMETHODIMP CapturePin::NotifyAllocator( IMemAllocator *pAllocator,
 
     return S_OK;
 }
-STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES *pProps )
+STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES * )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" );
@@ -774,7 +776,7 @@ STDMETHODIMP_(ULONG) CaptureFilter::Release()
 };
 
 /* IPersist method */
-STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID)
+STDMETHODIMP CaptureFilter::GetClassID(CLSID *)
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::GetClassID" );
@@ -783,7 +785,7 @@ STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID)
 };
 
 /* IMediaFilter methods */
-STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State)
+STDMETHODIMP CaptureFilter::GetState(DWORD, FILTER_STATE *State)
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::GetState %i", state );
@@ -792,7 +794,7 @@ STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State)
     *State = state;
     return S_OK;
 };
-STDMETHODIMP CaptureFilter::SetSyncSource(IReferenceClock *pClock)
+STDMETHODIMP CaptureFilter::SetSyncSource(IReferenceClock *)
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::SetSyncSource" );
@@ -829,7 +831,7 @@ STDMETHODIMP CaptureFilter::Pause()
     state = State_Paused;
     return S_OK;
 };
-STDMETHODIMP CaptureFilter::Run(REFERENCE_TIME tStart)
+STDMETHODIMP CaptureFilter::Run(REFERENCE_TIME)
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::Run" );
@@ -850,7 +852,7 @@ STDMETHODIMP CaptureFilter::EnumPins( IEnumPins ** ppEnum )
     *ppEnum = new CaptureEnumPins( p_input, this, NULL );
     return *ppEnum == NULL ? E_OUTOFMEMORY : NOERROR;
 };
-STDMETHODIMP CaptureFilter::FindPin( LPCWSTR Id, IPin ** ppPin )
+STDMETHODIMP CaptureFilter::FindPin( LPCWSTR, IPin ** )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::FindPin" );
@@ -871,7 +873,7 @@ STDMETHODIMP CaptureFilter::QueryFilterInfo( FILTER_INFO * pInfo )
     return NOERROR;
 };
 STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph,
-                                             LPCWSTR pName )
+                                             LPCWSTR )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::JoinFilterGraph" );
@@ -881,7 +883,7 @@ STDMETHODIMP CaptureFilter::JoinFilterGraph( IFilterGraph * pGraph,
 
     return NOERROR;
 };
-STDMETHODIMP CaptureFilter::QueryVendorInfo( LPWSTR* pVendorInfo )
+STDMETHODIMP CaptureFilter::QueryVendorInfo( LPWSTR* )
 {
 #ifdef DEBUG_DSHOW
     msg_Dbg( p_input, "CaptureFilter::QueryVendorInfo" );