X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=modules%2Faccess%2Fdshow%2Fdshow.cpp;h=79c77f642aaba39a94e9363db8a42e3d1455a057;hb=ad77d955a5dc051976d94d6e08ee0f717ec3a938;hp=2ae738d20f70ada1795d6ded57736d1132838920;hpb=fa4bde0b26a6c7a2a617362ea0b17144686e39fe;p=vlc diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 2ae738d20f..79c77f642a 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -38,8 +38,8 @@ #include #include #include -#include -#include +#include +#include #include "common.h" #include "filter.h" @@ -188,64 +188,60 @@ vlc_module_begin () 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, true ); + CACHING_TEXT, CACHING_LONGTEXT, true ) add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, false) - change_string_list( ppsz_vdev, ppsz_vdev_text, FindDevicesCallback ); + 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, false) - change_string_list( ppsz_adev, ppsz_adev_text, FindDevicesCallback ); + 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, false) - add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, - true ) + add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true ) - add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, - true ) + add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, true ) - add_bool( "dshow-config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, - true ) + add_bool( "dshow-config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, true ) - add_bool( "dshow-tuner", false, NULL, TUNER_TEXT, TUNER_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-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT, + true ) - add_integer( "dshow-tuner-country", 0, NULL, COUNTRY_TEXT, - COUNTRY_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, NULL ); + TUNER_INPUT_LONGTEXT, true ) + change_integer_list( pi_tuner_input, ppsz_tuner_input_text, NULL ) 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 ); + VIDEO_IN_LONGTEXT, true ) add_integer( "dshow-video-output", -1, NULL, VIDEO_OUT_TEXT, - VIDEO_OUT_LONGTEXT, true ); + VIDEO_OUT_LONGTEXT, true ) + + add_integer( "dshow-audio-input", -1, NULL, AUDIO_IN_TEXT, + AUDIO_IN_LONGTEXT, true ) add_integer( "dshow-audio-output", -1, NULL, AUDIO_OUT_TEXT, - AUDIO_OUT_LONGTEXT, true ); + 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, NULL ); + AMTUNER_MODE_TEXT, AMTUNER_MODE_LONGTEXT, false) + change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, NULL ) add_integer( "dshow-audio-channels", 0, NULL, AUDIO_CHANNELS_TEXT, - AUDIO_CHANNELS_LONGTEXT, true ); + AUDIO_CHANNELS_LONGTEXT, true ) add_integer( "dshow-audio-samplerate", 0, NULL, AUDIO_SAMPLERATE_TEXT, - AUDIO_SAMPLERATE_LONGTEXT, true ); + AUDIO_SAMPLERATE_LONGTEXT, true ) add_integer( "dshow-audio-bitspersample", 0, NULL, AUDIO_BITSPERSAMPLE_TEXT, - AUDIO_BITSPERSAMPLE_LONGTEXT, true ); + AUDIO_BITSPERSAMPLE_LONGTEXT, true ) add_shortcut( "dshow" ) set_capability( "access_demux", 0 ) @@ -253,6 +249,7 @@ vlc_module_begin () add_submodule () set_description( N_("DirectShow input") ) + add_shortcut( "dshow" ) set_capability( "access", 0 ) set_callbacks( AccessOpen, AccessClose ) @@ -351,22 +348,43 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, /* Get/parse options and open device(s) */ string vdevname, adevname; - int i_width = 0, i_height = 0, i_chroma = 0; - bool b_audio = true; + int i_width = 0, i_height = 0; + vlc_fourcc_t i_chroma = 0; + bool b_use_audio = true; + bool b_use_video = true; + + /* Initialize OLE/COM */ + CoInitialize( 0 ); 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 ) + { + msg_Dbg( p_this, "dshow-vdev: %s", val.psz_string ) ; + /* skip none device */ + if ( strncasecmp( val.psz_string, "none", 4 ) != 0 ) + vdevname = string( val.psz_string ); + else + b_use_video = false ; + } free( val.psz_string ); 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 ) + { + msg_Dbg( p_this, "dshow-adev: %s", val.psz_string ) ; + /* skip none device */ + if ( strncasecmp( val.psz_string, "none", 4 ) != 0 ) + adevname = string( val.psz_string ); + else + b_use_audio = false ; + } free( val.psz_string ); - static struct {char *psz_size; int i_width; int i_height;} size_table[] = + static struct {const 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 }, @@ -401,12 +419,9 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, 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; - } + + i_chroma = vlc_fourcc_GetCodecFromString( UNKNOWN_ES, val.psz_string ); + p_sys->b_chroma = i_chroma != 0; free( val.psz_string ); var_Create( p_this, "dshow-fps", VLC_VAR_FLOAT | VLC_VAR_DOINHERIT ); @@ -427,9 +442,6 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, 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 = NULL; @@ -441,17 +453,30 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, p_sys->p_capture_graph_builder2 = NULL; p_sys->p_control = NULL; + /* Build directshow graph */ + CreateDirectShowGraph( p_sys ); + vlc_mutex_init( &p_sys->lock ); vlc_cond_init( &p_sys->wait ); - /* Build directshow graph */ - CreateDirectShowGraph( p_sys ); + if( !b_use_video && !b_use_audio ) + { + dialog_Fatal( p_this, _("Capture failed"), + _("No video or audio device selected.") ); + return VLC_EGENERIC ; + } - if( OpenDevice( p_this, p_sys, vdevname, 0 ) != VLC_SUCCESS ) + if( !b_use_video ) + msg_Dbg( p_this, "skipping video device" ) ; + bool b_err_video = false ; + + if( b_use_video && OpenDevice( p_this, p_sys, vdevname, 0 ) != VLC_SUCCESS ) { - msg_Err( p_this, "can't open video"); + msg_Err( p_this, "can't open video device"); + b_err_video = true ; } - else + + if ( b_use_video && !b_err_video ) { /* Check if we can handle the demuxing ourselves or need to spawn * a demuxer module */ @@ -460,13 +485,11 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, 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') || + p_stream->i_fourcc == VLC_CODEC_DV || /* Raw MPEG video stream */ - p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') ) + p_stream->i_fourcc == VLC_CODEC_MPGV ) { - b_audio = false; + b_use_audio = false; if( b_access_demux ) { @@ -478,7 +501,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, if( p_stream->mt.majortype == MEDIATYPE_Stream ) { - b_audio = false; + b_use_audio = false; if( b_access_demux ) { @@ -497,9 +520,26 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, } } - if( b_audio && OpenDevice( p_this, p_sys, adevname, 1 ) != VLC_SUCCESS ) + if( !b_use_audio ) + msg_Dbg( p_this, "skipping audio device") ; + + bool b_err_audio = false ; + + if( b_use_audio && OpenDevice( p_this, p_sys, adevname, 1 ) != VLC_SUCCESS ) + { + msg_Err( p_this, "can't open audio device"); + b_err_audio = true ; + } + + if( ( b_use_video && b_err_video && b_use_audio && b_err_audio ) || + ( !b_use_video && b_use_audio && b_err_audio ) || + ( b_use_video && !b_use_audio && b_err_video ) ) { - msg_Err( p_this, "can't open audio"); + msg_Err( p_this, "FATAL: could not open ANY device" ) ; + dialog_Fatal( p_this, _("Capture failed"), + _("VLC cannot open ANY capture device." + "Check the error log for details.") ); + return VLC_EGENERIC ; } for( i = p_sys->i_crossbar_route_depth-1; i >= 0 ; --i ) @@ -540,6 +580,9 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys, } } } + else + msg_Err( p_this, "crossbar at depth %d could not route video " + "output %ld to input %ld", i, VideoOutputIndex, VideoInputIndex ); } /* @@ -620,7 +663,7 @@ static int DemuxOpen( vlc_object_t *p_this ) } /* Setup rgb mask for RGB formats */ - if( p_stream->i_fourcc == VLC_FOURCC('R','V','2','4') ) + if( p_stream->i_fourcc == VLC_CODEC_RGB24 ) { /* This is in BGR format */ fmt.video.i_bmask = 0x00ff0000; @@ -677,14 +720,12 @@ static int AccessOpen( vlc_object_t *p_this ) /* Check if we need to force demuxers */ if( !p_access->psz_demux || !*p_access->psz_demux ) { - 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') ) + if( p_stream->i_fourcc == VLC_CODEC_DV ) { free( p_access->psz_demux ); p_access->psz_demux = strdup( "rawdv" ); } - else if( p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') ) + else if( p_stream->i_fourcc == VLC_CODEC_MPGV ) { free( p_access->psz_demux ); p_access->psz_demux = strdup( "mpgv" ); @@ -823,6 +864,9 @@ static bool ConnectFilters( vlc_object_t *p_this, access_sys_t *p_sys, pP->Release(); } pins->Release(); + msg_Dbg( p_this, "ConnectFilters: graph_builder2 available.") ; + if ( !Found ) + msg_Warn( p_this, "ConnectFilters: No crossBar routes found (incobatible pin types)" ) ; } return true; } @@ -861,17 +905,17 @@ static int GetFourCCPriority( int i_fourcc ) { switch( i_fourcc ) { - case VLC_FOURCC('I','4','2','0'): - case VLC_FOURCC('f','l','3','2'): + case VLC_CODEC_I420: + case VLC_CODEC_FL32: return 9; - case VLC_FOURCC('Y','V','1','2'): + case VLC_CODEC_YV12: case VLC_FOURCC('a','r','a','w'): return 8; - case VLC_FOURCC('R','V','2','4'): + case VLC_CODEC_RGB24: return 7; - case VLC_FOURCC('Y','U','Y','2'): - case VLC_FOURCC('R','V','3','2'): - case VLC_FOURCC('R','G','B','A'): + case VLC_CODEC_YUYV: + case VLC_CODEC_RGB32: + case VLC_CODEC_RGBA: return 6; } @@ -898,7 +942,6 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys, /* Enumerate devices and display their names */ FindCaptureDevice( p_this, NULL, &list_devices, b_audio ); - if( !list_devices.size() ) return VLC_EGENERIC; @@ -909,22 +952,26 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys, /* If no device name was specified, pick the 1st one */ if( devicename.size() == 0 ) { + /* When none selected */ devicename = *list_devices.begin(); + msg_Dbg( p_this, "asking for default device: %s", devicename.c_str() ) ; } - + else + msg_Dbg( p_this, "asking for device: %s", devicename.c_str() ) ; // 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( p_this, &devicename, 0, b_audio ); + FindCaptureDevice( p_this, &devicename, NULL, b_audio ); + if( p_device_filter ) msg_Dbg( p_this, "using device: %s", devicename.c_str() ); else { msg_Err( p_this, "can't use device: %s, unsupported device type", devicename.c_str() ); - intf_UserFatal( p_this, false, _("Capturing failed"), + dialog_Fatal( p_this, _("Capture failed"), _("VLC cannot use the device \"%s\", because its " - "type is not supported.") ); + "type is not supported."), devicename.c_str() ); return VLC_EGENERIC; } @@ -975,7 +1022,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys, else { /* capture device */ msg_Err( p_this, "capture device '%s' does not support required parameters !", devicename.c_str() ); - intf_UserFatal( p_this, false, _("Capturing failed"), + dialog_Fatal( p_this, _("Capture failed"), _("The capture device \"%s\" does not support the " "required parameters."), devicename.c_str() ); p_device_filter->Release(); @@ -1084,6 +1131,11 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys, return VLC_EGENERIC; } +/* FindCaptureDevices:: This Function had two purposes : + Returns the list of capture devices when p_listdevices != NULL + Creates an IBaseFilter when p_devicename corresponds to an existing devname + These actions *may* be requested whith a single call. +*/ static IBaseFilter * FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, list *p_listdevices, bool b_audio ) @@ -1124,7 +1176,7 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, * CreateClassEnumerator will succeed, but p_class_enum will be NULL */ if( p_class_enum == NULL ) { - msg_Err( p_this, "no capture device was detected" ); + msg_Err( p_this, "no %s capture device was detected", ( b_audio ? "audio" : "video" ) ); return NULL; } @@ -1148,40 +1200,35 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, p_bag->Release(); if( SUCCEEDED(hr) ) { - 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'; - - 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 ); + char *p_buf = FromWide( var.bstrVal ); + string devname = string(p_buf); + free( 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(); + string ordevname = devname ; + while ( iter != end ) + { + if( 0 == (*iter).compare( devname ) ) + { /* devname is on the list. Try another name with sequence + number apended and then rescan until a unique entry is found*/ + char seq[16]; + snprintf(seq, 16, " #%d", ++dup); + devname = ordevname + seq; + iter = devicelist.begin(); + } + else + ++iter; + } + devicelist.push_back( devname ); if( p_devicename && *p_devicename == devname ) { - /* Bind Moniker to a filter object */ - hr = p_moniker->BindToObject( 0, 0, IID_IBaseFilter, + msg_Dbg( p_this, "asked for %s, binding to %s", p_devicename->c_str() , devname.c_str() ) ; + /* NULL possibly means we don't need BindMoniker BindCtx ?? */ + hr = p_moniker->BindToObject( NULL, 0, IID_IBaseFilter, (void **)&p_base_filter ); if( FAILED(hr) ) { @@ -1424,7 +1471,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter, val = i_bitspersample; if( ! val ) { - if( VLC_FOURCC('f', 'l', '3', '2') == i_current_fourcc ) + if( VLC_CODEC_FL32 == i_current_fourcc ) val = 32; else val = 16; @@ -1571,7 +1618,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter, } else { - char *psz_type = "unknown"; + const 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"; @@ -1601,7 +1648,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter, { // output format for 'Hauppauge WinTV PVR PCI II Capture' // try I420 as an input format - i_current_fourcc = VLC_FOURCC('I','4','2','0'); + i_current_fourcc = VLC_CODEC_I420; if( !i_fourcc || i_fourcc == i_current_fourcc ) { // return alternative media type @@ -1626,7 +1673,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter, ((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.biCompression = VLC_CODEC_I420; vh.bmiHeader.biSizeImage = vh.bmiHeader.biWidth * 12 * vh.bmiHeader.biHeight / 8; mtr.lSampleSize = vh.bmiHeader.biSizeImage; @@ -2005,6 +2052,7 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name, /***************************************************************************** * Properties *****************************************************************************/ + static void ShowPropertyPage( IUnknown *obj ) { ISpecifyPropertyPages *p_spec;