X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdshow%2Ffilter.cpp;h=2622b2e3ca6c43a2f6086ab892e74d00ca49e828;hb=df93f14938fa1201d69036b65945dcd64c739cce;hp=de579192e1b881649e797dacfe19d41d296ab626;hpb=25763b6abadb5270106f0b95c55233cb9174aded;p=vlc diff --git a/modules/access/dshow/filter.cpp b/modules/access/dshow/filter.cpp index de579192e1..2622b2e3ca 100644 --- a/modules/access/dshow/filter.cpp +++ b/modules/access/dshow/filter.cpp @@ -1,10 +1,10 @@ /***************************************************************************** * filter.c : DirectShow access module for vlc ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: filter.cpp,v 1.3 2003/08/26 19:14:10 gbazin Exp $ + * Copyright (C) 2002 the VideoLAN team + * $Id$ * - * Author: Gildas Bazin + * Author: Gildas Bazin * * 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 @@ -33,24 +33,18 @@ #include #ifndef _MSC_VER -# include -# include -# include -# include -# define _WINGDI_ 1 -# define AM_NOVTABLE -# define _OBJBASE_H_ -# undef _X86_ -# define _I64_MAX LONG_LONG_MAX -# define LONGLONG long long + /* Work-around a bug in w32api-2.5 */ +# define QACONTAINERFLAGS QACONTAINERFLAGS_SOMETHINGELSE #endif -#include - +#include "common.h" #include "filter.h" #define DEBUG_DSHOW 1 +#define FILTER_NAME L"VideoLAN Capture Filter" +#define PIN_NAME L"Capture" + /***************************************************************************** * DirectShow GUIDs. * Easier to define them hear as mingw doesn't provide them all. @@ -58,27 +52,60 @@ 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}}; +//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}}; -const GUID IID_IPersist = {0x0000010c, 0x0000, 0x0000, {0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46}}; +//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}}; @@ -86,18 +113,66 @@ const GUID MEDIASUBTYPE_RGB24 = {0xe436eb7d, 0x524f, 0x11ce, {0x9f, 0x53, 0x00, 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_Y41P = {0x50313459, 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}}; -const GUID MEDIASUBTYPE_Y211 = {0x31313259, 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}}; + +/* 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 ) { @@ -118,7 +193,10 @@ HRESULT WINAPI CopyMediaType( AM_MEDIA_TYPE *pmtTarget, const AM_MEDIA_TYPE *pmtSource ) { *pmtTarget = *pmtSource; - if( pmtSource->cbFormat != 0 ) + + if( !pmtSource || !pmtTarget ) return S_FALSE; + + if( pmtSource->cbFormat && pmtSource->pbFormat ) { pmtTarget->pbFormat = (PBYTE)CoTaskMemAlloc( pmtSource->cbFormat ); if( pmtTarget->pbFormat == NULL ) @@ -140,40 +218,151 @@ HRESULT WINAPI CopyMediaType( AM_MEDIA_TYPE *pmtTarget, return S_OK; } +int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type ) +{ + int i_fourcc = 0; + + if( media_type.majortype == MEDIATYPE_Video ) + { + /* currently only support this type of video info format */ + if( 1 /* media_type.formattype == FORMAT_VideoInfo */ ) + { + /* Packed RGB formats */ + if( media_type.subtype == MEDIASUBTYPE_RGB1 ) + i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '1' ); + else if( media_type.subtype == MEDIASUBTYPE_RGB4 ) + i_fourcc = VLC_FOURCC( 'R', 'G', 'B', '4' ); + 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' ); + else if( media_type.subtype == MEDIASUBTYPE_RGB565 ) + i_fourcc = VLC_FOURCC( 'R', 'V', '1', '6' ); + else if( media_type.subtype == MEDIASUBTYPE_RGB24 ) + i_fourcc = VLC_FOURCC( 'R', 'V', '2', '4' ); + else if( media_type.subtype == MEDIASUBTYPE_RGB32 ) + i_fourcc = VLC_FOURCC( 'R', 'V', '3', '2' ); + else if( media_type.subtype == MEDIASUBTYPE_ARGB32 ) + i_fourcc = VLC_FOURCC( 'R', 'G', 'B', 'A' ); + + /* Planar YUV formats */ + else if( media_type.subtype == MEDIASUBTYPE_I420 ) + i_fourcc = VLC_FOURCC( 'I', '4', '2', '0' ); + else if( media_type.subtype == MEDIASUBTYPE_Y41P ) + i_fourcc = VLC_FOURCC( 'I', '4', '1', '1' ); + else if( media_type.subtype == MEDIASUBTYPE_YV12 ) + i_fourcc = VLC_FOURCC( 'Y', 'V', '1', '2' ); + else if( media_type.subtype == MEDIASUBTYPE_IYUV ) + i_fourcc = VLC_FOURCC( 'Y', 'V', '1', '2' ); + else if( media_type.subtype == MEDIASUBTYPE_YVU9 ) + i_fourcc = VLC_FOURCC( 'Y', 'V', 'U', '9' ); + + /* Packed YUV formats */ + else if( media_type.subtype == MEDIASUBTYPE_YVYU ) + i_fourcc = VLC_FOURCC( 'Y', 'V', 'Y', 'U' ); + else if( media_type.subtype == MEDIASUBTYPE_YUYV ) + i_fourcc = VLC_FOURCC( 'Y', 'U', 'Y', '2' ); + 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' ); + else if( media_type.subtype == MEDIASUBTYPE_YUY2 ) + i_fourcc = VLC_FOURCC( 'Y', 'U', 'Y', '2' ); + else if( media_type.subtype == MEDIASUBTYPE_UYVY ) + i_fourcc = VLC_FOURCC( 'U', 'Y', 'V', 'Y' ); + + /* MPEG2 video elementary stream */ + else if( media_type.subtype == MEDIASUBTYPE_MPEG2_VIDEO ) + i_fourcc = VLC_FOURCC( 'm', 'p', '2', 'v' ); + + /* DV formats */ + else if( media_type.subtype == MEDIASUBTYPE_dvsl ) + i_fourcc = VLC_FOURCC( 'd', 'v', 's', 'l' ); + else if( media_type.subtype == MEDIASUBTYPE_dvsd ) + i_fourcc = VLC_FOURCC( 'd', 'v', 's', 'd' ); + else if( media_type.subtype == MEDIASUBTYPE_dvhd ) + i_fourcc = VLC_FOURCC( 'd', 'v', 'h', 'd' ); + } + } + else if( media_type.majortype == MEDIATYPE_Audio ) + { + /* currently only support this type of audio info format */ + if( media_type.formattype == FORMAT_WaveFormatEx ) + { + 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' ); + } + } + else if( media_type.majortype == MEDIATYPE_Stream ) + { + if( media_type.subtype == MEDIASUBTYPE_MPEG2_PROGRAM ) + i_fourcc = VLC_FOURCC( 'm', 'p', '2', 'p' ); + else if( media_type.subtype == MEDIASUBTYPE_MPEG2_TRANSPORT ) + i_fourcc = VLC_FOURCC( 'm', 'p', '2', 't' ); + } + + return i_fourcc; +} + /**************************************************************************** * Implementation of our dummy directshow filter pin class ****************************************************************************/ -CapturePin::CapturePin( input_thread_t * _p_input, CaptureFilter *_p_filter ) - : p_input( _p_input ), p_filter( _p_filter ), p_connected_pin( NULL ), +CapturePin::CapturePin( vlc_object_t *_p_input, access_sys_t *_p_sys, + CaptureFilter *_p_filter, + AM_MEDIA_TYPE *mt, size_t mt_count ) + : p_input( _p_input ), p_sys( _p_sys ), p_filter( _p_filter ), + p_connected_pin( NULL ), media_types(mt), media_type_count(mt_count), i_ref( 1 ) { + cx_media_type.majortype = mt[0].majortype; + cx_media_type.subtype = GUID_NULL; + cx_media_type.pbFormat = NULL; + cx_media_type.cbFormat = 0; + cx_media_type.pUnk = NULL; } CapturePin::~CapturePin() { +#ifdef DEBUG_DSHOW + msg_Dbg( p_input, "CapturePin::~CapturePin" ); +#endif + for( size_t c=0; clock ); if( samples_queue.size() ) { *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; } -AM_MEDIA_TYPE CapturePin::CustomGetMediaType() +AM_MEDIA_TYPE &CapturePin::CustomGetMediaType() { - return media_type; + return cx_media_type; } /* IUnknown methods */ STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CapturePin::QueryInterface" ); #endif @@ -192,81 +381,164 @@ STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv) } else { +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CapturePin::QueryInterface() failed for: " + "%04X-%02X-%02X-%02X%02X%02X%02X%02X%02X%02X%02X", + (int)riid.Data1, (int)riid.Data2, (int)riid.Data3, + static_cast(riid.Data4[0]), (int)riid.Data4[1], + (int)riid.Data4[2], (int)riid.Data4[3], + (int)riid.Data4[4], (int)riid.Data4[5], + (int)riid.Data4[6], (int)riid.Data4[7] ); +#endif *ppv = NULL; return E_NOINTERFACE; } } + STDMETHODIMP_(ULONG) CapturePin::AddRef() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::AddRef" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CapturePin::AddRef (ref: %i)", i_ref ); #endif return i_ref++; }; STDMETHODIMP_(ULONG) CapturePin::Release() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::Release" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CapturePin::Release (ref: %i)", i_ref ); #endif - i_ref--; - if( !i_ref ) delete this; + if( !InterlockedDecrement(&i_ref) ) delete this; - return i_ref; + return 0; }; /* IPin methods */ STDMETHODIMP CapturePin::Connect( IPin * pReceivePin, const AM_MEDIA_TYPE *pmt ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::Connect" ); -#endif - return E_NOTIMPL; + if( State_Running == p_filter->state ) + { + msg_Dbg( p_input, "CapturePin::Connect [not stopped]" ); + return VFW_E_NOT_STOPPED; + } + + if( p_connected_pin ) + { + msg_Dbg( p_input, "CapturePin::Connect [already connected]" ); + return VFW_E_ALREADY_CONNECTED; + } + + if( !pmt ) return S_OK; + + if( GUID_NULL != pmt->majortype && + media_types[0].majortype != pmt->majortype ) + { + msg_Dbg( p_input, "CapturePin::Connect [media major type mismatch]" ); + return S_FALSE; + } + + if( GUID_NULL != pmt->subtype && !GetFourCCFromMediaType(*pmt) ) + { + msg_Dbg( p_input, "CapturePin::Connect [media subtype type " + "not supported]" ); + return S_FALSE; + } + + if( pmt->pbFormat && pmt->majortype == MEDIATYPE_Video ) + { + if( !((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biHeight || + !((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biWidth ) + { + msg_Dbg( p_input, "CapturePin::Connect " + "[video width/height == 0 ]" ); + return S_FALSE; + } + } + + msg_Dbg( p_input, "CapturePin::Connect [OK]" ); + return S_OK; } STDMETHODIMP CapturePin::ReceiveConnection( IPin * pConnector, const AM_MEDIA_TYPE *pmt ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::ReceiveConnection" ); -#endif + if( State_Stopped != p_filter->state ) + { + msg_Dbg( p_input, "CapturePin::ReceiveConnection [not stopped]" ); + return VFW_E_NOT_STOPPED; + } + + if( !pConnector || !pmt ) + { + msg_Dbg( p_input, "CapturePin::ReceiveConnection [null pointer]" ); + return E_POINTER; + } + + if( p_connected_pin ) + { + msg_Dbg( p_input, "CapturePin::ReceiveConnection [already connected]"); + return VFW_E_ALREADY_CONNECTED; + } + + if( S_OK != QueryAccept(pmt) ) + { + msg_Dbg( p_input, "CapturePin::ReceiveConnection " + "[media type not accepted]" ); + return VFW_E_TYPE_NOT_ACCEPTED; + } + + msg_Dbg( p_input, "CapturePin::ReceiveConnection [OK]" ); p_connected_pin = pConnector; p_connected_pin->AddRef(); - return CopyMediaType( &media_type, pmt ); + + FreeMediaType( cx_media_type ); + return CopyMediaType( &cx_media_type, pmt ); } STDMETHODIMP CapturePin::Disconnect() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::Disconnect" ); -#endif + if( ! p_connected_pin ) + { + msg_Dbg( p_input, "CapturePin::Disconnect [not connected]" ); + return S_FALSE; + } + + msg_Dbg( p_input, "CapturePin::Disconnect [OK]" ); + + /* samples_queue was already flushed in EndFlush() */ p_connected_pin->Release(); p_connected_pin = NULL; - FreeMediaType( media_type ); + //FreeMediaType( cx_media_type ); + //cx_media_type.subtype = GUID_NULL; + return S_OK; } STDMETHODIMP CapturePin::ConnectedTo( IPin **pPin ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::ConnectedTo" ); -#endif - - if( !p_connected_pin ) return VFW_E_NOT_CONNECTED; + if( !p_connected_pin ) + { + msg_Dbg( p_input, "CapturePin::ConnectedTo [not connected]" ); + return VFW_E_NOT_CONNECTED; + } p_connected_pin->AddRef(); *pPin = p_connected_pin; + msg_Dbg( p_input, "CapturePin::ConnectedTo [OK]" ); + return S_OK; } STDMETHODIMP CapturePin::ConnectionMediaType( AM_MEDIA_TYPE *pmt ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::ConnectionMediaType" ); -#endif + if( !p_connected_pin ) + { + msg_Dbg( p_input, "CapturePin::ConnectionMediaType [not connected]" ); + return VFW_E_NOT_CONNECTED; + } - return CopyMediaType( pmt, &media_type ); + return CopyMediaType( pmt, &cx_media_type ); } STDMETHODIMP CapturePin::QueryPinInfo( PIN_INFO * pInfo ) { @@ -277,8 +549,7 @@ STDMETHODIMP CapturePin::QueryPinInfo( PIN_INFO * pInfo ) pInfo->pFilter = p_filter; if( p_filter ) p_filter->AddRef(); - pInfo->achName[0] = L'\0'; - + memcpy(pInfo->achName, PIN_NAME, sizeof(PIN_NAME)); pInfo->dir = PINDIR_INPUT; return NOERROR; @@ -297,18 +568,75 @@ STDMETHODIMP CapturePin::QueryId( LPWSTR * Id ) #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::QueryId" ); #endif - return E_NOTIMPL; + + *Id = L"VideoLAN Capture Pin"; + + return S_OK; } STDMETHODIMP CapturePin::QueryAccept( const AM_MEDIA_TYPE *pmt ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::QueryAccept" ); -#endif - return E_NOTIMPL; + if( State_Stopped != p_filter->state ) + { + msg_Dbg( p_input, "CapturePin::QueryAccept [not stopped]" ); + return S_FALSE; + } + + if( media_types[0].majortype != pmt->majortype ) + { + msg_Dbg( p_input, "CapturePin::QueryAccept [media type mismatch]" ); + return S_FALSE; + } + + int i_fourcc = GetFourCCFromMediaType(*pmt); + if( !i_fourcc ) + { + msg_Dbg( p_input, "CapturePin::QueryAccept " + "[media type not supported]" ); + return S_FALSE; + } + + if( pmt->majortype == MEDIATYPE_Video ) + { + if( pmt->pbFormat && + ( (((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biHeight == 0) || + (((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biWidth == 0) ) ) + { + msg_Dbg( p_input, "CapturePin::QueryAccept [video size wxh == 0]"); + return S_FALSE; + } + + msg_Dbg( p_input, "CapturePin::QueryAccept [OK] " + "(width=%ld, height=%ld, chroma=%4.4s)", + ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biWidth, + ((VIDEOINFOHEADER *)pmt->pbFormat)->bmiHeader.biHeight, + (char *)&i_fourcc ); + } + else if( pmt->majortype == MEDIATYPE_Audio ) + { + msg_Dbg( p_input, "CapturePin::QueryAccept [OK] (channels=%d, " + "samples/sec=%lu, bits/samples=%d, format=%4.4s)", + ((WAVEFORMATEX *)pmt->pbFormat)->nChannels, + ((WAVEFORMATEX *)pmt->pbFormat)->nSamplesPerSec, + ((WAVEFORMATEX *)pmt->pbFormat)->wBitsPerSample, + (char *)&i_fourcc ); + } + else + { + msg_Dbg( p_input, "CapturePin::QueryAccept [OK] (stream format=%4.4s)", + (char *)&i_fourcc ); + } + + if( p_connected_pin ) + { + FreeMediaType( cx_media_type ); + CopyMediaType( &cx_media_type, pmt ); + } + + return S_OK; } STDMETHODIMP CapturePin::EnumMediaTypes( IEnumMediaTypes **ppEnum ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CapturePin::EnumMediaTypes" ); #endif @@ -320,7 +648,7 @@ STDMETHODIMP CapturePin::EnumMediaTypes( IEnumMediaTypes **ppEnum ) } STDMETHODIMP CapturePin::QueryInternalConnections( IPin* *apPin, ULONG *nPin ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CapturePin::QueryInternalConnections" ); #endif return E_NOTIMPL; @@ -330,21 +658,33 @@ STDMETHODIMP CapturePin::EndOfStream( void ) #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::EndOfStream" ); #endif - return E_NOTIMPL; + return S_OK; } STDMETHODIMP CapturePin::BeginFlush( void ) { #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::BeginFlush" ); #endif - return E_NOTIMPL; + return S_OK; } STDMETHODIMP CapturePin::EndFlush( void ) { #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::EndFlush" ); #endif - return E_NOTIMPL; + + VLCMediaSample vlc_sample; + + vlc_mutex_lock( &p_sys->lock ); + while( samples_queue.size() ) + { + vlc_sample = samples_queue.back(); + samples_queue.pop_back(); + vlc_sample.p_sample->Release(); + } + vlc_mutex_unlock( &p_sys->lock ); + + return S_OK; } STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart, REFERENCE_TIME tStop, @@ -353,7 +693,7 @@ STDMETHODIMP CapturePin::NewSegment( REFERENCE_TIME tStart, #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::NewSegment" ); #endif - return E_NOTIMPL; + return S_OK; } /* IMemInputPin methods */ @@ -379,17 +719,20 @@ STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES *pProps #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" ); #endif + return E_NOTIMPL; } STDMETHODIMP CapturePin::Receive( IMediaSample *pSample ) { -#ifdef DEBUG_DSHOW - //msg_Dbg( p_input, "CapturePin::Receive" ); +#if 0 //def DEBUG_DSHOW + msg_Dbg( p_input, "CapturePin::Receive" ); #endif - //pSample->AddRef(); + pSample->AddRef(); mtime_t i_timestamp = mdate() * 10; VLCMediaSample vlc_sample = {pSample, i_timestamp}; + + vlc_mutex_lock( &p_sys->lock ); samples_queue.push_front( vlc_sample ); /* Make sure we don't cache too many samples */ @@ -398,19 +741,18 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample ) vlc_sample = samples_queue.back(); samples_queue.pop_back(); msg_Dbg( p_input, "CapturePin::Receive trashing late input sample" ); - // vlc_sample.p_sample->Release(); + vlc_sample.p_sample->Release(); } + vlc_cond_signal( &p_sys->wait ); + vlc_mutex_unlock( &p_sys->lock ); + return S_OK; } STDMETHODIMP CapturePin::ReceiveMultiple( IMediaSample **pSamples, long nSamples, long *nSamplesProcessed ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CapturePin::ReceiveMultiple" ); -#endif - HRESULT hr = S_OK; *nSamplesProcessed = 0; @@ -434,22 +776,26 @@ STDMETHODIMP CapturePin::ReceiveCanBlock( void ) /**************************************************************************** * Implementation of our dummy directshow filter class ****************************************************************************/ - -CaptureFilter::CaptureFilter( input_thread_t * _p_input ) - : p_input( _p_input ), p_pin( new CapturePin( _p_input, this ) ), - i_ref( 1 ) +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 ) { } CaptureFilter::~CaptureFilter() { +#ifdef DEBUG_DSHOW + msg_Dbg( p_input, "CaptureFilter::~CaptureFilter" ); +#endif p_pin->Release(); } /* IUnknown methods */ STDMETHODIMP CaptureFilter::QueryInterface( REFIID riid, void **ppv ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureFilter::QueryInterface" ); #endif @@ -479,28 +825,36 @@ STDMETHODIMP CaptureFilter::QueryInterface( REFIID riid, void **ppv ) } else { +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureFilter::QueryInterface() failed for: " + "%04X-%02X-%02X-%02X%02X%02X%02X%02X%02X%02X%02X", + (int)riid.Data1, (int)riid.Data2, (int)riid.Data3, + static_cast(riid.Data4[0]), (int)riid.Data4[1], + (int)riid.Data4[2], (int)riid.Data4[3], + (int)riid.Data4[4], (int)riid.Data4[5], + (int)riid.Data4[6], (int)riid.Data4[7] ); +#endif *ppv = NULL; return E_NOINTERFACE; } }; STDMETHODIMP_(ULONG) CaptureFilter::AddRef() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureFilter::AddRef" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureFilter::AddRef (ref: %i)", i_ref ); #endif return i_ref++; }; STDMETHODIMP_(ULONG) CaptureFilter::Release() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureFilter::Release" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureFilter::Release (ref: %i)", i_ref ); #endif - i_ref--; - if( !i_ref ) delete this; + if( !InterlockedDecrement(&i_ref) ) delete this; - return i_ref; + return 0; }; /* IPersist method */ @@ -516,9 +870,11 @@ STDMETHODIMP CaptureFilter::GetClassID(CLSID *pClsID) STDMETHODIMP CaptureFilter::GetState(DWORD dwMSecs, FILTER_STATE *State) { #ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureFilter::GetStat" ); + msg_Dbg( p_input, "CaptureFilter::GetState %i", state ); #endif - return E_NOTIMPL; + + *State = state; + return S_OK; }; STDMETHODIMP CaptureFilter::SetSyncSource(IReferenceClock *pClock) { @@ -526,35 +882,45 @@ STDMETHODIMP CaptureFilter::SetSyncSource(IReferenceClock *pClock) msg_Dbg( p_input, "CaptureFilter::SetSyncSource" ); #endif - return NOERROR; + return S_OK; }; STDMETHODIMP CaptureFilter::GetSyncSource(IReferenceClock **pClock) { #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CaptureFilter::GetSyncSource" ); #endif - return E_NOTIMPL; + + *pClock = NULL; + return NOERROR; }; STDMETHODIMP CaptureFilter::Stop() { #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CaptureFilter::Stop" ); #endif - return E_NOTIMPL; + + p_pin->EndFlush(); + + state = State_Stopped; + return S_OK; }; STDMETHODIMP CaptureFilter::Pause() { #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CaptureFilter::Pause" ); #endif - return E_NOTIMPL; + + state = State_Paused; + return S_OK; }; STDMETHODIMP CaptureFilter::Run(REFERENCE_TIME tStart) { #ifdef DEBUG_DSHOW msg_Dbg( p_input, "CaptureFilter::Run" ); #endif - return E_NOTIMPL; + + state = State_Running; + return S_OK; }; /* IBaseFilter methods */ @@ -581,7 +947,7 @@ STDMETHODIMP CaptureFilter::QueryFilterInfo( FILTER_INFO * pInfo ) msg_Dbg( p_input, "CaptureFilter::QueryFilterInfo" ); #endif - pInfo->achName[0] = L'\0'; + memcpy(pInfo->achName, FILTER_NAME, sizeof(FILTER_NAME)); pInfo->pGraph = p_graph; if( p_graph ) p_graph->AddRef(); @@ -617,7 +983,7 @@ CapturePin *CaptureFilter::CustomGetPin() * Implementation of our dummy directshow enumpins class ****************************************************************************/ -CaptureEnumPins::CaptureEnumPins( input_thread_t * _p_input, +CaptureEnumPins::CaptureEnumPins( vlc_object_t *_p_input, CaptureFilter *_p_filter, CaptureEnumPins *pEnumPins ) : p_input( _p_input ), p_filter( _p_filter ), i_ref( 1 ) @@ -639,13 +1005,16 @@ CaptureEnumPins::CaptureEnumPins( input_thread_t * _p_input, CaptureEnumPins::~CaptureEnumPins() { +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumPins::~CaptureEnumPins" ); +#endif p_filter->Release(); } /* IUnknown methods */ STDMETHODIMP CaptureEnumPins::QueryInterface( REFIID riid, void **ppv ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumPins::QueryInterface" ); #endif @@ -664,62 +1033,64 @@ STDMETHODIMP CaptureEnumPins::QueryInterface( REFIID riid, void **ppv ) }; STDMETHODIMP_(ULONG) CaptureEnumPins::AddRef() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureEnumPins::AddRef" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumPins::AddRef (ref: %i)", i_ref ); #endif return i_ref++; }; STDMETHODIMP_(ULONG) CaptureEnumPins::Release() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureEnumPins::Release" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumPins::Release (ref: %i)", i_ref ); #endif - i_ref--; - if( !i_ref ) delete this; + if( !InterlockedDecrement(&i_ref) ) delete this; - return i_ref; + return 0; }; /* IEnumPins */ STDMETHODIMP CaptureEnumPins::Next( ULONG cPins, IPin ** ppPins, ULONG * pcFetched ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumPins::Next" ); #endif - *pcFetched = 0; + unsigned int i_fetched = 0; if( i_position < 1 && cPins > 0 ) { IPin *pPin = p_filter->CustomGetPin(); *ppPins = pPin; pPin->AddRef(); - *pcFetched = 1; + i_fetched = 1; i_position++; } - return *pcFetched == cPins ? NOERROR : S_FALSE; + if( pcFetched ) *pcFetched = i_fetched; + + return (i_fetched == cPins) ? S_OK : S_FALSE; }; STDMETHODIMP CaptureEnumPins::Skip( ULONG cPins ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumPins::Skip" ); #endif - if( cPins > 1 ) + i_position += cPins; + + if( i_position > 1 ) { return S_FALSE; } - i_position += cPins; - return NOERROR; + return S_OK; }; STDMETHODIMP CaptureEnumPins::Reset() { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumPins::Reset" ); #endif @@ -728,7 +1099,7 @@ STDMETHODIMP CaptureEnumPins::Reset() }; STDMETHODIMP CaptureEnumPins::Clone( IEnumPins **ppEnum ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumPins::Clone" ); #endif @@ -741,36 +1112,39 @@ STDMETHODIMP CaptureEnumPins::Clone( IEnumPins **ppEnum ) /**************************************************************************** * Implementation of our dummy directshow enummediatypes class ****************************************************************************/ - -CaptureEnumMediaTypes::CaptureEnumMediaTypes( input_thread_t * _p_input, - CapturePin *_p_pin, - CaptureEnumMediaTypes *pEnumMediaTypes ) +CaptureEnumMediaTypes::CaptureEnumMediaTypes( vlc_object_t *_p_input, + CapturePin *_p_pin, CaptureEnumMediaTypes *pEnumMediaTypes ) : p_input( _p_input ), p_pin( _p_pin ), i_ref( 1 ) { /* Hold a reference count on our filter */ p_pin->AddRef(); /* Are we creating a new enumerator */ - if( pEnumMediaTypes == NULL ) { + CopyMediaType(&cx_media_type, &p_pin->cx_media_type); i_position = 0; } else { + CopyMediaType(&cx_media_type, &pEnumMediaTypes->cx_media_type); i_position = pEnumMediaTypes->i_position; } } CaptureEnumMediaTypes::~CaptureEnumMediaTypes() { +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumMediaTypes::~CaptureEnumMediaTypes" ); +#endif + FreeMediaType(cx_media_type); p_pin->Release(); } /* IUnknown methods */ STDMETHODIMP CaptureEnumMediaTypes::QueryInterface( REFIID riid, void **ppv ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumMediaTypes::QueryInterface" ); #endif @@ -789,22 +1163,21 @@ STDMETHODIMP CaptureEnumMediaTypes::QueryInterface( REFIID riid, void **ppv ) }; STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::AddRef() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureEnumMediaTypes::AddRef" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumMediaTypes::AddRef (ref: %i)", i_ref ); #endif return i_ref++; }; STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::Release() { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureEnumMediaTypes::Release" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumMediaTypes::Release (ref: %i)", i_ref ); #endif - i_ref--; - if( !i_ref ) delete this; + if( !InterlockedDecrement(&i_ref) ) delete this; - return i_ref; + return 0; }; /* IEnumMediaTypes */ @@ -812,52 +1185,81 @@ STDMETHODIMP CaptureEnumMediaTypes::Next( ULONG cMediaTypes, AM_MEDIA_TYPE ** ppMediaTypes, ULONG * pcFetched ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureEnumMediaTypes::Next" ); +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumMediaTypes::Next " ); #endif + ULONG copied = 0; + ULONG offset = 0; + ULONG max = p_pin->media_type_count; - *pcFetched = 0; + if( ! ppMediaTypes ) + return E_POINTER; -#if 0 - if( i_position < 1 && cMediaTypes > 0 ) + if( (! pcFetched) && (cMediaTypes > 1) ) + return E_POINTER; + + /* + ** use connection media type as first entry in iterator if it exists + */ + copied = 0; + if( cx_media_type.subtype != GUID_NULL ) { - IPin *pPin = p_pin->CustomGetPin(); - *ppMediaTypes = pPin; - pPin->AddRef(); - *pcFetched = 1; - i_position++; - return NOERROR; + ++max; + if( i_position == 0 ) + { + ppMediaTypes[copied] = + (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if( CopyMediaType(ppMediaTypes[copied], &cx_media_type) != S_OK ) + return E_OUTOFMEMORY; + ++i_position; + ++copied; + } } -#endif - return S_FALSE; + while( (copied < cMediaTypes) && (i_position < max) ) + { + ppMediaTypes[copied] = + (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); + if( CopyMediaType( ppMediaTypes[copied], + &p_pin->media_types[i_position-offset]) != S_OK ) + return E_OUTOFMEMORY; + + ++copied; + ++i_position; + } + + if( pcFetched ) *pcFetched = copied; + + return (copied == cMediaTypes) ? S_OK : S_FALSE; }; STDMETHODIMP CaptureEnumMediaTypes::Skip( ULONG cMediaTypes ) { -#ifdef DEBUG_DSHOW - msg_Dbg( p_input, "CaptureEnumMediaTypes::Skip" ); -#endif - - if( cMediaTypes > 0 ) + ULONG max = p_pin->media_type_count; + if( cx_media_type.subtype != GUID_NULL ) { - return S_FALSE; + max = 1; } +#ifdef DEBUG_DSHOW_L1 + msg_Dbg( p_input, "CaptureEnumMediaTypes::Skip" ); +#endif i_position += cMediaTypes; - return NOERROR; + return (i_position < max) ? S_OK : S_FALSE; }; STDMETHODIMP CaptureEnumMediaTypes::Reset() { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumMediaTypes::Reset" ); #endif + FreeMediaType(cx_media_type); + CopyMediaType(&cx_media_type, &p_pin->cx_media_type); i_position = 0; return S_OK; }; STDMETHODIMP CaptureEnumMediaTypes::Clone( IEnumMediaTypes **ppEnum ) { -#ifdef DEBUG_DSHOW +#ifdef DEBUG_DSHOW_L1 msg_Dbg( p_input, "CaptureEnumMediaTypes::Clone" ); #endif