X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdshow%2Ffilter.cpp;h=e0ee2efd23e5bd7792b30116fb5d9a0aa40f12ef;hb=f1a8ab79baee2aa7fbce87f4479b6f0557d9e2a5;hp=a012fcf3ba9170b7e8215650e4b0119f706db993;hpb=b0288ab5b8fdbe8e97a37e85fe6d671639c10ec1;p=vlc diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp index a012fcf3ba..e0ee2efd23 100644 --- a/modules/access/dshow/filter.cpp +++ b/modules/access/dshow/filter.cpp @@ -1,7 +1,7 @@ /***************************************************************************** * filter.c : DirectShow access module for vlc ***************************************************************************** - * Copyright (C) 2002 the VideoLAN team + * Copyright (C) 2002-2010 the VideoLAN team * $Id$ * * Author: Gildas Bazin @@ -24,159 +24,28 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #ifndef _MSC_VER /* Work-around a bug in w32api-2.5 */ # define QACONTAINERFLAGS QACONTAINERFLAGS_SOMETHINGELSE #endif -#include "common.h" +#include "access.h" #include "filter.h" +#include "vlc_dshow.h" #define DEBUG_DSHOW 1 #define FILTER_NAME L"VideoLAN Capture Filter" #define PIN_NAME L"Capture" -/***************************************************************************** - * DirectShow GUIDs. - * Easier to define them here as mingw doesn't provide them all. - *****************************************************************************/ -const GUID CLSID_SystemDeviceEnum = {0x62be5d10, 0x60eb, 0x11d0, {0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}}; -const GUID CLSID_VideoInputDeviceCategory = {0x860BB310,0x5D01,0x11d0,{0xBD,0x3B,0x00,0xA0,0xC9,0x11,0xCE,0x86}}; -const GUID CLSID_AudioInputDeviceCategory = {0x33d9a762, 0x90c8, 0x11d0, {0xbd, 0x43, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}}; -//const GUID IID_IPropertyBag = {0x55272A00, 0x42CB, 0x11CE, {0x81, 0x35, 0x00, 0xAA, 0x00, 0x4B, 0xB8, 0x51}}; -extern const GUID IID_IPropertyBag; -const GUID IID_ICreateDevEnum = {0x29840822, 0x5b84, 0x11d0, {0xbd, 0x3b, 0x00, 0xa0, 0xc9, 0x11, 0xce, 0x86}}; -const GUID IID_IFilterGraph = {0x56a8689f, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID IID_IMediaControl = {0x56a868b1, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID CLSID_FilterGraph = {0xe436ebb3, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; - -//const GUID IID_IUnknown = {0x00000000, 0x0000, 0x0000, {0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46}}; -extern const GUID IID_IUnknown; -//const GUID IID_IPersist = {0x0000010c, 0x0000, 0x0000, {0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46}}; -extern const GUID IID_IPersist; -const GUID IID_IMediaFilter = {0x56a86899, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}}; -const GUID IID_IBaseFilter = {0x56a86895, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID IID_IPin = {0x56a86891, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}}; -const GUID IID_IMemInputPin = {0x56a8689d, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}}; -extern const GUID IID_IMemInputPin; - -const GUID IID_IEnumPins = {0x56a86892, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}}; -const GUID IID_IEnumMediaTypes = {0x89c31040, 0x846b, 0x11ce, {0x97,0xd3, 0x00,0xaa,0x00,0x55,0x59,0x5a}}; - -const GUID IID_IAMBufferNegotiation = {0x56ed71a0, 0xaf5f, 0x11d0, {0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5}}; - -//const GUID IID_ISpecifyPropertyPages = {0xb196b28b, 0xbab4, 0x101a, {0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07}}; -extern const GUID IID_ISpecifyPropertyPages; - -const GUID IID_IQualityControl = {0x56a868a5, 0x0ad4, 0x11ce, {0xb, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; - -const GUID CLSID_CaptureGraphBuilder2 = {0xBF87B6E1, 0x8C27, 0x11d0, {0xB3, 0xF0, 0x0, 0xAA, 0x00, 0x37, 0x61, 0xC5}}; - -const GUID IID_IGraphBuilder = {0x56a868a9, 0x0ad4, 0x11ce, {0xb0, 0x3a, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; - -const GUID IID_ICaptureGraphBuilder2 = {0x93E5A4E0, 0x2D50, 0x11d2, {0xAB, 0xFA, 0x00, 0xA0, 0xC9, 0xC6, 0xE3, 0x8D}}; - -const GUID IID_IAMTVAudio = {0x83EC1C30, 0x23D1, 0x11d1, {0x99, 0xE6, 0x00, 0xA0, 0xC9, 0x56, 0x02, 0x66}}; -const GUID IID_IAMStreamConfig = {0xC6E13340, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}}; -const GUID IID_IAMCrossbar = {0xC6E13380, 0x30AC, 0x11d0, {0xA1, 0x8C, 0x00, 0xA0, 0xC9, 0x11, 0x89, 0x56}}; -const GUID IID_IAMTVTuner = {0x211A8766, 0x03AC, 0x11d1, {0x8D, 0x13, 0x00, 0xAA, 0x00, 0xBD, 0x83, 0x39}}; - -const GUID IID_IKsPropertySet = {0x31EFAC30, 0x515C, 0x11d0, {0xA9, 0xAA, 0x00, 0xAA, 0x00, 0x61, 0xBE, 0x93}}; - -/* Video Format */ - -const GUID FORMAT_VideoInfo = {0x05589f80, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; -/* - * MEDIATYPEs and MEDIASUBTYPEs - */ -const GUID MEDIATYPE_Video = {0x73646976, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIATYPE_Interleaved = {0x73766169, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIATYPE_Stream = {0xe436eb83, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_PREVIEW_VIDEO = {0x2859e1da, 0xb81f, 0x4fbd, {0x94, 0x3b, 0xe2, 0x37, 0x24, 0xa1, 0xab, 0xb3}}; - -/* Packed RGB formats */ -const GUID MEDIASUBTYPE_RGB1 = {0xe436eb78, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_RGB4 = {0xe436eb79, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_RGB8 = {0xe436eb7a, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_RGB565 = {0xe436eb7b, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_RGB555 = {0xe436eb7c, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_RGB24 = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_RGB32 = {0xe436eb7e, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 0x20, 0xaf, 0x0b, 0xa7, 0x70}}; -const GUID MEDIASUBTYPE_ARGB32 = {0x773c9ac0, 0x3274, 0x11d0, {0xb7, 0x24, 0x0, 0xaa, 0x0, 0x6c, 0x1a, 0x1}}; - -/* Packed YUV formats */ -const GUID MEDIASUBTYPE_YUYV = {0x56595559, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_Y411 = {0x31313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_Y211 = {0x31313259, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_YUY2 = {0x32595559, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_YVYU = {0x55595659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_UYVY = {0x59565955, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - -/* Planar YUV formats */ -const GUID MEDIASUBTYPE_YVU9 = {0x39555659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_YV12 = {0x32315659, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_IYUV = {0x56555949, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; /* identical to YV12 */ -const GUID MEDIASUBTYPE_Y41P = {0x50313459, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_I420 = {0x30323449, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - -const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID FORMAT_WaveFormatEx = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; -const GUID MEDIASUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - -/* DV formats */ -const GUID MEDIASUBTYPE_dvsd = {0x64737664, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_dvhd = {0x64687664, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; -const GUID MEDIASUBTYPE_dvsl = {0x6c737664, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - -/* MPEG2 formats */ -const GUID MEDIASUBTYPE_MPEG2_VIDEO = {0xe06d8026, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}}; -const GUID MEDIASUBTYPE_MPEG2_PROGRAM = {0xe06d8022, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}}; -const GUID MEDIASUBTYPE_MPEG2_TRANSPORT = {0xe06d8023, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}}; -const GUID FORMAT_MPEG2Video = {0xe06d80e3, 0xdb46, 0x11cf, {0xb4, 0xd1, 0x00, 0x80, 0x5f, 0x6c, 0xbb, 0xea}}; - -/* MJPG format */ -const GUID MEDIASUBTYPE_MJPG = {0x47504A4D, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; - -/* Analog Video */ -const GUID FORMAT_AnalogVideo = {0x482dde0, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; - -const GUID MEDIATYPE_AnalogVideo = {0x482dde1, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xab, 0x0, 0x6e, 0xcb, 0x65}}; - -const GUID MEDIASUBTYPE_AnalogVideo_NTSC_M = {0x482dde2, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_B = {0x482dde5, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_D = {0x482dde6, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_G = {0x482dde7, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_H = {0x482dde8, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_I = {0x482dde9, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_M = {0x482ddea, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_N = {0x482ddeb, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_PAL_N_COMBO = {0x482ddec, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_B = {0x482ddf0, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_D = {0x482ddf1, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_G = {0x482ddf2, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_H = {0x482ddf3, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_K = {0x482ddf4, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_K1 = {0x482ddf5, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; -const GUID MEDIASUBTYPE_AnalogVideo_SECAM_L = {0x482ddf6, 0x7817, 0x11cf, {0x8a, 0x3, 0x0, 0xaa, 0x0, 0x6e, 0xcb, 0x65}}; - -const GUID AMPROPSETID_Pin= {0x9b00f101, 0x1567, 0x11d1, {0xb3, 0xf1, 0x0, 0xaa, 0x0, 0x37, 0x61, 0xc5}}; -const GUID PIN_CATEGORY_ANALOGVIDEOIN= {0xfb6c4283, 0x0353, 0x11d1, {0x90, 0x5f, 0x00, 0x00, 0xc0, 0xcc, 0x16, 0xba}}; -const GUID PIN_CATEGORY_CAPTURE= {0xfb6c4281, 0x0353, 0x11d1, {0x90, 0x5f, 0x0, 0x0, 0xc0, 0xcc, 0x16, 0xba}}; -const GUID LOOK_UPSTREAM_ONLY= {0xac798be0, 0x98e3, 0x11d1, {0xb3, 0xf1, 0x0, 0xaa, 0x0, 0x37, 0x61, 0xc}}; - -//const GUID GUID_NULL = {0x0000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; -extern const GUID GUID_NULL; - void WINAPI FreeMediaType( AM_MEDIA_TYPE& mt ) { if( mt.cbFormat != 0 ) @@ -238,57 +107,67 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type ) else if( media_type.subtype == MEDIASUBTYPE_RGB8 ) i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '8' ); else if( media_type.subtype == MEDIASUBTYPE_RGB555 ) - i_fourcc = VLC_FOURCC( 'R', 'V', '1', '5' ); + i_fourcc = VLC_CODEC_RGB15; else if( media_type.subtype == MEDIASUBTYPE_RGB565 ) - i_fourcc = VLC_FOURCC( 'R', 'V', '1', '6' ); + i_fourcc = VLC_CODEC_RGB16; else if( media_type.subtype == MEDIASUBTYPE_RGB24 ) - i_fourcc = VLC_FOURCC( 'R', 'V', '2', '4' ); + i_fourcc = VLC_CODEC_RGB24; else if( media_type.subtype == MEDIASUBTYPE_RGB32 ) - i_fourcc = VLC_FOURCC( 'R', 'V', '3', '2' ); + i_fourcc = VLC_CODEC_RGB32; else if( media_type.subtype == MEDIASUBTYPE_ARGB32 ) - i_fourcc = VLC_FOURCC( 'R', 'G', 'B', 'A' ); + i_fourcc = VLC_CODEC_RGBA; /* Planar YUV formats */ else if( media_type.subtype == MEDIASUBTYPE_I420 ) - i_fourcc = VLC_FOURCC( 'I', '4', '2', '0' ); + i_fourcc = VLC_CODEC_I420; else if( media_type.subtype == MEDIASUBTYPE_Y41P ) - i_fourcc = VLC_FOURCC( 'I', '4', '1', '1' ); + i_fourcc = VLC_CODEC_I411; else if( media_type.subtype == MEDIASUBTYPE_YV12 ) - i_fourcc = VLC_FOURCC( 'Y', 'V', '1', '2' ); + i_fourcc = VLC_CODEC_YV12; else if( media_type.subtype == MEDIASUBTYPE_IYUV ) - i_fourcc = VLC_FOURCC( 'Y', 'V', '1', '2' ); + i_fourcc = VLC_CODEC_YV12; else if( media_type.subtype == MEDIASUBTYPE_YVU9 ) - i_fourcc = VLC_FOURCC( 'Y', 'V', 'U', '9' ); + i_fourcc = VLC_CODEC_I410; /* Packed YUV formats */ else if( media_type.subtype == MEDIASUBTYPE_YVYU ) - i_fourcc = VLC_FOURCC( 'Y', 'V', 'Y', 'U' ); + i_fourcc = VLC_CODEC_YVYU; else if( media_type.subtype == MEDIASUBTYPE_YUYV ) - i_fourcc = VLC_FOURCC( 'Y', 'U', 'Y', '2' ); + i_fourcc = VLC_CODEC_YUYV; else if( media_type.subtype == MEDIASUBTYPE_Y411 ) i_fourcc = VLC_FOURCC( 'I', '4', '1', 'N' ); else if( media_type.subtype == MEDIASUBTYPE_Y211 ) - i_fourcc = VLC_FOURCC( 'Y', '2', '1', '1' ); + i_fourcc = VLC_CODEC_Y211; else if( media_type.subtype == MEDIASUBTYPE_YUY2 ) - i_fourcc = VLC_FOURCC( 'Y', 'U', 'Y', '2' ); + i_fourcc = VLC_CODEC_YUYV; else if( media_type.subtype == MEDIASUBTYPE_UYVY ) - i_fourcc = VLC_FOURCC( 'U', 'Y', 'V', 'Y' ); + i_fourcc = VLC_CODEC_UYVY; + /* HDYC uses UYVY sample positions but Rec709 colourimetry */ + /* FIXME: When VLC understands colourspace, something will need + * to be added / changed here. Until then, just make it behave + * like UYVY */ + else if( media_type.subtype == MEDIASUBTYPE_HDYC ) + i_fourcc = VLC_CODEC_UYVY; /* MPEG2 video elementary stream */ else if( media_type.subtype == MEDIASUBTYPE_MPEG2_VIDEO ) - i_fourcc = VLC_FOURCC( 'm', 'p', '2', 'v' ); + i_fourcc = VLC_CODEC_MPGV; + + /* DivX video */ + else if( media_type.subtype == MEDIASUBTYPE_DIVX ) + i_fourcc = VLC_CODEC_MP4V; /* DV formats */ else if( media_type.subtype == MEDIASUBTYPE_dvsl ) - i_fourcc = VLC_FOURCC( 'd', 'v', 's', 'l' ); + i_fourcc = VLC_CODEC_DV; else if( media_type.subtype == MEDIASUBTYPE_dvsd ) - i_fourcc = VLC_FOURCC( 'd', 'v', 's', 'd' ); + i_fourcc = VLC_CODEC_DV; else if( media_type.subtype == MEDIASUBTYPE_dvhd ) - i_fourcc = VLC_FOURCC( 'd', 'v', 'h', 'd' ); + i_fourcc = VLC_CODEC_DV; /* MJPEG format */ else if( media_type.subtype == MEDIASUBTYPE_MJPG ) - i_fourcc = VLC_FOURCC( 'M', 'J', 'P', 'G' ); + i_fourcc = VLC_CODEC_MJPG; } } @@ -300,7 +179,7 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type ) if( media_type.subtype == MEDIASUBTYPE_PCM ) i_fourcc = VLC_FOURCC( 'a', 'r', 'a', 'w' ); else if( media_type.subtype == MEDIASUBTYPE_IEEE_FLOAT ) - i_fourcc = VLC_FOURCC( 'f', 'l', '3', '2' ); + i_fourcc = VLC_CODEC_FL32; } } else if( media_type.majortype == MEDIATYPE_Stream ) @@ -344,21 +223,49 @@ CapturePin::~CapturePin() FreeMediaType(cx_media_type); } +/** + * Returns the complete queue of samples that have been received so far. + * Lock the p_sys->lock before calling this function. + * @param samples_queue [out] Empty queue that will get all elements from + * the pin queue. + * @return S_OK if a sample was available, S_FALSE if no sample was + * available + */ +HRESULT CapturePin::CustomGetSamples( deque &external_queue ) +{ +#if 0 //def DEBUG_DSHOW + msg_Dbg( p_input, "CapturePin::CustomGetSamples: %d samples in the queue", samples_queue.size()); +#endif + + if( !samples_queue.empty() ) + { + external_queue.swap(samples_queue); + return S_OK; + } + return S_FALSE; +} + +/** + * Returns a sample from its sample queue. Proper locking must be done prior + * to this call. Current dshow code protects the access to any sample queue + * (audio and video) with the p_sys->lock + * @param vlc_sample [out] Address of a sample if sucessfull. Undefined + * otherwise. + * @return S_OK if a sample was available, S_FALSE if no sample was + * available + */ HRESULT CapturePin::CustomGetSample( VLCMediaSample *vlc_sample ) { #if 0 //def DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::CustomGetSample" ); #endif - vlc_mutex_lock( &p_sys->lock ); - if( samples_queue.size() ) + if( !samples_queue.empty() ) { *vlc_sample = samples_queue.back(); samples_queue.pop_back(); - vlc_mutex_unlock( &p_sys->lock ); return S_OK; } - vlc_mutex_unlock( &p_sys->lock ); return S_FALSE; } @@ -423,7 +330,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 ) @@ -439,7 +346,7 @@ STDMETHODIMP CapturePin::Connect( IPin * pReceivePin, } if( !pmt ) return S_OK; - + if( GUID_NULL != pmt->majortype && media_types[0].majortype != pmt->majortype ) { @@ -577,7 +484,7 @@ STDMETHODIMP CapturePin::QueryId( LPWSTR * Id ) msg_Dbg( p_input, "CapturePin::QueryId" ); #endif - *Id = L"VideoLAN Capture Pin"; + *Id = (LPWSTR)L"VLC Capture Pin"; return S_OK; } @@ -597,7 +504,7 @@ STDMETHODIMP CapturePin::QueryAccept( const AM_MEDIA_TYPE *pmt ) int i_fourcc = GetFourCCFromMediaType(*pmt); if( !i_fourcc ) - { + { msg_Dbg( p_input, "CapturePin::QueryAccept " "[media type not supported]" ); return S_FALSE; @@ -618,7 +525,7 @@ STDMETHODIMP CapturePin::QueryAccept( const AM_MEDIA_TYPE *pmt ) ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biWidth, ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biHeight, (char *)&i_fourcc, - 10000000.0f/((float)((VIDEOINFOHEADER *)pmt->pbFormat)->AvgTimePerFrame) ); + 10000000.0f/((float)((VIDEOINFOHEADER *)pmt->pbFormat)->AvgTimePerFrame) ); } else if( pmt->majortype == MEDIATYPE_Audio ) { @@ -628,7 +535,7 @@ STDMETHODIMP CapturePin::QueryAccept( const AM_MEDIA_TYPE *pmt ) ((WAVEFORMATEX *)pmt->pbFormat)->nSamplesPerSec, ((WAVEFORMATEX *)pmt->pbFormat)->wBitsPerSample, (char *)&i_fourcc ); - } + } else { msg_Dbg( p_input, "CapturePin::QueryAccept [OK] (stream format=%4.4s)", @@ -655,7 +562,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" ); @@ -685,7 +592,7 @@ STDMETHODIMP CapturePin::EndFlush( void ) VLCMediaSample vlc_sample; vlc_mutex_lock( &p_sys->lock ); - while( samples_queue.size() ) + while( !samples_queue.empty() ) { vlc_sample = samples_queue.back(); samples_queue.pop_back(); @@ -695,9 +602,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" ); @@ -706,7 +611,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" ); @@ -714,8 +619,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" ); @@ -723,7 +627,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" ); @@ -789,7 +693,7 @@ CaptureFilter::CaptureFilter( vlc_object_t *_p_input, access_sys_t *p_sys, AM_MEDIA_TYPE *mt, size_t mt_count ) : p_input( _p_input ), p_pin( new CapturePin( _p_input, p_sys, this, mt, mt_count ) ), - state( State_Stopped ), i_ref( 1 ) + state( State_Stopped ), i_ref( 1 ) { } @@ -867,7 +771,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" ); @@ -876,7 +780,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 ); @@ -885,7 +789,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" ); @@ -922,7 +826,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" ); @@ -943,7 +847,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" ); @@ -964,7 +868,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" ); @@ -974,7 +878,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" ); @@ -1131,12 +1035,12 @@ CaptureEnumMediaTypes::CaptureEnumMediaTypes( vlc_object_t *_p_input, /* Are we creating a new enumerator */ if( pEnumMediaTypes == NULL ) { - CopyMediaType(&cx_media_type, &p_pin->cx_media_type); + CopyMediaType(&cx_media_type, &p_pin->cx_media_type); i_position = 0; } else { - CopyMediaType(&cx_media_type, &pEnumMediaTypes->cx_media_type); + CopyMediaType(&cx_media_type, &pEnumMediaTypes->cx_media_type); i_position = pEnumMediaTypes->i_position; } } @@ -1201,7 +1105,7 @@ STDMETHODIMP CaptureEnumMediaTypes::Next( ULONG cMediaTypes, ULONG offset = 0; ULONG max = p_pin->media_type_count; - if( ! ppMediaTypes ) + if( ! ppMediaTypes ) return E_POINTER; if( (! pcFetched) && (cMediaTypes > 1) ) @@ -1220,7 +1124,7 @@ STDMETHODIMP CaptureEnumMediaTypes::Next( ULONG cMediaTypes, (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); if( CopyMediaType(ppMediaTypes[copied], &cx_media_type) != S_OK ) return E_OUTOFMEMORY; - ++i_position; + ++i_position; ++copied; } } @@ -1234,7 +1138,7 @@ STDMETHODIMP CaptureEnumMediaTypes::Next( ULONG cMediaTypes, return E_OUTOFMEMORY; ++copied; - ++i_position; + ++i_position; } if( pcFetched ) *pcFetched = copied; @@ -1262,7 +1166,7 @@ STDMETHODIMP CaptureEnumMediaTypes::Reset() #endif FreeMediaType(cx_media_type); - CopyMediaType(&cx_media_type, &p_pin->cx_media_type); + CopyMediaType(&cx_media_type, &p_pin->cx_media_type); i_position = 0; return S_OK; };