/*****************************************************************************
* dshow.cpp : DirectShow access module for vlc
*****************************************************************************
- * Copyright (C) 2002, 2003 the VideoLAN team
+ * Copyright (C) 2002-2004, 2006, 2008, 2010 the VideoLAN team
* $Id$
*
* Author: Gildas Bazin <gbazin@videolan.org>
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <vlc/vlc.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#define __STDC_CONSTANT_MACROS 1
+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_access.h>
#include <vlc_demux.h>
-#include <vlc_vout.h>
-#include <vlc_interface.h>
+#include <vlc_dialog.h>
+#include <vlc_charset.h>
#include "common.h"
#include "filter.h"
static int Demux ( demux_t * );
static int DemuxControl( demux_t *, int, va_list );
-static int OpenDevice( vlc_object_t *, access_sys_t *, string, vlc_bool_t );
+static int OpenDevice( vlc_object_t *, access_sys_t *, string, bool );
static IBaseFilter *FindCaptureDevice( vlc_object_t *, string *,
- list<string> *, vlc_bool_t );
+ list<string> *, bool );
static size_t EnumDeviceCaps( vlc_object_t *, IBaseFilter *,
int, int, int, int, int, int,
AM_MEDIA_TYPE *mt, size_t );
vlc_value_t, vlc_value_t, void * );
static void ShowPropertyPage( IUnknown * );
-static void ShowDeviceProperties( vlc_object_t *, ICaptureGraphBuilder2 *,
- IBaseFilter *, vlc_bool_t );
-static void ShowTunerProperties( vlc_object_t *, ICaptureGraphBuilder2 *,
- IBaseFilter *, vlc_bool_t );
+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 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[] =
+static const char *const ppsz_vdev[] = { "", "none" };
+static const char *const ppsz_vdev_text[] = { N_("Default"), N_("None") };
+static const char *const ppsz_adev[] = { "", "none" };
+static const char *const ppsz_adev_text[] = { N_("Default"), N_("None") };
+static const int pi_tuner_input[] = { 0, 1, 2 };
+static const char *const 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"),
+static const char *const ppsz_amtuner_mode_text[] = { N_("Default"),
N_("TV"),
N_("FM radio"),
N_("AM radio"),
#define CACHING_TEXT N_("Caching value in ms")
#define CACHING_LONGTEXT N_( \
"Caching value for DirectShow streams. " \
- "This value should be set in millisecondss." )
+ "This value should be set in milliseconds." )
#define VDEV_TEXT N_("Video device name")
#define VDEV_LONGTEXT N_( \
"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.")
-/// \bug [String] size stuff should be on video !
#define ADEV_TEXT N_("Audio device name")
#define ADEV_LONGTEXT N_( \
"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. You can specify a standard size (cif, d1, ...) or <width>x<height>")
+ "will be used. ")
#define SIZE_TEXT N_("Video size")
#define SIZE_LONGTEXT N_( \
"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 <width>x<height>.")
+#define ASPECT_TEXT N_("Picture aspect-ratio n:m")
+#define ASPECT_LONGTEXT N_("Define input picture aspect-ratio to use. Default is 4:3" )
#define CHROMA_TEXT N_("Video input chroma format")
#define CHROMA_LONGTEXT N_( \
"Force the DirectShow video input to use a specific chroma format " \
#define CHANNEL_LONGTEXT N_( \
"Set the TV channel the tuner will set to " \
"(0 means default)." )
+#define TVFREQ_TEXT N_("Tuner Frequency")
+#define TVFREQ_LONGTEXT N_( "This overrides the channel. Measured in Hz." )
+#define STANDARD_TEXT N_( "Standard" )
+#define STANDARD_LONGTEXT N_( "Video standard (Default, SECAM_D, PAL_B, NTSC_M, etc...)." )
#define COUNTRY_TEXT N_("Tuner country code")
#define COUNTRY_LONGTEXT N_( \
"Set the tuner country code that establishes the current " \
#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-specfic, you should find good " \
+ "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 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.")
+ "AM Tuner mode. Can be one of Default (0), TV (1)," \
+ "AM Radio (2), FM Radio (3) or DSS (4).")
+
+#define AUDIO_CHANNELS_TEXT N_("Number of audio channels")
+#define AUDIO_CHANNELS_LONGTEXT N_( \
+ "Select audio input format with the given number of audio channels (if non 0)" )
-static int CommonOpen ( vlc_object_t *, access_sys_t *, vlc_bool_t );
+#define AUDIO_SAMPLERATE_TEXT N_("Audio sample rate")
+#define AUDIO_SAMPLERATE_LONGTEXT N_( \
+ "Select audio input format with the given sample rate (if non 0)" )
+
+#define AUDIO_BITSPERSAMPLE_TEXT N_("Audio bits per sample")
+#define AUDIO_BITSPERSAMPLE_LONGTEXT N_( \
+ "Select audio input format with the given bits/sample (if non 0)" )
+
+static const int i_standards_list[] =
+ {
+ KS_AnalogVideo_None,
+ KS_AnalogVideo_NTSC_M, KS_AnalogVideo_NTSC_M_J, KS_AnalogVideo_NTSC_433,
+ KS_AnalogVideo_PAL_B, KS_AnalogVideo_PAL_D, KS_AnalogVideo_PAL_G,
+ KS_AnalogVideo_PAL_H, KS_AnalogVideo_PAL_I, KS_AnalogVideo_PAL_M,
+ KS_AnalogVideo_PAL_N, KS_AnalogVideo_PAL_60,
+ KS_AnalogVideo_SECAM_B, KS_AnalogVideo_SECAM_D, KS_AnalogVideo_SECAM_G,
+ KS_AnalogVideo_SECAM_H, KS_AnalogVideo_SECAM_K, KS_AnalogVideo_SECAM_K1,
+ KS_AnalogVideo_SECAM_L, KS_AnalogVideo_SECAM_L1,
+ KS_AnalogVideo_PAL_N_COMBO
+ };
+static const char *const ppsz_standards_list_text[] =
+ {
+ N_("Default"),
+ "NTSC_M", "NTSC_M_J", "NTSC_443",
+ "PAL_B", "PAL_D", "PAL_G",
+ "PAL_H", "PAL_I", "PAL_M",
+ "PAL_N", "PAL_60",
+ "SECAM_B", "SECAM_D", "SECAM_G",
+ "SECAM_H", "SECAM_K", "SECAM_K1",
+ "SECAM_L", "SECAM_L1",
+ "PAL_N_COMBO"
+ };
+
+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 int DemuxOpen ( vlc_object_t * );
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 );
+vlc_module_begin ()
+ set_shortname( N_("DirectShow") )
+ set_description( N_("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, 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, 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, false)
- add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_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-aspect-ratio", "4:3", NULL, ASPECT_TEXT, ASPECT_LONGTEXT, false)
- add_string( "dshow-adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, VLC_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-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT, true )
- add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE);
+ add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT, true )
- add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
- VLC_TRUE );
+ add_bool( "dshow-config", false, NULL, CONFIG_TEXT, CONFIG_LONGTEXT, true )
- add_float( "dshow-fps", 0.0f, NULL, FPS_TEXT, FPS_LONGTEXT,
- VLC_TRUE );
+ add_bool( "dshow-tuner", false, NULL, TUNER_TEXT, TUNER_LONGTEXT, true )
- add_bool( "dshow-config", VLC_FALSE, NULL, CONFIG_TEXT, CONFIG_LONGTEXT,
- VLC_TRUE );
+ add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT, CHANNEL_LONGTEXT,
+ true )
- add_bool( "dshow-tuner", VLC_FALSE, NULL, TUNER_TEXT, TUNER_LONGTEXT,
- VLC_TRUE );
+ add_integer( "dshow-tuner-frequency", 0, NULL, TVFREQ_TEXT, TVFREQ_LONGTEXT,
+ true )
- add_integer( "dshow-tuner-channel", 0, NULL, CHANNEL_TEXT,
- CHANNEL_LONGTEXT, VLC_TRUE );
+ add_integer( "dshow-tuner-country", 0, NULL, COUNTRY_TEXT, COUNTRY_LONGTEXT,
+ true )
- add_integer( "dshow-tuner-country", 0, NULL, COUNTRY_TEXT,
- COUNTRY_LONGTEXT, VLC_TRUE );
+ add_integer( "dshow-tuner-standard", 0, NULL, STANDARD_TEXT, STANDARD_LONGTEXT,
+ false )
+ change_integer_list( i_standards_list, ppsz_standards_list_text, NULL )
add_integer( "dshow-tuner-input", 0, NULL, TUNER_INPUT_TEXT,
- TUNER_INPUT_LONGTEXT, VLC_TRUE );
- change_integer_list( pi_tuner_input, ppsz_tuner_input_text, 0 );
+ 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, VLC_TRUE );
-
- add_integer( "dshow-audio-input", -1, NULL, AUDIO_IN_TEXT,
- AUDIO_IN_LONGTEXT, VLC_TRUE );
+ VIDEO_IN_LONGTEXT, true )
add_integer( "dshow-video-output", -1, NULL, VIDEO_OUT_TEXT,
- VIDEO_OUT_LONGTEXT, VLC_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, VLC_TRUE );
+ AUDIO_OUT_LONGTEXT, true )
add_integer( "dshow-amtuner-mode", AMTUNER_MODE_TV, NULL,
- AMTUNER_MODE_TEXT, AMTUNER_MODE_LONGTEXT, VLC_FALSE);
- change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, 0 );
+ AMTUNER_MODE_TEXT, AMTUNER_MODE_LONGTEXT, false)
+ change_integer_list( pi_amtuner_mode, ppsz_amtuner_mode_text, NULL )
- add_shortcut( "dshow" );
- set_capability( "access_demux", 0 );
- set_callbacks( DemuxOpen, DemuxClose );
+ add_integer( "dshow-audio-channels", 0, NULL, AUDIO_CHANNELS_TEXT,
+ AUDIO_CHANNELS_LONGTEXT, true )
+ add_integer( "dshow-audio-samplerate", 0, NULL, AUDIO_SAMPLERATE_TEXT,
+ AUDIO_SAMPLERATE_LONGTEXT, true )
+ add_integer( "dshow-audio-bitspersample", 0, NULL, AUDIO_BITSPERSAMPLE_TEXT,
+ AUDIO_BITSPERSAMPLE_LONGTEXT, true )
- add_submodule();
- set_description( _("DirectShow input") );
- add_shortcut( "dshow" );
- set_capability( "access2", 0 );
- set_callbacks( AccessOpen, AccessClose );
+ add_shortcut( "dshow" )
+ set_capability( "access_demux", 0 )
+ set_callbacks( DemuxOpen, DemuxClose )
+
+ add_submodule ()
+ set_description( N_("DirectShow input") )
+ add_shortcut( "dshow" )
+ set_capability( "access", 0 )
+ set_callbacks( AccessOpen, AccessClose )
+
+vlc_module_end ()
-vlc_module_end();
/*****************************************************************************
* DirectShow elementary stream descriptor
int i_fourcc;
es_out_id_t *p_es;
- vlc_bool_t b_pts;
+ bool b_pts;
+
+ deque<VLCMediaSample> samples_queue;
} dshow_stream_t;
/*****************************************************************************
* CommonOpen: open direct show device
*****************************************************************************/
static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
- vlc_bool_t b_access_demux )
+ bool b_access_demux )
{
- vlc_value_t val;
int i;
+ char *psz_val;
/* Get/parse options and open device(s) */
string vdevname, adevname;
- int i_width = 0, i_height = 0, i_chroma = 0;
- vlc_bool_t b_audio = VLC_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 ) free( val.psz_string );
+ psz_val = var_CreateGetString( p_this, "dshow-vdev" );
+ if( psz_val )
+ {
+ msg_Dbg( p_this, "dshow-vdev: %s", psz_val ) ;
+ /* skip none device */
+ if ( strncasecmp( psz_val, "none", 4 ) != 0 )
+ vdevname = string( psz_val );
+ else
+ b_use_video = false ;
+ }
+ free( psz_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 );
+ psz_val = var_CreateGetString( p_this, "dshow-adev" );
+ if( psz_val )
+ {
+ msg_Dbg( p_this, "dshow-adev: %s", psz_val ) ;
+ /* skip none device */
+ if ( strncasecmp( psz_val, "none", 4 ) != 0 )
+ adevname = string( psz_val );
+ else
+ b_use_audio = false ;
+ }
+ free( psz_val );
- 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 },
};
- 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 )
+ psz_val = var_CreateGetString( p_this, "dshow-size" );
+ if( !EMPTY_STR(psz_val) )
{
for( i = 0; size_table[i].psz_size; i++ )
{
- if( !strcmp( val.psz_string, size_table[i].psz_size ) )
+ if( !strcmp( psz_val, size_table[i].psz_size ) )
{
i_width = size_table[i].i_width;
i_height = size_table[i].i_height;
if( !size_table[i].psz_size ) /* Try to parse "WidthxHeight" */
{
char *psz_parser;
- i_width = strtol( val.psz_string, &psz_parser, 0 );
+ i_width = strtol( psz_val, &psz_parser, 0 );
if( *psz_parser == 'x' || *psz_parser == 'X')
{
i_height = strtol( psz_parser + 1, &psz_parser, 0 );
msg_Dbg( p_this, "width x height %dx%d", i_width, i_height );
}
}
- if( val.psz_string ) free( val.psz_string );
+ free( psz_val );
- p_sys->b_chroma = VLC_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 = VLC_TRUE;
- }
- if( val.psz_string ) free( val.psz_string );
+ psz_val = var_CreateGetString( p_this, "dshow-chroma" );
+ i_chroma = vlc_fourcc_GetCodecFromString( UNKNOWN_ES, psz_val );
+ p_sys->b_chroma = i_chroma != 0;
+ free( psz_val );
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-frequency",
+ VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Create( p_this, "dshow-tuner-standard",
+ 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",
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 = 0;
+ p_sys->pp_streams = NULL;
p_sys->i_width = i_width;
p_sys->i_height = i_height;
p_sys->i_chroma = i_chroma;
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_this, p_sys, vdevname, 0 ) != VLC_SUCCESS )
+ vlc_mutex_init( &p_sys->lock );
+ vlc_cond_init( &p_sys->wait );
+
+ if( !b_use_video && !b_use_audio )
{
- msg_Err( p_this, "can't open video");
+ dialog_Fatal( p_this, _("Capture failed"),
+ _("No video or audio device selected.") );
+ return VLC_EGENERIC ;
}
- else
+
+ 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 device");
+ b_err_video = true ;
+ }
+
+ if ( b_use_video && !b_err_video )
{
/* Check if we can handle the demuxing ourselves or need to spawn
* a demuxer module */
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 = VLC_FALSE;
+ b_use_audio = false;
if( b_access_demux )
{
if( p_stream->mt.majortype == MEDIATYPE_Stream )
{
- b_audio = VLC_FALSE;
+ b_use_audio = false;
if( b_access_demux )
{
return VLC_EGENERIC;
}
- var_Get( p_this, "dshow-tuner", &val );
- if( val.b_bool )
+ if( var_GetBool( p_this, "dshow-tuner" ) )
{
/* FIXME: we do MEDIATYPE_Stream here so we don't do
* it twice. */
}
}
- 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 )
{
- 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;
+ int i_val = var_GetInteger( p_this, "dshow-video-input" );
+ if( i_val >= 0 )
+ p_sys->crossbar_routes[i].VideoInputIndex = i_val;
+ i_val = var_GetInteger( p_this, "dshow-video-output" );
+ if( i_val >= 0 )
+ p_sys->crossbar_routes[i].VideoOutputIndex = i_val;
+ i_val = var_GetInteger( p_this, "dshow-audio-input" );
+ if( i_val >= 0 )
+ p_sys->crossbar_routes[i].AudioInputIndex = i_val;
+ i_val = var_GetInteger( p_this, "dshow-audio-output" );
+ if( i_val >= 0 )
+ p_sys->crossbar_routes[i].AudioOutputIndex = i_val;
IAMCrossbar *pXbar = p_sys->crossbar_routes[i].pXbar;
LONG VideoInputIndex = p_sys->crossbar_routes[i].VideoInputIndex;
}
}
}
+ else
+ msg_Err( p_this, "crossbar at depth %d could not route video "
+ "output %ld to input %ld", i, VideoOutputIndex, VideoInputIndex );
}
/*
** Show properties pages from other filters in graph
*/
- var_Get( p_this, "dshow-config", &val );
- if( val.b_bool )
+ if( var_GetBool( p_this, "dshow-config" ) )
{
for( i = p_sys->i_crossbar_route_depth-1; i >= 0 ; --i )
{
access_sys_t *p_sys;
int i;
- p_sys = (access_sys_t *)malloc( sizeof( access_sys_t ) );
- memset( p_sys, 0, sizeof( access_sys_t ) );
+ p_sys = (access_sys_t*)calloc( 1, sizeof( access_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
p_demux->p_sys = (demux_sys_t *)p_sys;
- if( CommonOpen( p_this, p_sys, VLC_TRUE ) != VLC_SUCCESS )
+ if( CommonOpen( p_this, p_sys, true ) != VLC_SUCCESS )
{
CommonClose( p_this, p_sys );
return VLC_EGENERIC;
if( p_stream->mt.majortype == MEDIATYPE_Video )
{
+ char *psz_aspect = var_CreateGetString( p_this, "dshow-aspect-ratio" );
+ char *psz_delim = !EMPTY_STR( psz_aspect ) ? strchr( psz_aspect, ':' ) : NULL;
+
es_format_Init( &fmt, VIDEO_ES, p_stream->i_fourcc );
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( psz_delim )
+ {
+ fmt.video.i_sar_num = atoi( psz_aspect ) * fmt.video.i_height;
+ fmt.video.i_sar_den = atoi( psz_delim + 1 ) * fmt.video.i_width;
+ }
+ else
+ {
+ fmt.video.i_sar_num = 4 * fmt.video.i_height;
+ fmt.video.i_sar_den = 3 * fmt.video.i_width;
+ }
+ free( psz_aspect );
if( !p_stream->header.video.bmiHeader.biCompression )
{
}
/* 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;
+ /* This is in RGB format
+ http://msdn.microsoft.com/en-us/library/dd407253%28VS.85%29.aspx?ppud=4
+ */
+ fmt.video.i_rmask = 0x00ff0000;
fmt.video.i_gmask = 0x0000ff00;
- fmt.video.i_rmask = 0x000000ff;
+ fmt.video.i_bmask = 0x000000ff;
}
if( p_stream->header.video.AvgTimePerFrame )
access_t *p_access = (access_t*)p_this;
access_sys_t *p_sys;
- p_access->p_sys = p_sys = (access_sys_t *)malloc( sizeof( access_sys_t ) );
- memset( p_sys, 0, sizeof( access_sys_t ) );
+ p_access->p_sys = p_sys = (access_sys_t*)calloc( 1, sizeof( access_sys_t ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- if( CommonOpen( p_this, p_sys, VLC_FALSE ) != VLC_SUCCESS )
+ if( CommonOpen( p_this, p_sys, false ) != VLC_SUCCESS )
{
CommonClose( p_this, p_sys );
return VLC_EGENERIC;
/* 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 )
{
- p_access->psz_demux = "mpgv";
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "mpgv" );
}
}
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.b_eof = false;
p_access->info.i_title = 0;
p_access->info.i_seekpoint = 0;
p_access->p_sys = p_sys;
// Sort out all the possible video inputs
// The class needs to be given the capture filters ANALOGVIDEO input pin
- IEnumPins *pins = 0;
+ IEnumPins *pins = NULL;
if( ( mediaType.majortype == MEDIATYPE_Video ||
mediaType.majortype == MEDIATYPE_Stream ) &&
SUCCEEDED(p_filter->EnumPins(&pins)) )
{
- IPin *pP = 0;
+ IPin *pP = NULL;
ULONG n;
PIN_INFO pinInfo;
BOOL Found = FALSE;
- IKsPropertySet *pKs=0;
+ IKsPropertySet *pKs = NULL;
GUID guid;
DWORD dw;
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;
}
{
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;
}
#define MAX_MEDIA_TYPES 32
static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
- string devicename, vlc_bool_t b_audio )
+ string devicename, bool b_audio )
{
/* See if device is already opened */
for( int i = 0; i < p_sys->i_streams; i++ )
/* Enumerate devices and display their names */
FindCaptureDevice( p_this, NULL, &list_devices, b_audio );
-
if( !list_devices.size() )
return VLC_EGENERIC;
/* 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, VLC_FALSE, _("Capturing failed"),
- _("VLC cannot use the device \"%s\", because its device "
- "type is not supported.") );
+ dialog_Fatal( p_this, _("Capture failed"),
+ _("VLC cannot use the device \"%s\", because its "
+ "type is not supported."), devicename.c_str() );
return VLC_EGENERIC;
}
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 );
+ b_audio ? var_CreateGetInteger( p_this, "dshow-audio-channels" ) : 0,
+ b_audio ? var_CreateGetInteger( p_this, "dshow-audio-samplerate" ) : 0,
+ b_audio ? var_CreateGetInteger( p_this, "dshow-audio-bitspersample" ) : 0,
+ media_types, MAX_MEDIA_TYPES );
AM_MEDIA_TYPE *mt = NULL;
else {
/* capture device */
msg_Err( p_this, "capture device '%s' does not support required parameters !", devicename.c_str() );
- intf_UserFatal( p_this, VLC_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();
msg_Dbg( p_this, "filters connected successfully !" );
dshow_stream_t dshow_stream;
- 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 Device properties. Done here so the VLC stream is setup with
* the proper parameters. */
- vlc_value_t val;
- var_Get( p_this, "dshow-config", &val );
- if( val.b_bool )
+ if( var_GetBool( p_this, "dshow-config" ) )
{
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 )
+ if( var_GetBool( p_this, "dshow-tuner" ) &&
+ 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,
dshow_stream.p_device_filter = p_device_filter;
dshow_stream.p_capture_filter = p_capture_filter;
- p_sys->pp_streams = (dshow_stream_t **)realloc( p_sys->pp_streams,
- sizeof(dshow_stream_t *) * (p_sys->i_streams + 1) );
+ p_sys->pp_streams = (dshow_stream_t **)xrealloc( p_sys->pp_streams,
+ 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;
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<string> *p_listdevices, vlc_bool_t b_audio )
+ list<string> *p_listdevices, bool b_audio )
{
IBaseFilter *p_base_filter = NULL;
IMoniker *p_moniker = NULL;
ULONG i_fetched;
HRESULT hr;
+ list<string> devicelist;
/* Create the system device enumerator */
ICreateDevEnum *p_dev_enum = NULL;
* 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;
}
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';
-
- if( p_listdevices ) p_listdevices->push_back( p_buf );
+ 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<string>::const_iterator iter = devicelist.begin();
+ list<string>::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 == string(p_buf) )
+ 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) )
{
}
p_class_enum->Release();
+
+ if( p_listdevices ) {
+ devicelist.sort();
+ *p_listdevices = devicelist;
+ }
return NULL;
}
if( i_width )
{
- if( i_width % pVSCC->OutputGranularityX
- || pVSCC->MinOutputSize.cx > i_width
- || i_width > pVSCC->MaxOutputSize.cx )
+ if(( !pVSCC->OutputGranularityX
+ && i_width != pVSCC->MinOutputSize.cx
+ && i_width != pVSCC->MaxOutputSize.cx)
+ ||
+ ( pVSCC->OutputGranularityX
+ && ((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 );
if( i_height )
{
- if( i_height % pVSCC->OutputGranularityY
- || pVSCC->MinOutputSize.cy > i_height
- || i_height > pVSCC->MaxOutputSize.cy )
+ if(( !pVSCC->OutputGranularityY
+ && i_height != pVSCC->MinOutputSize.cy
+ && i_height != pVSCC->MaxOutputSize.cy)
+ ||
+ ( pVSCC->OutputGranularityY
+ && ((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 );
// Set the sample size and image size.
// (Round the image width up to a DWORD boundary.)
- p_mt->lSampleSize = pVih->bmiHeader.biSizeImage =
+ p_mt->lSampleSize = pVih->bmiHeader.biSizeImage =
((pVih->bmiHeader.biWidth + 3) & ~3) *
pVih->bmiHeader.biHeight * (pVih->bmiHeader.biBitCount>>3);
{
i_priority = i_current_priority;
if( i_fourcc )
- // no need to check any more media types
+ // no need to check any more media types
i = piCount;
}
}
if( ! val )
val = 2;
- if( val % pASCC->ChannelsGranularity
- || (unsigned int)val < pASCC->MinimumChannels
- || (unsigned int)val > pASCC->MaximumChannels )
+ if( ( !pASCC->ChannelsGranularity
+ && (unsigned int)val != pASCC->MinimumChannels
+ && (unsigned int)val != pASCC->MaximumChannels)
+ ||
+ ( pASCC->ChannelsGranularity
+ && ((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 );
if( ! val )
val = 44100;
- if( val % pASCC->SampleFrequencyGranularity
- || (unsigned int)val < pASCC->MinimumSampleFrequency
- || (unsigned int)val > pASCC->MaximumSampleFrequency )
+ if( ( !pASCC->SampleFrequencyGranularity
+ && (unsigned int)val != pASCC->MinimumSampleFrequency
+ && (unsigned int)val != pASCC->MaximumSampleFrequency)
+ ||
+ ( pASCC->SampleFrequencyGranularity
+ && ((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 );
}
pWfx->nSamplesPerSec = val;
- val = i_bitspersample;
+ 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;
}
- if( val % pASCC->BitsPerSampleGranularity
- || (unsigned int)val < pASCC->MinimumBitsPerSample
- || (unsigned int)val > pASCC->MaximumBitsPerSample )
+ if( ( !pASCC->BitsPerSampleGranularity
+ && (unsigned int)val != pASCC->MinimumBitsPerSample
+ && (unsigned int)val != pASCC->MaximumBitsPerSample )
+ ||
+ ( pASCC->BitsPerSampleGranularity
+ && ((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 );
LONGLONG i_current_atpf = ((VIDEOINFOHEADER *)p_mt->pbFormat)->AvgTimePerFrame;
if( i_current_height < 0 )
- i_current_height = -i_current_height;
+ i_current_height = -i_current_height;
msg_Dbg( p_this, "EnumDeviceCaps: input pin "
"accepts chroma: %4.4s, width:%i, height:%i, fps:%f",
}
else FreeMediaType( *p_mt );
}
- else if( i_current_fourcc && p_mt->majortype == MEDIATYPE_Audio
+ else if( i_current_fourcc && p_mt->majortype == MEDIATYPE_Audio
&& p_mt->formattype == FORMAT_WaveFormatEx)
{
int i_current_channels =
}
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";
{
// 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
- 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);
+ // 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;
+ ((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;
-
+ ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biHeight;
+ vh.bmiHeader.biPlanes = 3;
+ vh.bmiHeader.biBitCount = 12;
+ vh.bmiHeader.biCompression = VLC_CODEC_I420;
+ 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)) )
while( 1 )
{
- if( p_access->b_die || p_access->b_error ) return 0;
+ if( !vlc_object_alive (p_access) ) return NULL;
/* Get new sample/frame from the elementary stream (blocking). */
vlc_mutex_lock( &p_sys->lock );
}
sample.p_sample->GetPointer( &p_data );
- p_access->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size );
+ vlc_memcpy( p_block->p_buffer, p_data, i_data_size );
sample.p_sample->Release();
/* The caller got what he wanted */
return p_block;
}
- return 0; /* never reached */
+ return NULL; /* never reached */
}
/****************************************************************************
static int Demux( demux_t *p_demux )
{
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;
+ int i_stream;
+ int i_found_samples;
+ i_found_samples = 0;
vlc_mutex_lock( &p_sys->lock );
- /* Try to grab an audio sample (audio has a higher priority) */
- 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;
- }
- }
- /* Try to grab a video sample */
- if( i_stream == p_sys->i_streams )
+ while ( !i_found_samples )
{
+ /* Try to grab samples from all streams */
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
- p_stream = p_sys->pp_streams[i_stream];
+ dshow_stream_t *p_stream = p_sys->pp_streams[i_stream];
if( p_stream->p_capture_filter &&
p_stream->p_capture_filter->CustomGetPin()
- ->CustomGetSample( &sample ) == S_OK )
+ ->CustomGetSamples( p_stream->samples_queue ) == S_OK )
{
- break;
+ i_found_samples = 1;
}
}
+
+ if ( !i_found_samples)
+ {
+ /* Didn't find any audio nor video sample, just wait till the
+ * dshow thread pushes some samples */
+ vlc_cond_wait( &p_sys->wait, &p_sys->lock );
+ /* Some DShow thread pushed data, or the OS broke the wait all
+ * by itself. In all cases, it's *strongly* advised to test the
+ * condition again, so let the loop do the test again */
+ }
}
vlc_mutex_unlock( &p_sys->lock );
- if( i_stream == p_sys->i_streams )
+ for ( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
- /* Sleep so we do not consume all the cpu, 10ms seems
- * like a good value (100fps) */
- msleep( 10000 );
- return 1;
- }
+ int i_samples;
+ dshow_stream_t *p_stream = p_sys->pp_streams[i_stream];
- /*
- * We got our sample
- */
- i_data_size = sample.p_sample->GetActualDataLength();
- sample.p_sample->GetPointer( &p_data );
+ i_samples = p_stream->samples_queue.size();
+ while ( i_samples > 0 )
+ {
+ int i_data_size;
+ uint8_t *p_data;
+ block_t *p_block;
+ VLCMediaSample sample;
- 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;
+ sample = p_stream->samples_queue.front();
+ p_stream->samples_queue.pop_front();
- 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;
- }
- }
+ i_data_size = sample.p_sample->GetActualDataLength();
+ sample.p_sample->GetPointer( &p_data );
+
+ 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;
+
+ 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 = true;
+ }
+ }
- i_pts /= 10; /* Dshow works with 100 nano-seconds resolution */
+ i_pts /= 10; /* Dshow works with 100 nano-seconds resolution */
#if 0
- msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: "I64Fd,
- i_stream, i_data_size, i_pts );
+ msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: %"PRId64,
+ i_stream, i_data_size, i_pts );
#endif
- 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();
+ p_block = block_New( p_demux, i_data_size );
+ vlc_memcpy( p_block->p_buffer, p_data, i_data_size );
+ p_block->i_pts = p_block->i_dts = i_pts;
+ sample.p_sample->Release();
- 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 );
+ 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 );
+
+ i_samples--;
+ }
+ }
return 1;
}
*****************************************************************************/
static int AccessControl( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
- int *pi_int;
- int64_t *pi_64;
+ bool *pb_bool;
+ int64_t *pi_64;
switch( i_query )
{
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;
+ 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;
+ *pi_64 = var_GetInteger( p_access, "dshow-caching" ) * 1000;
break;
/* */
****************************************************************************/
static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
{
- vlc_bool_t *pb;
- int64_t *pi64;
+ 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 = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
- *pb = VLC_FALSE;
+ 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;
+ *pi64 = var_GetInteger( p_demux, "dshow-caching" ) * 1000;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
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 )
/* Uninitialize OLE/COM */
CoUninitialize();
- if( !list_devices.size() ) return VLC_SUCCESS;
+ if( list_devices.empty() ) return VLC_SUCCESS;
- p_item->ppsz_list =
- (const char **)realloc( p_item->ppsz_list,
+ p_item->ppsz_list = (char**)xrealloc( p_item->ppsz_list,
(list_devices.size()+3) * sizeof(char *) );
- p_item->ppsz_list_text =
- (const char **)realloc( p_item->ppsz_list_text,
+ p_item->ppsz_list_text = (char**)xrealloc( p_item->ppsz_list_text,
(list_devices.size()+3) * sizeof(char *) );
list<string>::iterator iter;
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;
}
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;
+ char *psz_device = NULL;
+ int i_ret = VLC_SUCCESS;
+
+ if( !EMPTY_STR( newval.psz_string ) )
+ psz_device = strdup( newval.psz_string );
/* Initialize OLE/COM */
CoInitialize( 0 );
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( !p_item )
+ {
+ free( psz_device );
+ CoUninitialize();
+ return VLC_SUCCESS;
+ }
+
+ if( !strcmp( psz_name, "dshow-adev" ) ) b_audio = true;
string devicename;
- if( newval.psz_string && *newval.psz_string )
+ if( psz_device )
{
- devicename = newval.psz_string;
+ devicename = psz_device ;
}
else
{
/* Enumerate devices */
FindCaptureDevice( p_this, NULL, &list_devices, b_audio );
- if( !list_devices.size() ) return VLC_EGENERIC;
+ if( list_devices.empty() )
+ {
+ CoUninitialize();
+ return VLC_EGENERIC;
+ }
devicename = *list_devices.begin();
}
}
else
{
- /* Uninitialize OLE/COM */
- CoUninitialize();
-
msg_Err( p_this, "didn't find device: %s", devicename.c_str() );
- return VLC_EGENERIC;
+ i_ret = VLC_EGENERIC;
}
/* Uninitialize OLE/COM */
CoUninitialize();
- return VLC_SUCCESS;
+ free( psz_device );
+ return i_ret;
}
/*****************************************************************************
* Properties
*****************************************************************************/
+
static void ShowPropertyPage( IUnknown *obj )
{
ISpecifyPropertyPages *p_spec;
static void ShowDeviceProperties( vlc_object_t *p_this,
ICaptureGraphBuilder2 *p_graph,
IBaseFilter *p_device_filter,
- vlc_bool_t b_audio )
+ bool b_audio )
{
HRESULT hr;
msg_Dbg( p_this, "configuring Device Properties" );
static void ShowTunerProperties( vlc_object_t *p_this,
ICaptureGraphBuilder2 *p_graph,
IBaseFilter *p_device_filter,
- vlc_bool_t b_audio )
+ bool b_audio )
{
HRESULT hr;
msg_Dbg( p_this, "configuring Tuner Properties" );
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;
+ int i_channel, i_country, i_input, i_amtuner_mode, i_standard, i_frequency;
long l_modes = 0;
IAMTVTuner *p_TV;
HRESULT hr;
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" );
+ i_frequency = var_GetInteger( p_this, "dshow-tuner-frequency" );
+ i_standard =
+ i_standards_list[var_CreateGetInteger( p_this, "dshow-tuner-standard" )];
+
+ if( !i_channel && !i_frequency && !i_country && !i_input ) return; /* Nothing to do */
- if( !i_channel && !i_country && !i_input ) return; /* Nothing to do */
+ msg_Dbg( p_this, "tuner config: channel %i, frequency %i, country %i, input type %i, standard %s",
+ i_channel, i_frequency, i_country, i_input, ppsz_standards_list_text[i_standard] );
- 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,
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,
+
+ if( i_frequency <= 0 ) p_TV->put_Channel( i_channel, AMTUNER_SUBCHAN_NO_TUNE,
AMTUNER_SUBCHAN_NO_TUNE );
+
+ if( i_frequency > 0 || i_standard > 0) {
+ IKsPropertySet *pKs = NULL;
+ DWORD dw_supported = 0;
+ KSPROPERTY_TUNER_MODE_CAPS_S ModeCaps;
+ KSPROPERTY_TUNER_FREQUENCY_S Frequency;
+ KSPROPERTY_TUNER_STANDARD_S Standard;
+
+ hr = p_TV->QueryInterface(IID_IKsPropertySet,(void **)&pKs);
+ if (FAILED(hr))
+ {
+ msg_Dbg( p_this, "Couldn't QI for IKsPropertySet" );
+ p_TV->Release();
+ return;
+ }
+
+ memset(&ModeCaps,0,sizeof(KSPROPERTY_TUNER_MODE_CAPS_S));
+ memset(&Frequency,0,sizeof(KSPROPERTY_TUNER_FREQUENCY_S));
+ memset(&Standard,0,sizeof(KSPROPERTY_TUNER_STANDARD_S));
+ ModeCaps.Mode = AMTUNER_MODE_TV;
+
+ hr = pKs->QuerySupported(PROPSETID_TUNER,
+ KSPROPERTY_TUNER_MODE_CAPS,&dw_supported);
+ if(SUCCEEDED(hr) && dw_supported&KSPROPERTY_SUPPORT_GET)
+ {
+ DWORD cbBytes=0;
+ hr = pKs->Get(PROPSETID_TUNER,KSPROPERTY_TUNER_MODE_CAPS,
+ INSTANCEDATA_OF_PROPERTY_PTR(&ModeCaps),
+ INSTANCEDATA_OF_PROPERTY_SIZE(ModeCaps),
+ &ModeCaps,
+ sizeof(ModeCaps),
+ &cbBytes);
+ }
+ else
+ {
+ msg_Dbg( p_this, "KSPROPERTY_TUNER_MODE_CAPS not supported!" );
+ goto free_on_error;
+ }
+
+ msg_Dbg( p_this, "Frequency range supproted from %d to %d.", ModeCaps.MinFrequency, ModeCaps.MaxFrequency);
+ msg_Dbg( p_this, "Video standards supproted by the tuner: ");
+ for(int i = 0 ; i < ARRAY_SIZE(ppsz_standards_list_text); i++) {
+ if(ModeCaps.StandardsSupported & i_standards_list[i])
+ msg_Dbg( p_this, "%s, ", ppsz_standards_list_text[i]);
+ }
+
+ if(i_frequency > 0) {
+ Frequency.Frequency=i_frequency;
+ if(ModeCaps.Strategy==KS_TUNER_STRATEGY_DRIVER_TUNES)
+ Frequency.TuningFlags=KS_TUNER_TUNING_FINE;
+ else
+ Frequency.TuningFlags=KS_TUNER_TUNING_EXACT;
+
+ if(i_frequency>=ModeCaps.MinFrequency && i_frequency<=ModeCaps.MaxFrequency)
+ {
+
+ hr = pKs->Set(PROPSETID_TUNER,
+ KSPROPERTY_TUNER_FREQUENCY,
+ INSTANCEDATA_OF_PROPERTY_PTR(&Frequency),
+ INSTANCEDATA_OF_PROPERTY_SIZE(Frequency),
+ &Frequency,
+ sizeof(Frequency));
+ if(FAILED(hr))
+ {
+ msg_Dbg( p_this, "Couldn't set KSPROPERTY_TUNER_FREQUENCY!" );
+ goto free_on_error;
+ }
+ }
+ else
+ {
+ msg_Dbg( p_this, "Requested frequency exceeds the supported range!" );
+ goto free_on_error;
+ }
+ }
+
+ if(i_standard > 0) {
+ if(i_standard & ModeCaps.StandardsSupported )
+ {
+ Standard.Standard = i_standard;
+ hr = pKs->Set(PROPSETID_TUNER,
+ KSPROPERTY_TUNER_STANDARD,
+ INSTANCEDATA_OF_PROPERTY_PTR(&Standard),
+ INSTANCEDATA_OF_PROPERTY_SIZE(Standard),
+ &Standard,
+ sizeof(Standard));
+ if(FAILED(hr))
+ {
+ msg_Dbg( p_this, "Couldn't set KSPROPERTY_TUNER_STANDARD!" );
+ goto free_on_error;
+ }
+ }
+ else
+ {
+ msg_Dbg( p_this, "Requested video standard is not supported by the tuner!" );
+ goto free_on_error;
+ }
+ }
+free_on_error:
+ pKs->Release();
+ }
+
p_TV->Release();
}
projects / vlc / blobdiff