X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Faccess%2Fdshow%2Fdshow.cpp;h=40458eb5a7ed7e718c0584449f32b9bf44b3ad3f;hb=f94a2f9c4a4c7979d9695bb240686c73b6cf7e00;hp=926d3d8dd5616327d9566556ec9f1e44591c5eb6;hpb=08be895ad56325bb18277bcc55a658e9d6cd04bf;p=vlc diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 926d3d8dd5..40458eb5a7 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -1,10 +1,11 @@ /***************************************************************************** * dshow.cpp : DirectShow access module for vlc ***************************************************************************** - * Copyright (C) 2002, 2003 VideoLAN + * Copyright (C) 2002, 2003 the VideoLAN team * $Id$ * * Author: Gildas Bazin + * Damien Fouilleul * * 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 @@ -18,121 +19,145 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include -#include +#include +#include +#include +#include +#include +#include "common.h" #include "filter.h" /***************************************************************************** * Access: local prototypes *****************************************************************************/ -static int AccessRead ( access_t *, byte_t *, int ); -static int ReadCompressed( access_t *, byte_t *, int ); +static block_t *ReadCompressed( access_t * ); static int AccessControl ( access_t *, int, va_list ); -static int OpenDevice( access_t *, string, vlc_bool_t ); +static int Demux ( demux_t * ); +static int DemuxControl( demux_t *, int, va_list ); + +static int OpenDevice( vlc_object_t *, access_sys_t *, string, bool ); static IBaseFilter *FindCaptureDevice( vlc_object_t *, string *, - list *, vlc_bool_t ); + list *, bool ); static size_t EnumDeviceCaps( vlc_object_t *, IBaseFilter *, - int, int, int, int, int, int, AM_MEDIA_TYPE *mt, size_t mt_max); -static bool ConnectFilters( access_t *, IBaseFilter *, CaptureFilter * ); - + int, int, int, int, int, int, + AM_MEDIA_TYPE *mt, size_t ); +static bool ConnectFilters( vlc_object_t *, access_sys_t *, + IBaseFilter *, CaptureFilter * ); static int FindDevicesCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); static int ConfigDevicesCallback( vlc_object_t *, char const *, vlc_value_t, vlc_value_t, void * ); -static void PropertiesPage( vlc_object_t *, IBaseFilter *, - ICaptureGraphBuilder2 *, vlc_bool_t ); - -#if 0 - /* Debug only, use this to find out GUIDs */ - unsigned char p_st[]; - UuidToString( (IID *)&IID_IAMBufferNegotiation, &p_st ); - msg_Err( p_access, "BufferNegotiation: %s" , p_st ); -#endif - -/* - * header: - * fcc ".dsh" - * u32 stream count - * fcc "auds"|"vids" 0 - * fcc codec 4 - * if vids - * u32 width 8 - * u32 height 12 - * u32 padding 16 - * if auds - * u32 channels 12 - * u32 samplerate 8 - * u32 samplesize 16 - * - * data: - * u32 stream number - * u32 data size - * u8 data - */ - -static void SetDWBE( uint8_t *p, uint32_t dw ) -{ - p[0] = (dw >> 24)&0xff; - p[1] = (dw >> 16)&0xff; - p[2] = (dw >> 8)&0xff; - p[3] = (dw )&0xff; -} - -static void SetQWBE( uint8_t *p, uint64_t qw ) -{ - SetDWBE( p, (qw >> 32)&0xffffffff ); - SetDWBE( &p[4], qw&0xffffffff ); -} +static void ShowPropertyPage( IUnknown * ); +static void ShowDeviceProperties( vlc_object_t *, ICaptureGraphBuilder2 *, + IBaseFilter *, bool ); +static void ShowTunerProperties( vlc_object_t *, ICaptureGraphBuilder2 *, + IBaseFilter *, bool ); +static void ConfigTuner( vlc_object_t *, ICaptureGraphBuilder2 *, + IBaseFilter * ); /***************************************************************************** * Module descriptor *****************************************************************************/ -static char *ppsz_vdev[] = { "", "none" }; -static char *ppsz_vdev_text[] = { N_("Default"), N_("None") }; -static char *ppsz_adev[] = { "", "none" }; -static char *ppsz_adev_text[] = { N_("Default"), N_("None") }; +static const char *ppsz_vdev[] = { "", "none" }; +static const char *ppsz_vdev_text[] = { N_("Default"), N_("None") }; +static const char *ppsz_adev[] = { "", "none" }; +static const char *ppsz_adev_text[] = { N_("Default"), N_("None") }; +static int pi_tuner_input[] = { 0, 1, 2 }; +static const char *ppsz_tuner_input_text[] = + {N_("Default"), N_("Cable"), N_("Antenna")}; +static const int pi_amtuner_mode[] = { AMTUNER_MODE_DEFAULT, + AMTUNER_MODE_TV, + AMTUNER_MODE_FM_RADIO, + AMTUNER_MODE_AM_RADIO, + AMTUNER_MODE_DSS }; +static const char *ppsz_amtuner_mode_text[] = { N_("Default"), + N_("TV"), + N_("FM radio"), + N_("AM radio"), + N_("DSS") }; #define CACHING_TEXT N_("Caching value in ms") #define CACHING_LONGTEXT N_( \ - "Allows you to modify the default caching value for DirectShow streams. " \ - "This value should be set in milliseconds units." ) + "Caching value for DirectShow streams. " \ + "This value should be set in millisecondss." ) #define VDEV_TEXT N_("Video device name") #define VDEV_LONGTEXT N_( \ - "You can specify the name of the video device that will be used by the " \ + "Name of the video device that will be used by the " \ "DirectShow plugin. If you don't specify anything, the default device " \ "will be used.") #define ADEV_TEXT N_("Audio device name") #define ADEV_LONGTEXT N_( \ - "You can specify the name of the audio device that will be used by the " \ + "Name of the audio device that will be used by the " \ "DirectShow plugin. If you don't specify anything, the default device " \ - "will be used.") + "will be used. ") #define SIZE_TEXT N_("Video size") #define SIZE_LONGTEXT N_( \ - "You can specify the size of the video that will be displayed by the " \ + "Size of the video that will be displayed by the " \ "DirectShow plugin. If you don't specify anything the default size for " \ - "your device will be used.") + "your device will be used. You can specify a standard size (cif, d1, ...) or x.") #define CHROMA_TEXT N_("Video input chroma format") #define CHROMA_LONGTEXT N_( \ "Force the DirectShow video input to use a specific chroma format " \ "(eg. I420 (default), RV24, etc.)") +#define FPS_TEXT N_("Video input frame rate") +#define FPS_LONGTEXT N_( \ + "Force the DirectShow video input to use a specific frame rate" \ + "(eg. 0 means default, 25, 29.97, 50, 59.94, etc.)") #define CONFIG_TEXT N_("Device properties") #define CONFIG_LONGTEXT N_( \ "Show the properties dialog of the selected device before starting the " \ "stream.") +#define TUNER_TEXT N_("Tuner properties") +#define TUNER_LONGTEXT N_( \ + "Show the tuner properties [channel selection] page." ) +#define CHANNEL_TEXT N_("Tuner TV Channel") +#define CHANNEL_LONGTEXT N_( \ + "Set the TV channel the tuner will set to " \ + "(0 means default)." ) +#define COUNTRY_TEXT N_("Tuner country code") +#define COUNTRY_LONGTEXT N_( \ + "Set the tuner country code that establishes the current " \ + "channel-to-frequency mapping (0 means default)." ) +#define TUNER_INPUT_TEXT N_("Tuner input type") +#define TUNER_INPUT_LONGTEXT N_( \ + "Select the tuner input type (Cable/Antenna)." ) +#define VIDEO_IN_TEXT N_("Video input pin") +#define VIDEO_IN_LONGTEXT N_( \ + "Select the video input source, such as composite, s-video, " \ + "or tuner. Since these settings are hardware-specific, you should find good " \ + "settings in the \"Device config\" area, and use those numbers here. -1 " \ + "means that settings will not be changed.") +#define AUDIO_IN_TEXT N_("Audio input pin") +#define AUDIO_IN_LONGTEXT N_( \ + "Select the audio input source. See the \"video input\" option." ) +#define VIDEO_OUT_TEXT N_("Video output pin") +#define VIDEO_OUT_LONGTEXT N_( \ + "Select the video output type. See the \"video input\" option." ) +#define AUDIO_OUT_TEXT N_("Audio output pin") +#define AUDIO_OUT_LONGTEXT N_( \ + "Select the audio output type. See the \"video input\" option." ) + +#define AMTUNER_MODE_TEXT N_("AM Tuner mode") +#define AMTUNER_MODE_LONGTEXT N_( \ + "AM Tuner mode. Can be one of DEFAULT, TV, AM_RADIO, FM_RADIO or DSS.") + +static int CommonOpen ( vlc_object_t *, access_sys_t *, bool ); +static void CommonClose( vlc_object_t *, access_sys_t * ); static int AccessOpen ( vlc_object_t * ); static void AccessClose( vlc_object_t * ); @@ -143,50 +168,81 @@ static void DemuxClose ( vlc_object_t * ); vlc_module_begin(); set_shortname( _("DirectShow") ); set_description( _("DirectShow input") ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_ACCESS ); add_integer( "dshow-caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL, - CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); + CACHING_TEXT, CACHING_LONGTEXT, true ); - add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_FALSE); + add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, false); change_string_list( ppsz_vdev, ppsz_vdev_text, FindDevicesCallback ); change_action_add( FindDevicesCallback, N_("Refresh list") ); change_action_add( ConfigDevicesCallback, N_("Configure") ); - add_string( "dshow-adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, VLC_FALSE); + add_string( "dshow-adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, false); change_string_list( ppsz_adev, ppsz_adev_text, FindDevicesCallback ); change_action_add( FindDevicesCallback, N_("Refresh list") ); change_action_add( ConfigDevicesCallback, N_("Configure") ); - add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE); + add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, false); add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - VLC_TRUE ); + true ); - add_bool( "dshow-config", VLC_FALSE, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, - VLC_FALSE ); + add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, + true ); - add_shortcut( "dshow" ); - set_capability( "access2", 0 ); - set_callbacks( AccessOpen, AccessClose ); + add_bool( "dshow-config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, + true ); + + add_bool( "dshow-tuner", false, NULL, TUNER_TEXT, TUNER_LONGTEXT, + true ); + + add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT, + CHANNEL_LONGTEXT, true ); + + add_integer( "dshow-tuner-country", 0, NULL, COUNTRY_TEXT, + COUNTRY_LONGTEXT, true ); + + add_integer( "dshow-tuner-input", 0, NULL, TUNER_INPUT_TEXT, + TUNER_INPUT_LONGTEXT, true ); + change_integer_list( pi_tuner_input, ppsz_tuner_input_text, 0 ); + + add_integer( "dshow-video-input", -1, NULL, VIDEO_IN_TEXT, + VIDEO_IN_LONGTEXT, true ); + + add_integer( "dshow-audio-input", -1, NULL, AUDIO_IN_TEXT, + AUDIO_IN_LONGTEXT, true ); + + add_integer( "dshow-video-output", -1, NULL, VIDEO_OUT_TEXT, + VIDEO_OUT_LONGTEXT, true ); + + add_integer( "dshow-audio-output", -1, NULL, AUDIO_OUT_TEXT, + AUDIO_OUT_LONGTEXT, true ); + + add_integer( "dshow-amtuner-mode", AMTUNER_MODE_TV, NULL, + AMTUNER_MODE_TEXT, AMTUNER_MODE_LONGTEXT, false); + change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, 0 ); - add_submodule(); - set_description( _("DirectShow demuxer") ); add_shortcut( "dshow" ); - set_capability( "demux2", 200 ); + set_capability( "access_demux", 0 ); set_callbacks( DemuxOpen, DemuxClose ); + add_submodule(); + set_description( _("DirectShow input") ); + set_capability( "access", 0 ); + set_callbacks( AccessOpen, AccessClose ); + vlc_module_end(); -/**************************************************************************** +/***************************************************************************** * DirectShow elementary stream descriptor - ****************************************************************************/ + *****************************************************************************/ typedef struct dshow_stream_t { string devicename; IBaseFilter *p_device_filter; CaptureFilter *p_capture_filter; AM_MEDIA_TYPE mt; - int i_fourcc; - vlc_bool_t b_invert; union { @@ -195,57 +251,15 @@ typedef struct dshow_stream_t } header; - vlc_bool_t b_pts; + int i_fourcc; + es_out_id_t *p_es; + bool b_pts; } dshow_stream_t; -/**************************************************************************** - * Access descriptor declaration - ****************************************************************************/ -#define MAX_CROSSBAR_DEPTH 10 - -typedef struct CrossbarRouteRec { - IAMCrossbar *pXbar; - LONG VideoInputIndex; - LONG VideoOutputIndex; - LONG AudioInputIndex; - LONG AudioOutputIndex; -} CrossbarRoute; - -struct access_sys_t -{ - /* These 2 must be left at the beginning */ - vlc_mutex_t lock; - vlc_cond_t wait; - - IFilterGraph *p_graph; - ICaptureGraphBuilder2 *p_capture_graph_builder2; - IMediaControl *p_control; - - int i_crossbar_route_depth; - CrossbarRoute crossbar_routes[MAX_CROSSBAR_DEPTH]; - - /* header */ - int i_header_size; - int i_header_pos; - uint8_t *p_header; - - /* list of elementary streams */ - dshow_stream_t **pp_streams; - int i_streams; - int i_current_stream; - - /* misc properties */ - int i_mtu; - int i_width; - int i_height; - int i_chroma; - int b_audio; -}; - -/**************************************************************************** +/***************************************************************************** * DirectShow utility functions - ****************************************************************************/ + *****************************************************************************/ static void CreateDirectShowGraph( access_sys_t *p_sys ) { p_sys->i_crossbar_route_depth = 0; @@ -268,16 +282,6 @@ static void CreateDirectShowGraph( access_sys_t *p_sys ) } } -static void DeleteCrossbarRoutes( access_sys_t *p_sys ) -{ - /* Remove crossbar filters from graph */ - for( int i = 0; i < p_sys->i_crossbar_route_depth; i++ ) - { - p_sys->crossbar_routes[i].pXbar->Release(); - } - p_sys->i_crossbar_route_depth = 0; -} - static void DeleteDirectShowGraph( access_sys_t *p_sys ) { DeleteCrossbarRoutes( p_sys ); @@ -310,158 +314,183 @@ static void DeleteDirectShowGraph( access_sys_t *p_sys ) } } -static void ReleaseDirectShow( access_t *p_access ) -{ - access_sys_t *p_sys = p_access->p_sys; - - msg_Dbg( p_access, "Releasing DirectShow"); - - DeleteDirectShowGraph( p_sys ); - - /* Uninitialize OLE/COM */ - CoUninitialize(); - - free( p_sys->p_header ); - /* Remove filters from graph */ - for( int i = 0; i < p_sys->i_streams; i++ ) - { - delete p_sys->pp_streams[i]; - } - free( p_sys->pp_streams ); - free( p_sys ); -} - /***************************************************************************** - * Open: open direct show device + * CommonOpen: open direct show device *****************************************************************************/ -static int AccessOpen( vlc_object_t *p_this ) +static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, + bool b_access_demux ) { - access_t *p_access = (access_t*)p_this; - access_sys_t *p_sys; vlc_value_t val; + int i; /* Get/parse options and open device(s) */ string vdevname, adevname; int i_width = 0, i_height = 0, i_chroma = 0; + bool b_audio = true; - var_Create( p_access, "dshow-config", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT); - - var_Create( p_access, "dshow-vdev", VLC_VAR_STRING | VLC_VAR_DOINHERIT); - var_Get( p_access, "dshow-vdev", &val ); + var_Create( p_this, "dshow-config", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-tuner", VLC_VAR_BOOL | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-vdev", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_this, "dshow-vdev", &val ); if( val.psz_string ) vdevname = string( val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); - var_Create( p_access, "dshow-adev", VLC_VAR_STRING | VLC_VAR_DOINHERIT); - var_Get( p_access, "dshow-adev", &val ); + var_Create( p_this, "dshow-adev", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_this, "dshow-adev", &val ); if( val.psz_string ) adevname = string( val.psz_string ); - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); - var_Create( p_access, "dshow-size", VLC_VAR_STRING | VLC_VAR_DOINHERIT); - var_Get( p_access, "dshow-size", &val ); + static struct {char *psz_size; int i_width; int i_height;} size_table[] = + { { "subqcif", 128, 96 }, { "qsif", 160, 120 }, { "qcif", 176, 144 }, + { "sif", 320, 240 }, { "cif", 352, 288 }, { "d1", 640, 480 }, + { 0, 0, 0 }, + }; + + var_Create( p_this, "dshow-size", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_this, "dshow-size", &val ); if( val.psz_string && *val.psz_string ) { - if( !strcmp( val.psz_string, "subqcif" ) ) - { - i_width = 128; i_height = 96; - } - else if( !strcmp( val.psz_string, "qsif" ) ) - { - i_width = 160; i_height = 120; - } - else if( !strcmp( val.psz_string, "qcif" ) ) - { - i_width = 176; i_height = 144; - } - else if( !strcmp( val.psz_string, "sif" ) ) + for( i = 0; size_table[i].psz_size; i++ ) { - i_width = 320; i_height = 240; - } - else if( !strcmp( val.psz_string, "cif" ) ) - { - i_width = 352; i_height = 288; - } - else if( !strcmp( val.psz_string, "vga" ) ) - { - i_width = 640; i_height = 480; + if( !strcmp( val.psz_string, size_table[i].psz_size ) ) + { + i_width = size_table[i].i_width; + i_height = size_table[i].i_height; + break; + } } - else + if( !size_table[i].psz_size ) /* Try to parse "WidthxHeight" */ { - /* Width x Height */ char *psz_parser; i_width = strtol( val.psz_string, &psz_parser, 0 ); if( *psz_parser == 'x' || *psz_parser == 'X') { i_height = strtol( psz_parser + 1, &psz_parser, 0 ); } - msg_Dbg( p_access, "Width x Height %dx%d", i_width, i_height ); + msg_Dbg( p_this, "width x height %dx%d", i_width, i_height ); } } - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); - var_Create( p_access, "dshow-chroma", VLC_VAR_STRING | VLC_VAR_DOINHERIT); - var_Get( p_access, "dshow-chroma", &val ); + p_sys->b_chroma = false; + var_Create( p_this, "dshow-chroma", VLC_VAR_STRING | VLC_VAR_DOINHERIT ); + var_Get( p_this, "dshow-chroma", &val ); if( val.psz_string && strlen( val.psz_string ) >= 4 ) { i_chroma = VLC_FOURCC( val.psz_string[0], val.psz_string[1], val.psz_string[2], val.psz_string[3] ); + p_sys->b_chroma = true; } - if( val.psz_string ) free( val.psz_string ); + free( val.psz_string ); - /* Setup Access */ - p_access->pf_read = AccessRead; - p_access->pf_block = NULL; - p_access->pf_control = AccessControl; - p_access->pf_seek = NULL; - p_access->info.i_update = 0; - p_access->info.i_size = 0; - p_access->info.i_pos = 0; - p_access->info.b_eof = VLC_FALSE; - p_access->info.i_title = 0; - p_access->info.i_seekpoint = 0; - p_access->p_sys = p_sys = (access_sys_t *)malloc( sizeof( access_sys_t ) ); - memset( p_sys, 0, sizeof( access_sys_t ) ); + var_Create( p_this, "dshow-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-tuner-channel", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-tuner-country", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-tuner-input", + VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); - var_Create( p_access, "dshow-caching", + var_Create( p_this, "dshow-amtuner-mode", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + + var_Create( p_this, "dshow-video-input", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-audio-input", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-video-output", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + var_Create( p_this, "dshow-audio-output", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT ); + /* Initialize OLE/COM */ CoInitialize( 0 ); /* Initialize some data */ p_sys->i_streams = 0; - p_sys->pp_streams = (dshow_stream_t **)malloc( 1 ); + p_sys->pp_streams = 0; p_sys->i_width = i_width; p_sys->i_height = i_height; p_sys->i_chroma = i_chroma; - p_sys->b_audio = VLC_TRUE; - p_sys->i_mtu = 0; - - /* Create header */ - p_sys->i_header_size = 8; - p_sys->p_header = (uint8_t *)malloc( p_sys->i_header_size ); - memcpy( &p_sys->p_header[0], ".dsh", 4 ); - SetDWBE( &p_sys->p_header[4], 1 ); - p_sys->i_header_pos = p_sys->i_header_size; p_sys->p_graph = NULL; p_sys->p_capture_graph_builder2 = NULL; p_sys->p_control = NULL; + vlc_mutex_init( p_this, &p_sys->lock ); + vlc_cond_init( p_this, &p_sys->wait ); + /* Build directshow graph */ CreateDirectShowGraph( p_sys ); - if( OpenDevice( p_access, vdevname, 0 ) != VLC_SUCCESS ) + if( OpenDevice( p_this, p_sys, vdevname, 0 ) != VLC_SUCCESS ) + { + msg_Err( p_this, "can't open video"); + } + else { - msg_Err( p_access, "can't open video"); + /* Check if we can handle the demuxing ourselves or need to spawn + * a demuxer module */ + dshow_stream_t *p_stream = p_sys->pp_streams[p_sys->i_streams-1]; + + if( p_stream->mt.majortype == MEDIATYPE_Video ) + { + if( /* Raw DV stream */ + p_stream->i_fourcc == VLC_FOURCC('d','v','s','l') || + p_stream->i_fourcc == VLC_FOURCC('d','v','s','d') || + p_stream->i_fourcc == VLC_FOURCC('d','v','h','d') || + /* Raw MPEG video stream */ + p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') ) + { + b_audio = false; + + if( b_access_demux ) + { + /* Let the access (only) take care of that */ + return VLC_EGENERIC; + } + } + } + + if( p_stream->mt.majortype == MEDIATYPE_Stream ) + { + b_audio = false; + + if( b_access_demux ) + { + /* Let the access (only) take care of that */ + return VLC_EGENERIC; + } + + var_Get( p_this, "dshow-tuner", &val ); + if( val.b_bool ) + { + /* FIXME: we do MEDIATYPE_Stream here so we don't do + * it twice. */ + ShowTunerProperties( p_this, p_sys->p_capture_graph_builder2, + p_stream->p_device_filter, 0 ); + } + } } - if( p_sys->b_audio && OpenDevice( p_access, adevname, 1 ) != VLC_SUCCESS ) + if( b_audio && OpenDevice( p_this, p_sys, adevname, 1 ) != VLC_SUCCESS ) { - msg_Err( p_access, "can't open audio"); + msg_Err( p_this, "can't open audio"); } - - for( int i = 0; i < p_sys->i_crossbar_route_depth; i++ ) + + for( i = p_sys->i_crossbar_route_depth-1; i >= 0 ; --i ) { + var_Get( p_this, "dshow-video-input", &val ); + if( val.i_int >= 0 ) + p_sys->crossbar_routes[i].VideoInputIndex=val.i_int; + var_Get( p_this, "dshow-video-output", &val ); + if( val.i_int >= 0 ) + p_sys->crossbar_routes[i].VideoOutputIndex=val.i_int; + var_Get( p_this, "dshow-audio-input", &val ); + if( val.i_int >= 0 ) + p_sys->crossbar_routes[i].AudioInputIndex=val.i_int; + var_Get( p_this, "dshow-audio-output", &val ); + if( val.i_int >= 0 ) + p_sys->crossbar_routes[i].AudioOutputIndex=val.i_int; + IAMCrossbar *pXbar = p_sys->crossbar_routes[i].pXbar; LONG VideoInputIndex = p_sys->crossbar_routes[i].VideoInputIndex; LONG VideoOutputIndex = p_sys->crossbar_routes[i].VideoOutputIndex; @@ -470,8 +499,8 @@ static int AccessOpen( vlc_object_t *p_this ) if( SUCCEEDED(pXbar->Route(VideoOutputIndex, VideoInputIndex)) ) { - msg_Dbg( p_access, "Crossbar at depth %d, Routed video " - "ouput %ld to video input %ld", i, VideoOutputIndex, + msg_Dbg( p_this, "crossbar at depth %d, routed video " + "output %ld to video input %ld", i, VideoOutputIndex, VideoInputIndex ); if( AudioOutputIndex != -1 && AudioInputIndex != -1 ) @@ -479,294 +508,235 @@ static int AccessOpen( vlc_object_t *p_this ) if( SUCCEEDED( pXbar->Route(AudioOutputIndex, AudioInputIndex)) ) { - msg_Dbg(p_access, "Crossbar at depth %d, Routed audio " - "ouput %ld to audio input %ld", i, + msg_Dbg(p_this, "crossbar at depth %d, routed audio " + "output %ld to audio input %ld", i, AudioOutputIndex, AudioInputIndex ); } } } } - if( !p_sys->i_streams ) + /* + ** Show properties pages from other filters in graph + */ + var_Get( p_this, "dshow-config", &val ); + if( val.b_bool ) { - ReleaseDirectShow( p_access ); - return VLC_EGENERIC; + for( i = p_sys->i_crossbar_route_depth-1; i >= 0 ; --i ) + { + IAMCrossbar *pXbar = p_sys->crossbar_routes[i].pXbar; + IBaseFilter *p_XF; + + if( SUCCEEDED( pXbar->QueryInterface( IID_IBaseFilter, + (void **)&p_XF ) ) ) + { + ShowPropertyPage( p_XF ); + p_XF->Release(); + } + } } /* Initialize some data */ p_sys->i_current_stream = 0; - p_sys->i_mtu += p_sys->i_header_size + 16 /* data header size */; - vlc_mutex_init( p_access, &p_sys->lock ); - vlc_cond_init( p_access, &p_sys->wait ); - - msg_Dbg( p_access, "Playing..."); - /* Everything is ready. Let's rock baby */ - p_sys->p_control->Run(); + if( !p_sys->i_streams ) return VLC_EGENERIC; return VLC_SUCCESS; } /***************************************************************************** - * AccessClose: close device + * DemuxOpen: open direct show device as an access_demux module *****************************************************************************/ -static void AccessClose( vlc_object_t *p_this ) +static int DemuxOpen( vlc_object_t *p_this ) { - access_t *p_access = (access_t *)p_this; - access_sys_t *p_sys = p_access->p_sys; + demux_t *p_demux = (demux_t *)p_this; + access_sys_t *p_sys; + int i; - /* Stop capturing stuff */ - p_sys->p_control->Stop(); + p_sys = (access_sys_t *)malloc( sizeof( access_sys_t ) ); + memset( p_sys, 0, sizeof( access_sys_t ) ); + p_demux->p_sys = (demux_sys_t *)p_sys; - ReleaseDirectShow( p_access ); -} + if( CommonOpen( p_this, p_sys, true ) != VLC_SUCCESS ) + { + CommonClose( p_this, p_sys ); + return VLC_EGENERIC; + } -/***************************************************************************** - * AccessControl: - *****************************************************************************/ -static int AccessControl( access_t *p_access, int i_query, va_list args ) -{ - access_sys_t *p_sys = p_access->p_sys; - vlc_bool_t *pb_bool; - int *pi_int; - int64_t *pi_64; + /* Everything is ready. Let's rock baby */ + msg_Dbg( p_this, "Playing..."); + p_sys->p_control->Run(); - switch( i_query ) + p_demux->pf_demux = Demux; + p_demux->pf_control = DemuxControl; + p_demux->info.i_update = 0; + p_demux->info.i_title = 0; + p_demux->info.i_seekpoint = 0; + + for( i = 0; i < p_sys->i_streams; i++ ) { - /* */ - case ACCESS_CAN_SEEK: - case ACCESS_CAN_FASTSEEK: - case ACCESS_CAN_PAUSE: - case ACCESS_CAN_CONTROL_PACE: - pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* ); - *pb_bool = VLC_FALSE; - break; + dshow_stream_t *p_stream = p_sys->pp_streams[i]; + es_format_t fmt; - /* */ - case ACCESS_GET_MTU: - pi_int = (int*)va_arg( args, int * ); - *pi_int = p_sys->i_mtu; - break; + if( p_stream->mt.majortype == MEDIATYPE_Video ) + { + es_format_Init( &fmt, VIDEO_ES, p_stream->i_fourcc ); - case ACCESS_GET_PTS_DELAY: - pi_64 = (int64_t*)va_arg( args, int64_t * ); - *pi_64 = (int64_t)var_GetInteger( p_access, "dshow-caching" ) * - I64C(1000); - break; + fmt.video.i_width = p_stream->header.video.bmiHeader.biWidth; + fmt.video.i_height = p_stream->header.video.bmiHeader.biHeight; + fmt.video.i_aspect = 4 * VOUT_ASPECT_FACTOR / 3; + + if( !p_stream->header.video.bmiHeader.biCompression ) + { + /* RGB DIB are coded from bottom to top */ + fmt.video.i_height = (unsigned int)(-(int)fmt.video.i_height); + } - /* */ - case ACCESS_SET_PAUSE_STATE: - case ACCESS_GET_TITLE_INFO: - case ACCESS_SET_TITLE: - case ACCESS_SET_SEEKPOINT: - return VLC_EGENERIC; + /* Setup rgb mask for RGB formats */ + if( p_stream->i_fourcc == VLC_FOURCC('R','V','2','4') ) + { + /* This is in BGR format */ + fmt.video.i_bmask = 0x00ff0000; + fmt.video.i_gmask = 0x0000ff00; + fmt.video.i_rmask = 0x000000ff; + } + + if( p_stream->header.video.AvgTimePerFrame ) + { + fmt.video.i_frame_rate = 10000000; + fmt.video.i_frame_rate_base = + p_stream->header.video.AvgTimePerFrame; + } + } + else if( p_stream->mt.majortype == MEDIATYPE_Audio ) + { + es_format_Init( &fmt, AUDIO_ES, p_stream->i_fourcc ); - default: - msg_Err( p_access, "unimplemented query in control" ); - return VLC_EGENERIC; + fmt.audio.i_channels = p_stream->header.audio.nChannels; + fmt.audio.i_rate = p_stream->header.audio.nSamplesPerSec; + fmt.audio.i_bitspersample = p_stream->header.audio.wBitsPerSample; + fmt.audio.i_blockalign = fmt.audio.i_channels * + fmt.audio.i_bitspersample / 8; + fmt.i_bitrate = fmt.audio.i_channels * fmt.audio.i_rate * + fmt.audio.i_bitspersample; + } + p_stream->p_es = es_out_Add( p_demux->out, &fmt ); } + return VLC_SUCCESS; } -/**************************************************************************** - * RouteCrossbars (Does not AddRef the returned *Pin) - ****************************************************************************/ -static HRESULT GetCrossbarIPinAtIndex( IAMCrossbar *pXbar, LONG PinIndex, - BOOL IsInputPin, IPin ** ppPin ) +/***************************************************************************** + * AccessOpen: open direct show device as an access module + *****************************************************************************/ +static int AccessOpen( vlc_object_t *p_this ) { - LONG cntInPins, cntOutPins; - IPin *pP = 0; - IBaseFilter *pFilter = NULL; - IEnumPins *pins=0; - ULONG n; - - if( !pXbar || !ppPin ) return E_POINTER; + access_t *p_access = (access_t*)p_this; + access_sys_t *p_sys; - *ppPin = 0; + p_access->p_sys = p_sys = (access_sys_t *)malloc( sizeof( access_sys_t ) ); + memset( p_sys, 0, sizeof( access_sys_t ) ); - if( S_OK != pXbar->get_PinCounts(&cntOutPins, &cntInPins) ) return E_FAIL; + if( CommonOpen( p_this, p_sys, false ) != VLC_SUCCESS ) + { + CommonClose( p_this, p_sys ); + return VLC_EGENERIC; + } - LONG TrueIndex = IsInputPin ? PinIndex : PinIndex + cntInPins; + dshow_stream_t *p_stream = p_sys->pp_streams[0]; - if( pXbar->QueryInterface(IID_IBaseFilter, (void **)&pFilter) == S_OK ) + /* Check if we need to force demuxers */ + if( !p_access->psz_demux || !*p_access->psz_demux ) { - if( SUCCEEDED(pFilter->EnumPins(&pins)) ) + if( p_stream->i_fourcc == VLC_FOURCC('d','v','s','l') || + p_stream->i_fourcc == VLC_FOURCC('d','v','s','d') || + p_stream->i_fourcc == VLC_FOURCC('d','v','h','d') ) { - LONG i = 0; - while( pins->Next(1, &pP, &n) == S_OK ) - { - pP->Release(); - if( i == TrueIndex ) - { - *ppPin = pP; - break; - } - i++; - } - pins->Release(); + p_access->psz_demux = strdup( "rawdv" ); + } + else if( p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') ) + { + p_access->psz_demux = "mpgv"; } - pFilter->Release(); } - return *ppPin ? S_OK : E_FAIL; + /* Setup Access */ + p_access->pf_read = NULL; + p_access->pf_block = ReadCompressed; + p_access->pf_control = AccessControl; + p_access->pf_seek = NULL; + p_access->info.i_update = 0; + p_access->info.i_size = 0; + p_access->info.i_pos = 0; + p_access->info.b_eof = false; + p_access->info.i_title = 0; + p_access->info.i_seekpoint = 0; + p_access->p_sys = p_sys; + + /* Everything is ready. Let's rock baby */ + msg_Dbg( p_this, "Playing..."); + p_sys->p_control->Run(); + + return VLC_SUCCESS; } -/**************************************************************************** - * GetCrossbarIndexFromIPin: Find corresponding index of an IPin on a crossbar - ****************************************************************************/ -static HRESULT GetCrossbarIndexFromIPin( IAMCrossbar * pXbar, LONG * PinIndex, - BOOL IsInputPin, IPin * pPin ) +/***************************************************************************** + * CommonClose: close device + *****************************************************************************/ +static void CommonClose( vlc_object_t *p_this, access_sys_t *p_sys ) { - LONG cntInPins, cntOutPins; - IPin *pP = 0; - IBaseFilter *pFilter = NULL; - IEnumPins *pins = 0; - ULONG n; - BOOL fOK = FALSE; + msg_Dbg( p_this, "releasing DirectShow"); - if(!pXbar || !PinIndex || !pPin ) - return E_POINTER; + DeleteDirectShowGraph( p_sys ); - if( S_OK != pXbar->get_PinCounts(&cntOutPins, &cntInPins) ) - return E_FAIL; + /* Uninitialize OLE/COM */ + CoUninitialize(); - if( pXbar->QueryInterface(IID_IBaseFilter, (void **)&pFilter) == S_OK ) - { - if( SUCCEEDED(pFilter->EnumPins(&pins)) ) - { - LONG i=0; + for( int i = 0; i < p_sys->i_streams; i++ ) delete p_sys->pp_streams[i]; + if( p_sys->i_streams ) free( p_sys->pp_streams ); - while( pins->Next(1, &pP, &n) == S_OK ) - { - pP->Release(); - if( pPin == pP ) - { - *PinIndex = IsInputPin ? i : i - cntInPins; - fOK = TRUE; - break; - } - i++; - } - pins->Release(); - } - pFilter->Release(); - } + vlc_mutex_destroy( &p_sys->lock ); + vlc_cond_destroy( &p_sys->wait ); - return fOK ? S_OK : E_FAIL; + free( p_sys ); } -/**************************************************************************** - * FindCrossbarRoutes - ****************************************************************************/ -static HRESULT FindCrossbarRoutes( access_t *p_access, IPin *p_input_pin, - LONG physicalType, int depth = 0 ) +/***************************************************************************** + * AccessClose: close device + *****************************************************************************/ +static void AccessClose( vlc_object_t *p_this ) { - access_sys_t *p_sys = p_access->p_sys; - HRESULT result = S_FALSE; - - IPin *p_output_pin; - if( FAILED(p_input_pin->ConnectedTo(&p_output_pin)) ) return S_FALSE; - - // It is connected, so now find out if the filter supports IAMCrossbar - PIN_INFO pinInfo; - if( FAILED(p_output_pin->QueryPinInfo(&pinInfo)) || - PINDIR_OUTPUT != pinInfo.dir ) - { - p_output_pin->Release (); - return S_FALSE; - } - - IAMCrossbar *pXbar=0; - if( FAILED(pinInfo.pFilter->QueryInterface(IID_IAMCrossbar, - (void **)&pXbar)) ) - { - pinInfo.pFilter->Release(); - p_output_pin->Release (); - return S_FALSE; - } + access_t *p_access = (access_t *)p_this; + access_sys_t *p_sys = p_access->p_sys; - LONG inputPinCount, outputPinCount; - if( FAILED(pXbar->get_PinCounts(&outputPinCount, &inputPinCount)) ) - { - pXbar->Release(); - pinInfo.pFilter->Release(); - p_output_pin->Release (); - return S_FALSE; - } + /* Stop capturing stuff */ + p_sys->p_control->Stop(); - LONG inputPinIndexRelated, outputPinIndexRelated; - LONG inputPinPhysicalType, outputPinPhysicalType; - LONG inputPinIndex, outputPinIndex; - if( FAILED(GetCrossbarIndexFromIPin( pXbar, &outputPinIndex, - FALSE, p_output_pin )) || - FAILED(pXbar->get_CrossbarPinInfo( FALSE, outputPinIndex, - &outputPinIndexRelated, - &outputPinPhysicalType )) ) - { - pXbar->Release(); - pinInfo.pFilter->Release(); - p_output_pin->Release (); - return S_FALSE; - } + CommonClose( p_this, p_sys ); +} - // - // for all input pins - // - for( inputPinIndex = 0; S_OK != result && inputPinIndex < inputPinCount; - inputPinIndex++ ) - { - if( FAILED(pXbar->get_CrossbarPinInfo( TRUE, inputPinIndex, - &inputPinIndexRelated, &inputPinPhysicalType )) ) continue; - - // Is the pin a video pin? - if( inputPinPhysicalType != physicalType ) continue; - - // Can we route it? - if( FAILED(pXbar->CanRoute(outputPinIndex, inputPinIndex)) ) continue; - - IPin *pPin; - if( FAILED(GetCrossbarIPinAtIndex( pXbar, inputPinIndex, - TRUE, &pPin)) ) continue; - - result = FindCrossbarRoutes( p_access, pPin, physicalType, depth+1 ); - if( S_OK == result || (S_FALSE == result && - physicalType == inputPinPhysicalType && - (p_sys->i_crossbar_route_depth = depth+1) < MAX_CROSSBAR_DEPTH) ) - { - // hold on crossbar - pXbar->AddRef(); - - // remember crossbar route - p_sys->crossbar_routes[depth].pXbar = pXbar; - p_sys->crossbar_routes[depth].VideoInputIndex = inputPinIndex; - p_sys->crossbar_routes[depth].VideoOutputIndex = outputPinIndex; - p_sys->crossbar_routes[depth].AudioInputIndex = inputPinIndexRelated; - p_sys->crossbar_routes[depth].AudioOutputIndex = outputPinIndexRelated; - - msg_Dbg( p_access, "Crossbar at depth %d, Found Route For " - "ouput %ld (type %ld) to input %ld (type %ld)", depth, - outputPinIndex, outputPinPhysicalType, inputPinIndex, - inputPinPhysicalType ); - - result = S_OK; - } - } +/***************************************************************************** + * DemuxClose: close device + *****************************************************************************/ +static void DemuxClose( vlc_object_t *p_this ) +{ + demux_t *p_demux = (demux_t *)p_this; + access_sys_t *p_sys = (access_sys_t *)p_demux->p_sys; - pXbar->Release(); - pinInfo.pFilter->Release(); - p_output_pin->Release (); + /* Stop capturing stuff */ + p_sys->p_control->Stop(); - return result; + CommonClose( p_this, p_sys ); } /**************************************************************************** * ConnectFilters ****************************************************************************/ -static bool ConnectFilters( access_t *p_access, IBaseFilter *p_filter, +static bool ConnectFilters( vlc_object_t *p_this, access_sys_t *p_sys, + IBaseFilter *p_filter, CaptureFilter *p_capture_filter ) { - access_sys_t *p_sys = p_access->p_sys; CapturePin *p_input_pin = p_capture_filter->CustomGetPin(); AM_MEDIA_TYPE mediaType = p_input_pin->CustomGetMediaType(); @@ -774,9 +744,8 @@ static bool ConnectFilters( access_t *p_access, IBaseFilter *p_filter, if( p_sys->p_capture_graph_builder2 ) { if( FAILED(p_sys->p_capture_graph_builder2-> - RenderStream( &PIN_CATEGORY_CAPTURE, &mediaType.majortype, - p_filter, NULL, - (IBaseFilter *)p_capture_filter )) ) + RenderStream( &PIN_CATEGORY_CAPTURE, &mediaType.majortype, + p_filter, 0, (IBaseFilter *)p_capture_filter )) ) { return false; } @@ -784,7 +753,8 @@ static bool ConnectFilters( access_t *p_access, IBaseFilter *p_filter, // Sort out all the possible video inputs // The class needs to be given the capture filters ANALOGVIDEO input pin IEnumPins *pins = 0; - if( mediaType.majortype == MEDIATYPE_Video && + if( ( mediaType.majortype == MEDIATYPE_Video || + mediaType.majortype == MEDIATYPE_Stream ) && SUCCEEDED(p_filter->EnumPins(&pins)) ) { IPin *pP = 0; @@ -795,31 +765,28 @@ static bool ConnectFilters( access_t *p_access, IBaseFilter *p_filter, GUID guid; DWORD dw; - while( !Found && (S_OK == pins->Next(1, &pP, &n)) ) + while( !Found && ( S_OK == pins->Next(1, &pP, &n) ) ) { - if(S_OK == pP->QueryPinInfo(&pinInfo)) + if( S_OK == pP->QueryPinInfo(&pinInfo) ) { - if(pinInfo.dir == PINDIR_INPUT) + // is this pin an ANALOGVIDEOIN input pin? + if( pinInfo.dir == PINDIR_INPUT && + pP->QueryInterface( IID_IKsPropertySet, + (void **)&pKs ) == S_OK ) { - // is this pin an ANALOGVIDEOIN input pin? - if( pP->QueryInterface(IID_IKsPropertySet, - (void **)&pKs) == S_OK ) + if( pKs->Get( AMPROPSETID_Pin, + AMPROPERTY_PIN_CATEGORY, NULL, 0, + &guid, sizeof(GUID), &dw ) == S_OK ) { - if( pKs->Get(AMPROPSETID_Pin, - AMPROPERTY_PIN_CATEGORY, NULL, 0, - &guid, sizeof(GUID), &dw) == S_OK ) + if( guid == PIN_CATEGORY_ANALOGVIDEOIN ) { - if( guid == PIN_CATEGORY_ANALOGVIDEOIN ) - { - // recursively search crossbar routes - FindCrossbarRoutes( p_access, pP, - PhysConn_Video_Tuner ); - // found it - Found = TRUE; - } + // recursively search crossbar routes + FindCrossbarRoutes( p_this, p_sys, pP, 0 ); + // found it + Found = TRUE; } - pKs->Release(); } + pKs->Release(); } pinInfo.pFilter->Release(); } @@ -858,50 +825,39 @@ static bool ConnectFilters( access_t *p_access, IBaseFilter *p_filter, } /* -** get fourcc priority from arbritary preference, the higher the better -*/ -static int GetFourCCPriority(int i_fourcc) + * get fourcc priority from arbritary preference, the higher the better + */ +static int GetFourCCPriority( int i_fourcc ) { switch( i_fourcc ) { - case VLC_FOURCC('I','4','2','0'): - case VLC_FOURCC('f','l','3','2'): - { - return 9; - } - - case VLC_FOURCC('Y','V','1','2'): - case VLC_FOURCC('a','r','a','w'): - { - return 8; - } - - case VLC_FOURCC('R','V','2','4'): - { - return 7; - } - - case VLC_FOURCC('Y','U','Y','2'): - case VLC_FOURCC('R','V','3','2'): - case VLC_FOURCC('R','G','B','A'): - { - return 6; - } + case VLC_FOURCC('I','4','2','0'): + case VLC_FOURCC('f','l','3','2'): + return 9; + case VLC_FOURCC('Y','V','1','2'): + case VLC_FOURCC('a','r','a','w'): + return 8; + case VLC_FOURCC('R','V','2','4'): + return 7; + case VLC_FOURCC('Y','U','Y','2'): + case VLC_FOURCC('R','V','3','2'): + case VLC_FOURCC('R','G','B','A'): + return 6; } + return 0; } #define MAX_MEDIA_TYPES 32 -static int OpenDevice( access_t *p_access, string devicename, - vlc_bool_t b_audio ) +static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys, + string devicename, bool b_audio ) { - access_sys_t *p_sys = p_access->p_sys; - /* See if device is already opened */ for( int i = 0; i < p_sys->i_streams; i++ ) { - if( p_sys->pp_streams[i]->devicename == devicename ) + if( devicename.size() && + p_sys->pp_streams[i]->devicename == devicename ) { /* Already opened */ return VLC_SUCCESS; @@ -911,14 +867,14 @@ static int OpenDevice( access_t *p_access, string devicename, list list_devices; /* Enumerate devices and display their names */ - FindCaptureDevice( (vlc_object_t *)p_access, NULL, &list_devices, b_audio ); + FindCaptureDevice( p_this, NULL, &list_devices, b_audio ); if( !list_devices.size() ) return VLC_EGENERIC; list::iterator iter; for( iter = list_devices.begin(); iter != list_devices.end(); iter++ ) - msg_Dbg( p_access, "found device: %s", iter->c_str() ); + msg_Dbg( p_this, "found device: %s", iter->c_str() ); /* If no device name was specified, pick the 1st one */ if( devicename.size() == 0 ) @@ -929,125 +885,73 @@ static int OpenDevice( access_t *p_access, string devicename, // Use the system device enumerator and class enumerator to find // a capture/preview device, such as a desktop USB video camera. IBaseFilter *p_device_filter = - FindCaptureDevice( (vlc_object_t *)p_access, &devicename, - NULL, b_audio ); + FindCaptureDevice( p_this, &devicename, 0, b_audio ); if( p_device_filter ) - msg_Dbg( p_access, "using device: %s", devicename.c_str() ); + msg_Dbg( p_this, "using device: %s", devicename.c_str() ); else { - msg_Err( p_access, "can't use device: %s, unsupported device type", + msg_Err( p_this, "can't use device: %s, unsupported device type", devicename.c_str() ); + intf_UserFatal( p_this, false, _("Capturing failed"), + _("VLC cannot use the device \"%s\", because its " + "type is not supported.") ); return VLC_EGENERIC; } - AM_MEDIA_TYPE *mt; + // Retreive acceptable media types supported by device AM_MEDIA_TYPE media_types[MAX_MEDIA_TYPES]; + size_t media_count = + EnumDeviceCaps( p_this, p_device_filter, b_audio ? 0 : p_sys->i_chroma, + p_sys->i_width, p_sys->i_height, + 0, 0, 0, media_types, MAX_MEDIA_TYPES ); - size_t mt_count = EnumDeviceCaps( (vlc_object_t *)p_access, - p_device_filter, p_sys->i_chroma, - p_sys->i_width, p_sys->i_height, - 0, 0, 0, media_types, MAX_MEDIA_TYPES ); + AM_MEDIA_TYPE *mt = NULL; - if( mt_count > 0 ) + if( media_count > 0 ) { - mt = (AM_MEDIA_TYPE *)malloc( sizeof(AM_MEDIA_TYPE)*mt_count ); - - // Order and copy returned media types according to arbitrary - // fourcc priority - for( size_t c=0; c slot_priority ) - { - slot_priority = priority; - slot_copy = d; - } - } - if( slot_copy != c ) - { - mt[c] = media_types[slot_copy]; - media_types[slot_copy] = media_types[c]; - } - else - { - mt[c] = media_types[c]; - } - } - } - else if( ! b_audio ) { - // Use default video media type - AM_MEDIA_TYPE mtr; - VIDEOINFOHEADER vh; - - mtr.majortype = MEDIATYPE_Video; - mtr.subtype = MEDIASUBTYPE_I420; - mtr.bFixedSizeSamples = TRUE; - mtr.bTemporalCompression = FALSE; - mtr.lSampleSize = 0; - mtr.pUnk = NULL; - mtr.formattype = FORMAT_VideoInfo; - mtr.cbFormat = sizeof(vh); - mtr.pbFormat = (BYTE *)&vh; - - memset(&vh, 0, sizeof(vh)); - - vh.bmiHeader.biSize = sizeof(vh.bmiHeader); - vh.bmiHeader.biWidth = p_sys->i_width > 0 ? p_sys->i_width: 320; - vh.bmiHeader.biHeight = p_sys->i_height > 0 ? p_sys->i_height : 240; - vh.bmiHeader.biPlanes = 1; - vh.bmiHeader.biBitCount = 24; - vh.bmiHeader.biCompression = VLC_FOURCC('I','4','2','0'); - vh.bmiHeader.biSizeImage = p_sys->i_width * 24 * p_sys->i_height / 8; - - msg_Warn( p_access, "device %s using built-in video media type", - devicename.c_str() ); + mt = (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * media_count); - mt_count = 1; - mt = (AM_MEDIA_TYPE *)malloc( sizeof(AM_MEDIA_TYPE)*mt_count ); - CopyMediaType(mt, &mtr); + // Order and copy returned media types according to arbitrary + // fourcc priority + for( size_t c = 0; c < media_count; c++ ) + { + int slot_priority = + GetFourCCPriority(GetFourCCFromMediaType(media_types[c])); + size_t slot_copy = c; + for( size_t d = c+1; d < media_count; d++ ) + { + int priority = + GetFourCCPriority(GetFourCCFromMediaType(media_types[d])); + if( priority > slot_priority ) + { + slot_priority = priority; + slot_copy = d; + } + } + if( slot_copy != c ) + { + mt[c] = media_types[slot_copy]; + media_types[slot_copy] = media_types[c]; + } + else + { + mt[c] = media_types[c]; + } + } } else { - // Use default audio media type - AM_MEDIA_TYPE mtr; - WAVEFORMATEX wf; - - mtr.majortype = MEDIATYPE_Audio; - mtr.subtype = MEDIASUBTYPE_PCM; - mtr.bFixedSizeSamples = TRUE; - mtr.bTemporalCompression = FALSE; - mtr.lSampleSize = 0; - mtr.pUnk = NULL; - mtr.formattype = FORMAT_WaveFormatEx; - mtr.cbFormat = sizeof(wf); - mtr.pbFormat = (BYTE *)&wf; - - memset(&wf, 0, sizeof(wf)); - - wf.wFormatTag = WAVE_FORMAT_PCM; - wf.nChannels = 2; - wf.nSamplesPerSec = 44100; - wf.wBitsPerSample = 16; - wf.nBlockAlign = wf.nSamplesPerSec * wf.wBitsPerSample / 8; - wf.nAvgBytesPerSec = wf.nSamplesPerSec * wf.nBlockAlign; - wf.cbSize = 0; - - msg_Warn( p_access, "device %s using built-in audio media type", - devicename.c_str() ); - - mt_count = 1; - mt = (AM_MEDIA_TYPE *)malloc( sizeof(AM_MEDIA_TYPE)*mt_count ); - CopyMediaType(mt, &mtr); + /* capture device */ + msg_Err( p_this, "capture device '%s' does not support required parameters !", devicename.c_str() ); + intf_UserFatal( p_this, false, _("Capturing failed"), + _("The capture device \"%s\" does not support the " + "required parameters."), devicename.c_str() ); + p_device_filter->Release(); + return VLC_EGENERIC; } /* Create and add our capture filter */ CaptureFilter *p_capture_filter = - new CaptureFilter( p_access, mt, mt_count ); + new CaptureFilter( p_this, p_sys, mt, media_count ); p_sys->p_graph->AddFilter( p_capture_filter, 0 ); /* Add the device filter to the graph (seems necessary with VfW before @@ -1055,162 +959,70 @@ static int OpenDevice( access_t *p_access, string devicename, p_sys->p_graph->AddFilter( p_device_filter, 0 ); /* Attempt to connect one of this device's capture output pins */ - msg_Dbg( p_access, "connecting filters" ); - if( ConnectFilters( p_access, p_device_filter, p_capture_filter ) ) + msg_Dbg( p_this, "connecting filters" ); + if( ConnectFilters( p_this, p_sys, p_device_filter, p_capture_filter ) ) { /* Success */ - msg_Dbg( p_access, "filters connected successfully !" ); + msg_Dbg( p_this, "filters connected successfully !" ); dshow_stream_t dshow_stream; - dshow_stream.b_invert = VLC_FALSE; - dshow_stream.b_pts = VLC_FALSE; + dshow_stream.b_pts = false; + dshow_stream.p_es = 0; dshow_stream.mt = p_capture_filter->CustomGetPin()->CustomGetMediaType(); - /* Show properties. Done here so the VLC stream is setup with the - * proper parameters. */ + /* Show Device properties. Done here so the VLC stream is setup with + * the proper parameters. */ vlc_value_t val; - var_Get( p_access, "dshow-config", &val ); - if( val.i_int ) + var_Get( p_this, "dshow-config", &val ); + if( val.b_bool ) { - PropertiesPage( VLC_OBJECT(p_access), p_device_filter, - p_sys->p_capture_graph_builder2, - dshow_stream.mt.majortype == MEDIATYPE_Audio ); + ShowDeviceProperties( p_this, p_sys->p_capture_graph_builder2, + p_device_filter, b_audio ); + } + + ConfigTuner( p_this, p_sys->p_capture_graph_builder2, + p_device_filter ); + + var_Get( p_this, "dshow-tuner", &val ); + if( val.b_bool && dshow_stream.mt.majortype != MEDIATYPE_Stream ) + { + /* FIXME: we do MEDIATYPE_Stream later so we don't do it twice. */ + ShowTunerProperties( p_this, p_sys->p_capture_graph_builder2, + p_device_filter, b_audio ); } dshow_stream.mt = p_capture_filter->CustomGetPin()->CustomGetMediaType(); - dshow_stream.i_fourcc = GetFourCCFromMediaType(dshow_stream.mt); - if( 0 != dshow_stream.i_fourcc ) + dshow_stream.i_fourcc = GetFourCCFromMediaType( dshow_stream.mt ); + if( dshow_stream.i_fourcc ) { if( dshow_stream.mt.majortype == MEDIATYPE_Video ) { dshow_stream.header.video = *(VIDEOINFOHEADER *)dshow_stream.mt.pbFormat; - - int i_height = dshow_stream.header.video.bmiHeader.biHeight; - - /* Check if the image is inverted (bottom to top) */ - if( dshow_stream.i_fourcc == VLC_FOURCC('R','G','B','1') || - dshow_stream.i_fourcc == VLC_FOURCC('R','G','B','4') || - dshow_stream.i_fourcc == VLC_FOURCC('R','G','B','8') || - dshow_stream.i_fourcc == VLC_FOURCC('R','V','1','5') || - dshow_stream.i_fourcc == VLC_FOURCC('R','V','1','6') || - dshow_stream.i_fourcc == VLC_FOURCC('R','V','2','4') || - dshow_stream.i_fourcc == VLC_FOURCC('R','V','3','2') || - dshow_stream.i_fourcc == VLC_FOURCC('R','G','B','A') ) - { - if( i_height > 0 ) dshow_stream.b_invert = VLC_TRUE; - else i_height = - i_height; - } - - /* Check if we are dealing with a DV stream */ - if( dshow_stream.i_fourcc == VLC_FOURCC('d','v','s','l') || - dshow_stream.i_fourcc == VLC_FOURCC('d','v','s','d') || - dshow_stream.i_fourcc == VLC_FOURCC('d','v','h','d') ) - { - p_access->pf_read = ReadCompressed; - if( !p_access->psz_demux || !*p_access->psz_demux ) - { - p_access->psz_demux = strdup( "rawdv" ); - } - p_sys->b_audio = VLC_FALSE; - } - - /* Check if we are dealing with an MPEG video stream */ - if( dshow_stream.i_fourcc == VLC_FOURCC('m','p','2','v') ) - { - p_access->pf_read = ReadCompressed; - if( !p_access->psz_demux || !*p_access->psz_demux ) - { - p_access->psz_demux = "mpgv"; - } - p_sys->b_audio = VLC_FALSE; - } - - /* Add video stream to header */ - p_sys->i_header_size += 20; - p_sys->p_header = (uint8_t *)realloc( p_sys->p_header, - p_sys->i_header_size ); - memcpy( &p_sys->p_header[p_sys->i_header_pos], "vids", 4 ); - memcpy( &p_sys->p_header[p_sys->i_header_pos + 4], - &dshow_stream.i_fourcc, 4 ); - SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 8], - dshow_stream.header.video.bmiHeader.biWidth ); - SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 12], i_height ); - SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 16], 0 ); - p_sys->i_header_pos = p_sys->i_header_size; - - /* Greatly simplifies the reading routine */ - int i_mtu = dshow_stream.header.video.bmiHeader.biWidth * - i_height * 4; - p_sys->i_mtu = __MAX( p_sys->i_mtu, i_mtu ); + msg_Dbg( p_this, "MEDIATYPE_Video" ); + msg_Dbg( p_this, "selected video pin accepts format: %4.4s", + (char *)&dshow_stream.i_fourcc); } - else if( dshow_stream.mt.majortype == MEDIATYPE_Audio ) { dshow_stream.header.audio = *(WAVEFORMATEX *)dshow_stream.mt.pbFormat; - - /* Add audio stream to header */ - p_sys->i_header_size += 20; - p_sys->p_header = (uint8_t *)realloc( p_sys->p_header, - p_sys->i_header_size ); - memcpy( &p_sys->p_header[p_sys->i_header_pos], "auds", 4 ); - memcpy( &p_sys->p_header[p_sys->i_header_pos + 4], - &dshow_stream.i_fourcc, 4 ); - SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 8], - dshow_stream.header.audio.nChannels ); - SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 12], - dshow_stream.header.audio.nSamplesPerSec ); - SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 16], - dshow_stream.header.audio.wBitsPerSample ); - p_sys->i_header_pos = p_sys->i_header_size; - - /* Greatly simplifies the reading routine */ - IAMBufferNegotiation *p_ambuf; - IPin *p_pin; - int i_mtu; - - p_capture_filter->CustomGetPin()->ConnectedTo( &p_pin ); - if( SUCCEEDED( p_pin->QueryInterface( - IID_IAMBufferNegotiation, (void **)&p_ambuf ) ) ) - { - ALLOCATOR_PROPERTIES AllocProp; - memset( &AllocProp, 0, sizeof( ALLOCATOR_PROPERTIES ) ); - p_ambuf->GetAllocatorProperties( &AllocProp ); - p_ambuf->Release(); - i_mtu = AllocProp.cbBuffer; - } - else - { - /* Worst case */ - i_mtu = dshow_stream.header.audio.nSamplesPerSec * - dshow_stream.header.audio.nChannels * - dshow_stream.header.audio.wBitsPerSample / 8; - } - p_pin->Release(); - p_sys->i_mtu = __MAX( p_sys->i_mtu, i_mtu ); + msg_Dbg( p_this, "MEDIATYPE_Audio" ); + msg_Dbg( p_this, "selected audio pin accepts format: %4.4s", + (char *)&dshow_stream.i_fourcc); } - else if( dshow_stream.mt.majortype == MEDIATYPE_Stream ) { - msg_Dbg( p_access, "MEDIATYPE_Stream" ); - - msg_Dbg( p_access, "selected stream pin accepts format: %4.4s", + msg_Dbg( p_this, "MEDIATYPE_Stream" ); + msg_Dbg( p_this, "selected stream pin accepts format: %4.4s", (char *)&dshow_stream.i_fourcc); - - p_sys->b_audio = VLC_FALSE; - p_sys->i_header_size = 0; - p_sys->i_header_pos = 0; - p_sys->i_mtu = 0; - - p_access->pf_read = ReadCompressed; } else { - msg_Dbg( p_access, "unknown stream majortype" ); + msg_Dbg( p_this, "unknown stream majortype" ); goto fail; } @@ -1222,7 +1034,6 @@ static int OpenDevice( access_t *p_access, string devicename, sizeof(dshow_stream_t *) * (p_sys->i_streams + 1) ); p_sys->pp_streams[p_sys->i_streams] = new dshow_stream_t; *p_sys->pp_streams[p_sys->i_streams++] = dshow_stream; - SetDWBE( &p_sys->p_header[4], (uint32_t)p_sys->i_streams ); return VLC_SUCCESS; } @@ -1242,12 +1053,13 @@ static int OpenDevice( access_t *p_access, string devicename, static IBaseFilter * FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, - list *p_listdevices, vlc_bool_t b_audio ) + list *p_listdevices, bool b_audio ) { IBaseFilter *p_base_filter = NULL; IMoniker *p_moniker = NULL; ULONG i_fetched; HRESULT hr; + list devicelist; /* Create the system device enumerator */ ICreateDevEnum *p_dev_enum = NULL; @@ -1303,15 +1115,37 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, p_bag->Release(); if( SUCCEEDED(hr) ) { - int i_convert = ( lstrlenW( var.bstrVal ) + 1 ) * 2; - char *p_buf = (char *)alloca( i_convert ); p_buf[0] = 0; - WideCharToMultiByte( CP_ACP, 0, var.bstrVal, -1, p_buf, - i_convert, NULL, NULL ); + int i_convert = WideCharToMultiByte(CP_ACP, 0, var.bstrVal, + SysStringLen(var.bstrVal), NULL, 0, NULL, NULL); + char *p_buf = (char *)alloca( i_convert+1 ); p_buf[0] = 0; + WideCharToMultiByte( CP_ACP, 0, var.bstrVal, + SysStringLen(var.bstrVal), p_buf, i_convert, NULL, NULL ); SysFreeString(var.bstrVal); + p_buf[i_convert] = '\0'; - if( p_listdevices ) p_listdevices->push_back( p_buf ); + string devname = string(p_buf); + + int dup = 0; + /* find out if this name is already used by a previously found device */ + list::const_iterator iter = devicelist.begin(); + list::const_iterator end = devicelist.end(); + while ( iter != end ) + { + if( 0 == (*iter).compare(0, devname.size(), devname) ) + ++dup; + ++iter; + } + if( dup ) + { + /* we have a duplicate device name, append a sequence number to name + to provive a unique list back to the user */ + char seq[16]; + sprintf(seq, " #%d", dup); + devname.append(seq); + } + devicelist.push_back( devname ); - if( p_devicename && *p_devicename == string(p_buf) ) + if( p_devicename && *p_devicename == devname ) { /* Bind Moniker to a filter object */ hr = p_moniker->BindToObject( 0, 0, IID_IBaseFilter, @@ -1335,6 +1169,11 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, } p_class_enum->Release(); + + if( p_listdevices ) { + devicelist.sort(); + *p_listdevices = devicelist; + } return NULL; } @@ -1349,10 +1188,15 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter, IEnumMediaTypes *p_enummt; size_t mt_count = 0; + LONGLONG i_AvgTimePerFrame = 0; + float r_fps = var_GetFloat( p_this, "dshow-fps" ); + if( r_fps ) + i_AvgTimePerFrame = 10000000000LL/(LONGLONG)(r_fps*1000.0f); + if( FAILED(p_filter->EnumPins( &p_enumpins )) ) { - msg_Dbg( p_this, "EnumDeviceCaps failed: no pin enumeration !"); - return 0; + msg_Dbg( p_this, "EnumDeviceCaps failed: no pin enumeration !"); + return 0; } while( S_OK == p_enumpins->Next( 1, &p_output_pin, NULL ) ) @@ -1387,275 +1231,364 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter, msg_Dbg( p_this, "EnumDeviceCaps: trying pin %S", info.achName ); } - /* Probe pin */ - if( SUCCEEDED( p_output_pin->EnumMediaTypes( &p_enummt ) ) ) + AM_MEDIA_TYPE *p_mt; + + /* + ** Configure pin with a default compatible media if possible + */ + + IAMStreamConfig *pSC; + if( SUCCEEDED(p_output_pin->QueryInterface( IID_IAMStreamConfig, + (void **)&pSC )) ) { - AM_MEDIA_TYPE *p_mt; - while( p_enummt->Next( 1, &p_mt, NULL ) == S_OK ) + int piCount, piSize; + if( SUCCEEDED(pSC->GetNumberOfCapabilities(&piCount, &piSize)) ) { - int i_current_fourcc = GetFourCCFromMediaType(*p_mt); - if( 0 != i_current_fourcc ) + BYTE *pSCC= (BYTE *)CoTaskMemAlloc(piSize); + if( NULL != pSCC ) { - if( p_mt->majortype == MEDIATYPE_Video ) + int i_priority = -1; + for( int i=0; ipbFormat ? - ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biWidth : 0; - int i_current_height = p_mt->pbFormat ? - ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biHeight : 0; - if( i_current_height < 0 ) - i_current_height = -i_current_height; - - msg_Dbg( p_this, "EnumDeviceCaps: input pin " - "accepts chroma: %4.4s, width:%i, height:%i", - (char *)&i_current_fourcc, i_current_width, - i_current_height ); - - if( ( !i_fourcc || i_fourcc == i_current_fourcc ) && - ( !i_width || i_width == i_current_width ) && - ( !i_height || i_height == i_current_height ) && - (mt_count < mt_max) ) + if( SUCCEEDED(pSC->GetStreamCaps(i, &p_mt, pSCC)) ) { - /* Pick match */ - mt[mt_count++] = *p_mt; - } - else - { - FreeMediaType( *p_mt ); - } - } - else if( p_mt->majortype == MEDIATYPE_Audio ) - { - int i_current_channels = - ((WAVEFORMATEX *)p_mt->pbFormat)->nChannels; - int i_current_samplespersec = - ((WAVEFORMATEX *)p_mt->pbFormat)->nSamplesPerSec; - int i_current_bitspersample = - ((WAVEFORMATEX *)p_mt->pbFormat)->wBitsPerSample; - - msg_Dbg( p_this, "EnumDeviceCaps: input pin " - "accepts format: %4.4s, channels:%i, " - "samples/sec:%i bits/sample:%i", - (char *)&i_current_fourcc, i_current_channels, - i_current_samplespersec, i_current_bitspersample); - - if( (!i_channels || i_channels == i_current_channels) && - (!i_samplespersec || - i_samplespersec == i_current_samplespersec) && - (!i_bitspersample || - i_bitspersample == i_current_bitspersample) && - (mt_count < mt_max) ) - { - /* Pick match */ - mt[mt_count++] = *p_mt; + int i_current_fourcc = GetFourCCFromMediaType( *p_mt ); + int i_current_priority = GetFourCCPriority(i_current_fourcc); - /* Pre-Configure the 1st match, Ugly */ - if( 1 == mt_count ) { - /* Setup a few properties like the audio latency */ - IAMBufferNegotiation *p_ambuf; - - if( SUCCEEDED( p_output_pin->QueryInterface( - IID_IAMBufferNegotiation, (void **)&p_ambuf ) ) ) - { - ALLOCATOR_PROPERTIES AllocProp; - AllocProp.cbAlign = -1; - AllocProp.cbBuffer = i_current_channels * - i_current_samplespersec * - i_current_bitspersample / 8 / 10 ; /*100 ms of latency*/ - AllocProp.cbPrefix = -1; - AllocProp.cBuffers = -1; - p_ambuf->SuggestAllocatorProperties( &AllocProp ); - p_ambuf->Release(); - } - } - } - else - { - FreeMediaType( *p_mt ); - } - } - else if( p_mt->majortype == MEDIATYPE_Stream ) - { - if( ( !i_fourcc || i_fourcc == i_current_fourcc ) && - (mt_count < mt_max) ) - { - /* Pick match */ - mt[mt_count++] = *p_mt; - i_fourcc = i_current_fourcc; - } - else - { + if( (i_fourcc && (i_current_fourcc != i_fourcc)) + || (i_priority > i_current_priority) ) + { + // unwanted chroma, try next media type FreeMediaType( *p_mt ); - } - } - else - { - msg_Dbg( p_this, - "EnumDeviceCaps: input pin: unknown format" ); - FreeMediaType( *p_mt ); - } - } - else - { - msg_Dbg( p_this, - "EnumDeviceCaps: input pin: unknown format" ); - FreeMediaType( *p_mt ); - } - CoTaskMemFree( (PVOID)p_mt ); - } - p_enummt->Release(); - } - - p_output_pin->Release(); - } - - p_enumpins->Release(); - return mt_count; -} + CoTaskMemFree( (PVOID)p_mt ); + continue; + } -/***************************************************************************** - * AccessRead: reads from the device. - ***************************************************************************** - * Returns -1 in case of error, 0 in case of EOF, otherwise the number of - * bytes. - *****************************************************************************/ -static int AccessRead( access_t *p_access, uint8_t *p_buffer, int i_len ) -{ - access_sys_t *p_sys = p_access->p_sys; - dshow_stream_t *p_stream = NULL; - byte_t *p_buf_orig = p_buffer; - VLCMediaSample sample; - int i_data_size; - uint8_t *p_data; + if( MEDIATYPE_Video == p_mt->majortype + && FORMAT_VideoInfo == p_mt->formattype ) + { + VIDEO_STREAM_CONFIG_CAPS *pVSCC = reinterpret_cast(pSCC); + VIDEOINFOHEADER *pVih = reinterpret_cast(p_mt->pbFormat); - if( p_sys->i_header_pos ) - { - /* First header of the stream */ - memcpy( p_buffer, p_sys->p_header, p_sys->i_header_size ); - p_buffer += p_sys->i_header_size; - p_sys->i_header_pos = 0; - } + if( i_AvgTimePerFrame ) + { + if( pVSCC->MinFrameInterval > i_AvgTimePerFrame + || i_AvgTimePerFrame > pVSCC->MaxFrameInterval ) + { + // required frame rate not compatible, try next media type + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + continue; + } + pVih->AvgTimePerFrame = i_AvgTimePerFrame; + } - while( 1 ) - { - /* Get new sample/frame from next elementary stream. - * We first loop through all the elementary streams and if all our - * fifos are empty we block until we are signaled some new data has - * arrived. */ - vlc_mutex_lock( &p_sys->lock ); + if( i_width ) + { + if( i_width % pVSCC->OutputGranularityX + || pVSCC->MinOutputSize.cx > i_width + || i_width > pVSCC->MaxOutputSize.cx ) + { + // required width not compatible, try next media type + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + continue; + } + pVih->bmiHeader.biWidth = i_width; + } - int i_stream; - for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) - { - p_stream = p_sys->pp_streams[i_stream]; - if( p_stream->mt.majortype == MEDIATYPE_Audio && - p_stream->p_capture_filter && - p_stream->p_capture_filter->CustomGetPin() - ->CustomGetSample( &sample ) == S_OK ) - { - break; - } - } - if( i_stream == p_sys->i_streams ) - for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) - { - p_stream = p_sys->pp_streams[i_stream]; - if( p_stream->p_capture_filter && - p_stream->p_capture_filter->CustomGetPin() - ->CustomGetSample( &sample ) == S_OK ) - { - break; - } - } - if( i_stream == p_sys->i_streams ) - { - /* No data available. Wait until some data has arrived */ - vlc_cond_wait( &p_sys->wait, &p_sys->lock ); - vlc_mutex_unlock( &p_sys->lock ); - continue; - } + if( i_height ) + { + if( i_height % pVSCC->OutputGranularityY + || pVSCC->MinOutputSize.cy > i_height + || i_height > pVSCC->MaxOutputSize.cy ) + { + // required height not compatible, try next media type + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + continue; + } + pVih->bmiHeader.biHeight = i_height; + } - vlc_mutex_unlock( &p_sys->lock ); + // Set the sample size and image size. + // (Round the image width up to a DWORD boundary.) + p_mt->lSampleSize = pVih->bmiHeader.biSizeImage = + ((pVih->bmiHeader.biWidth + 3) & ~3) * + pVih->bmiHeader.biHeight * (pVih->bmiHeader.biBitCount>>3); - /* - * We got our sample - */ - i_data_size = sample.p_sample->GetActualDataLength(); - sample.p_sample->GetPointer( &p_data ); + // no cropping, use full video input buffer + memset(&(pVih->rcSource), 0, sizeof(RECT)); + memset(&(pVih->rcTarget), 0, sizeof(RECT)); - REFERENCE_TIME i_pts, i_end_date; - HRESULT hr = sample.p_sample->GetTime( &i_pts, &i_end_date ); - if( hr != VFW_S_NO_STOP_TIME && hr != S_OK ) i_pts = 0; + // select this format as default + if( SUCCEEDED( pSC->SetFormat(p_mt) ) ) + { + i_priority = i_current_priority; + if( i_fourcc ) + // no need to check any more media types + i = piCount; + } + } + else if( p_mt->majortype == MEDIATYPE_Audio + && p_mt->formattype == FORMAT_WaveFormatEx ) + { + AUDIO_STREAM_CONFIG_CAPS *pASCC = reinterpret_cast(pSCC); + WAVEFORMATEX *pWfx = reinterpret_cast(p_mt->pbFormat); - if( !i_pts ) - { - if( p_stream->mt.majortype == MEDIATYPE_Video || !p_stream->b_pts ) - { - /* Use our data timestamp */ - i_pts = sample.i_timestamp; - p_stream->b_pts = VLC_TRUE; + if( i_current_fourcc && (WAVE_FORMAT_PCM == pWfx->wFormatTag) ) + { + int val = i_channels; + if( ! val ) + val = 2; + + if( val % pASCC->ChannelsGranularity + || (unsigned int)val < pASCC->MinimumChannels + || (unsigned int)val > pASCC->MaximumChannels ) + { + // required number channels not available, try next media type + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + continue; + } + pWfx->nChannels = val; + + val = i_samplespersec; + if( ! val ) + val = 44100; + + if( val % pASCC->SampleFrequencyGranularity + || (unsigned int)val < pASCC->MinimumSampleFrequency + || (unsigned int)val > pASCC->MaximumSampleFrequency ) + { + // required sampling rate not available, try next media type + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + continue; + } + pWfx->nSamplesPerSec = val; + + val = i_bitspersample; + if( ! val ) + { + if( VLC_FOURCC('f', 'l', '3', '2') == i_current_fourcc ) + val = 32; + else + val = 16; + } + + if( val % pASCC->BitsPerSampleGranularity + || (unsigned int)val < pASCC->MinimumBitsPerSample + || (unsigned int)val > pASCC->MaximumBitsPerSample ) + { + // required sample size not available, try next media type + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + continue; + } + + pWfx->wBitsPerSample = val; + pWfx->nBlockAlign = (pWfx->wBitsPerSample * pWfx->nChannels)/8; + pWfx->nAvgBytesPerSec = pWfx->nSamplesPerSec * pWfx->nBlockAlign; + + // select this format as default + if( SUCCEEDED( pSC->SetFormat(p_mt) ) ) + { + i_priority = i_current_priority; + } + } + } + FreeMediaType( *p_mt ); + CoTaskMemFree( (PVOID)p_mt ); + } + } + CoTaskMemFree( (LPVOID)pSCC ); + if( i_priority >= 0 ) + msg_Dbg( p_this, "EnumDeviceCaps: input pin default format configured"); + } } + pSC->Release(); } -#if 0 - msg_Dbg( p_access, "Read() stream: %i PTS: "I64Fd, i_stream, i_pts ); -#endif - - /* Create pseudo header */ - SetDWBE( &p_sys->p_header[0], i_stream ); - SetDWBE( &p_sys->p_header[4], i_data_size ); - SetQWBE( &p_sys->p_header[8], i_pts / 10 ); - -#if 0 - msg_Info( p_access, "access read %i data_size %i", i_len, i_data_size ); -#endif - - /* First copy header */ - memcpy( p_buffer, p_sys->p_header, 16 /* header size */ ); - p_buffer += 16 /* header size */; + /* + ** Probe pin for available medias (may be a previously configured one) + */ - /* Then copy stream data if any */ - if( !p_stream->b_invert ) + if( FAILED( p_output_pin->EnumMediaTypes( &p_enummt ) ) ) { - p_access->p_vlc->pf_memcpy( p_buffer, p_data, i_data_size ); - p_buffer += i_data_size; + p_output_pin->Release(); + continue; } - else - { - int i_width = p_stream->header.video.bmiHeader.biWidth; - int i_height = p_stream->header.video.bmiHeader.biHeight; - if( i_height < 0 ) i_height = - i_height; - switch( p_stream->i_fourcc ) + while( p_enummt->Next( 1, &p_mt, NULL ) == S_OK ) + { + int i_current_fourcc = GetFourCCFromMediaType( *p_mt ); + if( i_current_fourcc && p_mt->majortype == MEDIATYPE_Video + && p_mt->formattype == FORMAT_VideoInfo ) { - case VLC_FOURCC( 'R', 'V', '1', '5' ): - case VLC_FOURCC( 'R', 'V', '1', '6' ): - i_width *= 2; - break; - case VLC_FOURCC( 'R', 'V', '2', '4' ): - i_width *= 3; - break; - case VLC_FOURCC( 'R', 'V', '3', '2' ): - case VLC_FOURCC( 'R', 'G', 'B', 'A' ): - i_width *= 4; - break; + int i_current_width = ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biWidth; + int i_current_height = ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biHeight; + LONGLONG i_current_atpf = ((VIDEOINFOHEADER *)p_mt->pbFormat)->AvgTimePerFrame; + + if( i_current_height < 0 ) + i_current_height = -i_current_height; + + msg_Dbg( p_this, "EnumDeviceCaps: input pin " + "accepts chroma: %4.4s, width:%i, height:%i, fps:%f", + (char *)&i_current_fourcc, i_current_width, + i_current_height, (10000000.0f/((float)i_current_atpf)) ); + + if( ( !i_fourcc || i_fourcc == i_current_fourcc ) && + ( !i_width || i_width == i_current_width ) && + ( !i_height || i_height == i_current_height ) && + ( !i_AvgTimePerFrame || i_AvgTimePerFrame == i_current_atpf ) && + mt_count < mt_max ) + { + /* Pick match */ + mt[mt_count++] = *p_mt; + } + else FreeMediaType( *p_mt ); } + else if( i_current_fourcc && p_mt->majortype == MEDIATYPE_Audio + && p_mt->formattype == FORMAT_WaveFormatEx) + { + int i_current_channels = + ((WAVEFORMATEX *)p_mt->pbFormat)->nChannels; + int i_current_samplespersec = + ((WAVEFORMATEX *)p_mt->pbFormat)->nSamplesPerSec; + int i_current_bitspersample = + ((WAVEFORMATEX *)p_mt->pbFormat)->wBitsPerSample; + + msg_Dbg( p_this, "EnumDeviceCaps: input pin " + "accepts format: %4.4s, channels:%i, " + "samples/sec:%i bits/sample:%i", + (char *)&i_current_fourcc, i_current_channels, + i_current_samplespersec, i_current_bitspersample); + + if( (!i_channels || i_channels == i_current_channels) && + (!i_samplespersec || + i_samplespersec == i_current_samplespersec) && + (!i_bitspersample || + i_bitspersample == i_current_bitspersample) && + mt_count < mt_max ) + { + /* Pick match */ + mt[mt_count++] = *p_mt; - for( int i = i_height - 1; i >= 0; i-- ) + /* Setup a few properties like the audio latency */ + IAMBufferNegotiation *p_ambuf; + if( SUCCEEDED( p_output_pin->QueryInterface( + IID_IAMBufferNegotiation, (void **)&p_ambuf ) ) ) + { + ALLOCATOR_PROPERTIES AllocProp; + AllocProp.cbAlign = -1; + + /* 100 ms of latency */ + AllocProp.cbBuffer = i_current_channels * + i_current_samplespersec * + i_current_bitspersample / 8 / 10; + + AllocProp.cbPrefix = -1; + AllocProp.cBuffers = -1; + p_ambuf->SuggestAllocatorProperties( &AllocProp ); + p_ambuf->Release(); + } + } + else FreeMediaType( *p_mt ); + } + else if( i_current_fourcc && p_mt->majortype == MEDIATYPE_Stream ) { - p_access->p_vlc->pf_memcpy( p_buffer, - &p_data[i * i_width], i_width ); + msg_Dbg( p_this, "EnumDeviceCaps: input pin " + "accepts stream format: %4.4s", + (char *)&i_current_fourcc ); - p_buffer += i_width; + if( ( !i_fourcc || i_fourcc == i_current_fourcc ) && + mt_count < mt_max ) + { + /* Pick match */ + mt[mt_count++] = *p_mt; + i_fourcc = i_current_fourcc; + } + else FreeMediaType( *p_mt ); + } + else + { + char *psz_type = "unknown"; + if( p_mt->majortype == MEDIATYPE_Video ) psz_type = "video"; + if( p_mt->majortype == MEDIATYPE_Audio ) psz_type = "audio"; + if( p_mt->majortype == MEDIATYPE_Stream ) psz_type = "stream"; + msg_Dbg( p_this, "EnumDeviceCaps: input pin media: unsupported format " + "(%s %4.4s)", psz_type, (char *)&p_mt->subtype ); + + FreeMediaType( *p_mt ); } + CoTaskMemFree( (PVOID)p_mt ); } - sample.p_sample->Release(); + if( !mt_count && p_enummt->Reset() == S_OK ) + { + // VLC did not find any supported MEDIATYPE for this output pin. + // However the graph builder might insert converter filters in + // the graph if we use a different codec in VLC filter input pin. + // however, in order to avoid nasty surprises, make use of this + // facility only for known unsupported codecs. - /* The caller got what he wanted */ - return p_buffer - p_buf_orig; + while( !mt_count && p_enummt->Next( 1, &p_mt, NULL ) == S_OK ) + { + // the first four bytes of subtype GUID contains the codec FOURCC + const char *pfcc = (char *)&p_mt->subtype; + int i_current_fourcc = VLC_FOURCC(pfcc[0], pfcc[1], pfcc[2], pfcc[3]); + if( VLC_FOURCC('H','C','W','2') == i_current_fourcc + && p_mt->majortype == MEDIATYPE_Video ) + { + // output format for 'Hauppauge WinTV PVR PCI II Capture' + // try I420 as an input format + i_current_fourcc = VLC_FOURCC('I','4','2','0'); + if( !i_fourcc || i_fourcc == i_current_fourcc ) + { + // return alternative media type + AM_MEDIA_TYPE mtr; + VIDEOINFOHEADER vh; + + mtr.majortype = MEDIATYPE_Video; + mtr.subtype = MEDIASUBTYPE_I420; + mtr.bFixedSizeSamples = TRUE; + mtr.bTemporalCompression = FALSE; + mtr.pUnk = NULL; + mtr.formattype = FORMAT_VideoInfo; + mtr.cbFormat = sizeof(vh); + mtr.pbFormat = (BYTE *)&vh; + + memset(&vh, 0, sizeof(vh)); + + vh.bmiHeader.biSize = sizeof(vh.bmiHeader); + vh.bmiHeader.biWidth = i_width > 0 ? i_width : + ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biWidth; + vh.bmiHeader.biHeight = i_height > 0 ? i_height : + ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biHeight; + vh.bmiHeader.biPlanes = 3; + vh.bmiHeader.biBitCount = 12; + vh.bmiHeader.biCompression = VLC_FOURCC('I','4','2','0'); + vh.bmiHeader.biSizeImage = vh.bmiHeader.biWidth * 12 * + vh.bmiHeader.biHeight / 8; + mtr.lSampleSize = vh.bmiHeader.biSizeImage; + + msg_Dbg( p_this, "EnumDeviceCaps: input pin media: using 'I420' in place of unsupported format 'HCW2'"); + + if( SUCCEEDED(CopyMediaType(mt+mt_count, &mtr)) ) + ++mt_count; + } + } + FreeMediaType( *p_mt ); + } + } + + p_enummt->Release(); + p_output_pin->Release(); } - return 0; /* never reached */ + p_enumpins->Release(); + return mt_count; } /***************************************************************************** @@ -1664,13 +1597,11 @@ static int AccessRead( access_t *p_access, uint8_t *p_buffer, int i_len ) * Returns -1 in case of error, 0 in case of EOF, otherwise the number of * bytes. *****************************************************************************/ -static int ReadCompressed( access_t *p_access, uint8_t *p_buffer, int i_len ) +static block_t *ReadCompressed( access_t *p_access ) { access_sys_t *p_sys = p_access->p_sys; dshow_stream_t *p_stream = NULL; - VLCMediaSample sample; - int i_data_size; - uint8_t *p_data; + VLCMediaSample sample; /* Read 1 DV/MPEG frame (they contain the video and audio data) */ @@ -1699,186 +1630,161 @@ static int ReadCompressed( access_t *p_access, uint8_t *p_buffer, int i_len ) /* * We got our sample */ - i_data_size = sample.p_sample->GetActualDataLength(); - sample.p_sample->GetPointer( &p_data ); - -#if 0 - msg_Info( p_access, "access read %i data_size %i", i_len, i_data_size ); -#endif - i_data_size = __MIN( i_data_size, (int)i_len ); + block_t *p_block; + uint8_t *p_data; + int i_data_size = sample.p_sample->GetActualDataLength(); - p_access->p_vlc->pf_memcpy( p_buffer, p_data, i_data_size ); + if( !i_data_size || !(p_block = block_New( p_access, i_data_size )) ) + { + sample.p_sample->Release(); + continue; + } + sample.p_sample->GetPointer( &p_data ); + p_access->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size ); sample.p_sample->Release(); /* The caller got what he wanted */ - return i_data_size; + return p_block; } return 0; /* never reached */ } -/***************************************************************************** - * Demux: local prototypes - *****************************************************************************/ -struct demux_sys_t -{ - int i_es; - es_out_id_t **es; -}; - -static int Demux ( demux_t * ); -static int DemuxControl( demux_t *, int, va_list ); - /**************************************************************************** - * DemuxOpen: + * Demux: ****************************************************************************/ -static int DemuxOpen( vlc_object_t *p_this ) +static int Demux( demux_t *p_demux ) { - demux_t *p_demux = (demux_t *)p_this; - demux_sys_t *p_sys; + access_sys_t *p_sys = (access_sys_t *)p_demux->p_sys; + dshow_stream_t *p_stream = NULL; + VLCMediaSample sample; + int i_data_size, i_stream; + uint8_t *p_data; + block_t *p_block; - uint8_t *p_peek; - int i_es; - int i; + vlc_mutex_lock( &p_sys->lock ); - /* a little test to see if it's a dshow stream */ - if( stream_Peek( p_demux->s, &p_peek, 8 ) < 8 ) + /* Try to grab an audio sample (audio has a higher priority) */ + for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) { - msg_Warn( p_demux, "dshow plugin discarded (cannot peek)" ); - return VLC_EGENERIC; + p_stream = p_sys->pp_streams[i_stream]; + if( p_stream->mt.majortype == MEDIATYPE_Audio && + p_stream->p_capture_filter && + p_stream->p_capture_filter->CustomGetPin() + ->CustomGetSample( &sample ) == S_OK ) + { + break; + } } - - if( memcmp( p_peek, ".dsh", 4 ) || - ( i_es = GetDWBE( &p_peek[4] ) ) <= 0 ) + /* Try to grab a video sample */ + if( i_stream == p_sys->i_streams ) { - msg_Warn( p_demux, "dshow plugin discarded (not a valid stream)" ); - return VLC_EGENERIC; + for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ ) + { + p_stream = p_sys->pp_streams[i_stream]; + if( p_stream->p_capture_filter && + p_stream->p_capture_filter->CustomGetPin() + ->CustomGetSample( &sample ) == S_OK ) + { + break; + } + } } - p_demux->pf_demux = Demux; - p_demux->pf_control = DemuxControl; - p_demux->p_sys = p_sys = (demux_sys_t *)malloc( sizeof( demux_sys_t ) ); - p_sys->i_es = 0; - p_sys->es = NULL; + vlc_mutex_unlock( &p_sys->lock ); - if( stream_Peek( p_demux->s, &p_peek, 8 + 20 * i_es ) < 8 + 20 * i_es ) + if( i_stream == p_sys->i_streams ) { - msg_Err( p_demux, "dshow plugin discarded (cannot peek)" ); - return VLC_EGENERIC; + /* Sleep so we do not consume all the cpu, 10ms seems + * like a good value (100fps) */ + msleep( 10000 ); + return 1; } - p_peek += 8; - - for( i = 0; i < i_es; i++ ) - { - es_format_t fmt; - if( !memcmp( p_peek, "auds", 4 ) ) - { - es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( p_peek[4], p_peek[5], - p_peek[6], p_peek[7] ) ); - - fmt.audio.i_channels = GetDWBE( &p_peek[8] ); - fmt.audio.i_rate = GetDWBE( &p_peek[12] ); - fmt.audio.i_bitspersample = GetDWBE( &p_peek[16] ); - fmt.audio.i_blockalign = fmt.audio.i_channels * - fmt.audio.i_bitspersample / 8; - fmt.i_bitrate = fmt.audio.i_channels * - fmt.audio.i_rate * - fmt.audio.i_bitspersample; + /* + * We got our sample + */ + i_data_size = sample.p_sample->GetActualDataLength(); + sample.p_sample->GetPointer( &p_data ); - msg_Dbg( p_demux, "new audio es %d channels %dHz", - fmt.audio.i_channels, fmt.audio.i_rate ); + REFERENCE_TIME i_pts, i_end_date; + HRESULT hr = sample.p_sample->GetTime( &i_pts, &i_end_date ); + if( hr != VFW_S_NO_STOP_TIME && hr != S_OK ) i_pts = 0; - p_sys->es = (es_out_id_t **)realloc( p_sys->es, - sizeof(es_out_id_t *) * (p_sys->i_es + 1) ); - p_sys->es[p_sys->i_es++] = es_out_Add( p_demux->out, &fmt ); - } - else if( !memcmp( p_peek, "vids", 4 ) ) + if( !i_pts ) + { + if( p_stream->mt.majortype == MEDIATYPE_Video || !p_stream->b_pts ) { - es_format_Init( &fmt, VIDEO_ES, VLC_FOURCC( p_peek[4], p_peek[5], - p_peek[6], p_peek[7] ) ); - fmt.video.i_width = GetDWBE( &p_peek[8] ); - fmt.video.i_height = GetDWBE( &p_peek[12] ); - - msg_Dbg( p_demux, "added new video es %4.4s %dx%d", - (char*)&fmt.i_codec, - fmt.video.i_width, fmt.video.i_height ); - - p_sys->es = (es_out_id_t **)realloc( p_sys->es, - sizeof(es_out_id_t *) * (p_sys->i_es + 1) ); - p_sys->es[p_sys->i_es++] = es_out_Add( p_demux->out, &fmt ); + /* Use our data timestamp */ + i_pts = sample.i_timestamp; + p_stream->b_pts = true; } - - p_peek += 20; } - /* Skip header */ - stream_Read( p_demux->s, NULL, 8 + 20 * i_es ); + i_pts /= 10; /* Dshow works with 100 nano-seconds resolution */ - return VLC_SUCCESS; -} +#if 0 + msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: "I64Fd, + i_stream, i_data_size, i_pts ); +#endif -/**************************************************************************** - * DemuxClose: - ****************************************************************************/ -static void DemuxClose( vlc_object_t *p_this ) -{ - demux_t *p_demux = (demux_t *)p_this; - demux_sys_t *p_sys = p_demux->p_sys; + p_block = block_New( p_demux, i_data_size ); + p_demux->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size ); + p_block->i_pts = p_block->i_dts = i_pts; + sample.p_sample->Release(); - if( p_sys->i_es > 0 ) - { - free( p_sys->es ); - } - free( p_sys ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_pts > 0 ? i_pts : 0 ); + es_out_Send( p_demux->out, p_stream->p_es, p_block ); + + return 1; } -/**************************************************************************** - * Demux: - ****************************************************************************/ -static int Demux( demux_t *p_demux ) +/***************************************************************************** + * AccessControl: + *****************************************************************************/ +static int AccessControl( access_t *p_access, int i_query, va_list args ) { - demux_sys_t *p_sys = p_demux->p_sys; - block_t *p_block; - - int i_es; - int i_size; - - uint8_t *p_peek; - mtime_t i_pts; - - if( stream_Peek( p_demux->s, &p_peek, 16 ) < 16 ) - { - msg_Warn( p_demux, "cannot peek (EOF ?)" ); - return 0; - } + bool *pb_bool; + int *pi_int; + int64_t *pi_64; - i_es = GetDWBE( &p_peek[0] ); - if( i_es < 0 || i_es >= p_sys->i_es ) + switch( i_query ) { - msg_Err( p_demux, "cannot find ES" ); - return -1; - } - - i_size = GetDWBE( &p_peek[4] ); - i_pts = GetQWBE( &p_peek[8] ); + /* */ + case ACCESS_CAN_SEEK: + case ACCESS_CAN_FASTSEEK: + case ACCESS_CAN_PAUSE: + case ACCESS_CAN_CONTROL_PACE: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = false; + break; + + /* */ + case ACCESS_GET_MTU: + pi_int = (int*)va_arg( args, int * ); + *pi_int = 0; + break; + + case ACCESS_GET_PTS_DELAY: + pi_64 = (int64_t*)va_arg( args, int64_t * ); + *pi_64 = (int64_t)var_GetInteger( p_access, "dshow-caching" ) * 1000; + break; + + /* */ + case ACCESS_SET_PAUSE_STATE: + case ACCESS_GET_TITLE_INFO: + case ACCESS_SET_TITLE: + case ACCESS_SET_SEEKPOINT: + case ACCESS_SET_PRIVATE_ID_STATE: + return VLC_EGENERIC; - if( ( p_block = stream_Block( p_demux->s, 16 + i_size ) ) == NULL ) - { - msg_Warn( p_demux, "cannot read data" ); - return 0; + default: + msg_Warn( p_access, "unimplemented query in control" ); + return VLC_EGENERIC; } - p_block->p_buffer += 16; - p_block->i_buffer -= 16; - - p_block->i_dts = p_block->i_pts = i_pts; - - es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_pts > 0 ? i_pts : 0 ); - es_out_Send( p_demux->out, p_sys->es[i_es], p_block ); - - return 1; + return VLC_SUCCESS; } /**************************************************************************** @@ -1886,7 +1792,36 @@ static int Demux( demux_t *p_demux ) ****************************************************************************/ static int DemuxControl( demux_t *p_demux, int i_query, va_list args ) { - return demux2_vaControlHelper( p_demux->s, 0, -1, 0, 1, i_query, args ); + bool *pb; + int64_t *pi64; + + switch( i_query ) + { + /* Special for access_demux */ + case DEMUX_CAN_PAUSE: + case DEMUX_CAN_SEEK: + case DEMUX_SET_PAUSE_STATE: + case DEMUX_CAN_CONTROL_PACE: + pb = (bool*)va_arg( args, bool * ); + *pb = false; + return VLC_SUCCESS; + + case DEMUX_GET_PTS_DELAY: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = (int64_t)var_GetInteger( p_demux, "dshow-caching" ) * 1000; + return VLC_SUCCESS; + + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = mdate(); + return VLC_SUCCESS; + + /* TODO implement others */ + default: + return VLC_EGENERIC; + } + + return VLC_EGENERIC; } /***************************************************************************** @@ -1896,13 +1831,13 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, vlc_value_t newval, vlc_value_t oldval, void * ) { module_config_t *p_item; - vlc_bool_t b_audio = VLC_FALSE; + bool b_audio = false; int i; p_item = config_FindConfig( p_this, psz_name ); if( !p_item ) return VLC_SUCCESS; - if( !strcmp( psz_name, "dshow-adev" ) ) b_audio = VLC_TRUE; + if( !strcmp( psz_name, "dshow-adev" ) ) b_audio = true; /* Clear-up the current list */ if( p_item->i_list ) @@ -1910,8 +1845,8 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, /* Keep the 2 first entries */ for( i = 2; i < p_item->i_list; i++ ) { - free( p_item->ppsz_list[i] ); - free( p_item->ppsz_list_text[i] ); + free( const_cast(p_item->ppsz_list[i]) ); + free( const_cast(p_item->ppsz_list_text[i]) ); } /* TODO: Remove when no more needed */ p_item->ppsz_list[i] = NULL; @@ -1951,7 +1886,7 @@ static int FindDevicesCallback( vlc_object_t *p_this, char const *psz_name, p_item->ppsz_list_text[i] = NULL; /* Signal change to the interface */ - p_item->b_dirty = VLC_TRUE; + p_item->b_dirty = true; return VLC_SUCCESS; } @@ -1960,7 +1895,7 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name, vlc_value_t newval, vlc_value_t oldval, void * ) { module_config_t *p_item; - vlc_bool_t b_audio = VLC_FALSE; + bool b_audio = false; /* Initialize OLE/COM */ CoInitialize( 0 ); @@ -1968,7 +1903,7 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name, p_item = config_FindConfig( p_this, psz_name ); if( !p_item ) return VLC_SUCCESS; - if( !strcmp( psz_name, "dshow-adev" ) ) b_audio = VLC_TRUE; + if( !strcmp( psz_name, "dshow-adev" ) ) b_audio = true; string devicename; @@ -1991,7 +1926,8 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name, FindCaptureDevice( p_this, &devicename, NULL, b_audio ); if( p_device_filter ) { - PropertiesPage( p_this, p_device_filter, NULL, b_audio ); + ShowPropertyPage( p_device_filter ); + p_device_filter->Release(); } else { @@ -2008,76 +1944,61 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name, return VLC_SUCCESS; } -static void ShowPropertyPage( IUnknown *obj, CAUUID *cauuid ) +/***************************************************************************** + * Properties + *****************************************************************************/ +static void ShowPropertyPage( IUnknown *obj ) { - if( cauuid->cElems > 0 ) + ISpecifyPropertyPages *p_spec; + CAUUID cauuid; + + HRESULT hr = obj->QueryInterface( IID_ISpecifyPropertyPages, + (void **)&p_spec ); + if( FAILED(hr) ) return; + + if( SUCCEEDED(p_spec->GetPages( &cauuid )) ) { - HWND hwnd_desktop = ::GetDesktopWindow(); + if( cauuid.cElems > 0 ) + { + HWND hwnd_desktop = ::GetDesktopWindow(); - OleCreatePropertyFrame( hwnd_desktop, 30, 30, NULL, 1, &obj, - cauuid->cElems, cauuid->pElems, 0, 0, NULL ); + OleCreatePropertyFrame( hwnd_desktop, 30, 30, NULL, 1, &obj, + cauuid.cElems, cauuid.pElems, 0, 0, NULL ); - CoTaskMemFree( cauuid->pElems ); + CoTaskMemFree( cauuid.pElems ); + } + p_spec->Release(); } } -static void PropertiesPage( vlc_object_t *p_this, IBaseFilter *p_device_filter, - ICaptureGraphBuilder2 *p_capture_graph, - vlc_bool_t b_audio ) +static void ShowDeviceProperties( vlc_object_t *p_this, + ICaptureGraphBuilder2 *p_graph, + IBaseFilter *p_device_filter, + bool b_audio ) { - CAUUID cauuid; - - msg_Dbg( p_this, "Configuring Device Properties" ); + HRESULT hr; + msg_Dbg( p_this, "configuring Device Properties" ); /* * Video or audio capture filter page */ - ISpecifyPropertyPages *p_spec; - - HRESULT hr = p_device_filter->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - if( SUCCEEDED(p_spec->GetPages( &cauuid )) ) - { - ShowPropertyPage( p_device_filter, &cauuid ); - } - p_spec->Release(); - } - - msg_Dbg( p_this, "looking for WDM Configuration Pages" ); - - if( p_capture_graph ) - msg_Dbg( p_this, "got capture graph for WDM Configuration Pages" ); + ShowPropertyPage( p_device_filter ); /* * Audio capture pin */ - if( p_capture_graph && b_audio ) + if( p_graph && b_audio ) { IAMStreamConfig *p_SC; - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Audio, p_device_filter, - IID_IAMStreamConfig, - (void **)&p_SC ); + msg_Dbg( p_this, "showing WDM Audio Configuration Pages" ); + + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Audio, p_device_filter, + IID_IAMStreamConfig, (void **)&p_SC ); if( SUCCEEDED(hr) ) { - hr = p_SC->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - hr = p_spec->GetPages( &cauuid ); - if( SUCCEEDED(hr) ) - { - for( unsigned int c = 0; c < cauuid.cElems; c++ ) - { - ShowPropertyPage( p_SC, &cauuid ); - } - CoTaskMemFree( cauuid.pElems ); - } - p_spec->Release(); - } + ShowPropertyPage(p_SC); p_SC->Release(); } @@ -2085,20 +2006,12 @@ static void PropertiesPage( vlc_object_t *p_this, IBaseFilter *p_device_filter, * TV Audio filter */ IAMTVAudio *p_TVA; - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + HRESULT hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Audio, p_device_filter, IID_IAMTVAudio, (void **)&p_TVA ); if( SUCCEEDED(hr) ) { - hr = p_TVA->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - if( SUCCEEDED( p_spec->GetPages( &cauuid ) ) ) - ShowPropertyPage(p_TVA, &cauuid); - - p_spec->Release(); - } + ShowPropertyPage(p_TVA); p_TVA->Release(); } } @@ -2106,131 +2019,126 @@ static void PropertiesPage( vlc_object_t *p_this, IBaseFilter *p_device_filter, /* * Video capture pin */ - if( p_capture_graph && !b_audio ) + if( p_graph && !b_audio ) { IAMStreamConfig *p_SC; - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Interleaved, - p_device_filter, - IID_IAMStreamConfig, - (void **)&p_SC ); + msg_Dbg( p_this, "showing WDM Video Configuration Pages" ); + + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Interleaved, p_device_filter, + IID_IAMStreamConfig, (void **)&p_SC ); + if( FAILED(hr) ) + { + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Video, p_device_filter, + IID_IAMStreamConfig, (void **)&p_SC ); + } + if( FAILED(hr) ) { - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Video, - p_device_filter, - IID_IAMStreamConfig, - (void **)&p_SC ); + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Stream, p_device_filter, + IID_IAMStreamConfig, (void **)&p_SC ); } if( SUCCEEDED(hr) ) { - hr = p_SC->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - if( SUCCEEDED( p_spec->GetPages(&cauuid) ) ) - { - ShowPropertyPage(p_SC, &cauuid); - } - p_spec->Release(); - } + ShowPropertyPage(p_SC); p_SC->Release(); } + } +} - /* - * Video crossbar, and a possible second crossbar - */ - IAMCrossbar *p_X, *p_X2; - IBaseFilter *p_XF; +static void ShowTunerProperties( vlc_object_t *p_this, + ICaptureGraphBuilder2 *p_graph, + IBaseFilter *p_device_filter, + bool b_audio ) +{ + HRESULT hr; + msg_Dbg( p_this, "configuring Tuner Properties" ); - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Interleaved, - p_device_filter, - IID_IAMCrossbar, (void **)&p_X ); - if( FAILED(hr) ) - { - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Video, - p_device_filter, - IID_IAMCrossbar, - (void **)&p_X ); - } + if( !p_graph || b_audio ) return; - if( SUCCEEDED(hr) ) - { - hr = p_X->QueryInterface( IID_IBaseFilter, (void **)&p_XF ); - if( SUCCEEDED(hr) ) - { - hr = p_X->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - hr = p_spec->GetPages(&cauuid); - if( hr == S_OK && cauuid.cElems > 0 ) - { - ShowPropertyPage( p_X, &cauuid ); - } - p_spec->Release(); - } + IAMTVTuner *p_TV; + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Interleaved, p_device_filter, + IID_IAMTVTuner, (void **)&p_TV ); + if( FAILED(hr) ) + { + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Video, p_device_filter, + IID_IAMTVTuner, (void **)&p_TV ); + } - hr = p_capture_graph->FindInterface( &LOOK_UPSTREAM_ONLY, NULL, - p_XF, IID_IAMCrossbar, - (void **)&p_X2 ); - if( SUCCEEDED(hr) ) - { - hr = p_X2->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - hr = p_spec->GetPages( &cauuid ); - if( SUCCEEDED(hr) ) - { - ShowPropertyPage( p_X2, &cauuid ); - } - p_spec->Release(); - } - p_X2->Release(); - } + if( FAILED(hr) ) + { + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, + &MEDIATYPE_Stream, p_device_filter, + IID_IAMTVTuner, (void **)&p_TV ); + } - p_XF->Release(); - } + if( SUCCEEDED(hr) ) + { + ShowPropertyPage(p_TV); + p_TV->Release(); + } +} - p_X->Release(); - } +static void ConfigTuner( vlc_object_t *p_this, ICaptureGraphBuilder2 *p_graph, + IBaseFilter *p_device_filter ) +{ + int i_channel, i_country, i_input, i_amtuner_mode; + long l_modes = 0; + IAMTVTuner *p_TV; + HRESULT hr; - /* - * TV Tuner - */ - IAMTVTuner *p_TV; - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Interleaved, - p_device_filter, - IID_IAMTVTuner, (void **)&p_TV ); - if( FAILED(hr) ) - { - hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE, - &MEDIATYPE_Video, - p_device_filter, - IID_IAMTVTuner, - (void **)&p_TV ); - } + if( !p_graph ) return; - if( SUCCEEDED(hr) ) - { - hr = p_TV->QueryInterface( IID_ISpecifyPropertyPages, - (void **)&p_spec ); - if( SUCCEEDED(hr) ) - { - hr = p_spec->GetPages(&cauuid); - if( SUCCEEDED(hr) ) - { - ShowPropertyPage(p_TV, &cauuid); - } - p_spec->Release(); - } - p_TV->Release(); - } + i_channel = var_GetInteger( p_this, "dshow-tuner-channel" ); + i_country = var_GetInteger( p_this, "dshow-tuner-country" ); + i_input = var_GetInteger( p_this, "dshow-tuner-input" ); + i_amtuner_mode = var_GetInteger( p_this, "dshow-amtuner-mode" ); + + if( !i_channel && !i_country && !i_input ) return; /* Nothing to do */ + + msg_Dbg( p_this, "tuner config: channel %i, country %i, input type %i", + i_channel, i_country, i_input ); + + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Interleaved, + p_device_filter, IID_IAMTVTuner, + (void **)&p_TV ); + if( FAILED(hr) ) + { + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Video, + p_device_filter, IID_IAMTVTuner, + (void **)&p_TV ); + } + + if( FAILED(hr) ) + { + hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE, &MEDIATYPE_Stream, + p_device_filter, IID_IAMTVTuner, + (void **)&p_TV ); + } + + if( FAILED(hr) ) + { + msg_Dbg( p_this, "couldn't find tuner interface" ); + return; + } + + hr = p_TV->GetAvailableModes( &l_modes ); + if( SUCCEEDED(hr) && (l_modes & i_amtuner_mode) ) + { + hr = p_TV->put_Mode( (AMTunerModeType)i_amtuner_mode ); } + + if( i_input == 1 ) p_TV->put_InputType( 0, TunerInputCable ); + else if( i_input == 2 ) p_TV->put_InputType( 0, TunerInputAntenna ); + + p_TV->put_CountryCode( i_country ); + p_TV->put_Channel( i_channel, AMTUNER_SUBCHAN_NO_TUNE, + AMTUNER_SUBCHAN_NO_TUNE ); + p_TV->Release(); }