/*****************************************************************************
* dshow.cpp : DirectShow access module for vlc
*****************************************************************************
- * Copyright (C) 2002, 2003 VideoLAN
+ * Copyright (C) 2002, 2003 the VideoLAN team
* $Id$
*
* Author: Gildas Bazin <gbazin@videolan.org>
+ * Damien Fouilleul <damienf@videolan.org>
*
* 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
*
* 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 <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/vout.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#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 "common.h"
#include "filter.h"
/*****************************************************************************
* Access: local prototypes
*****************************************************************************/
-static int ReadCompressed( access_t *, byte_t *, int );
+static block_t *ReadCompressed( access_t * );
static int AccessControl ( access_t *, int, va_list );
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 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 *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 *const 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 <width>x<height>.")
#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 " \
#define TUNER_TEXT N_("Tuner properties")
#define TUNER_LONGTEXT N_( \
"Show the tuner properties [channel selection] page." )
-
-static int CommonOpen ( vlc_object_t *, access_sys_t *, vlc_bool_t );
+#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 (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)" )
+
+#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 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 DemuxClose ( vlc_object_t * );
vlc_module_begin();
- set_shortname( _("DirectShow") );
- set_description( _("DirectShow input") );
+ 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, 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_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-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_bool( "dshow-config", VLC_FALSE, NULL, CONFIG_TEXT, CONFIG_LONGTEXT,
- VLC_FALSE );
+ add_integer( "dshow-video-input", -1, NULL, VIDEO_IN_TEXT,
+ VIDEO_IN_LONGTEXT, true );
- add_bool( "dshow-tuner", VLC_FALSE, NULL, TUNER_TEXT, TUNER_LONGTEXT,
- VLC_FALSE );
+ 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_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_shortcut( "dshow" );
set_capability( "access_demux", 0 );
set_callbacks( DemuxOpen, DemuxClose );
add_submodule();
- set_description( _("DirectShow input") );
- add_shortcut( "dshow" );
- set_capability( "access2", 0 );
+ set_description( N_("DirectShow input") );
+ set_capability( "access", 0 );
set_callbacks( AccessOpen, AccessClose );
vlc_module_end();
int i_fourcc;
es_out_id_t *p_es;
- vlc_bool_t b_pts;
-
+ bool b_pts;
} 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;
/* 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;
+ bool b_audio = true;
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_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 );
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 }, { "cif", 640, 480 },
+ { "sif", 320, 240 }, { "cif", 352, 288 }, { "d1", 640, 480 },
{ 0, 0, 0 },
};
{
i_height = strtol( psz_parser + 1, &psz_parser, 0 );
}
- msg_Dbg( p_this, "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 );
+ 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 );
+
+ 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_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->p_capture_graph_builder2 = NULL;
p_sys->p_control = NULL;
+ vlc_mutex_init( &p_sys->lock );
+ vlc_cond_init( p_this, &p_sys->wait );
+
/* Build directshow graph */
CreateDirectShowGraph( p_sys );
/* Raw MPEG video stream */
p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') )
{
- b_audio = VLC_FALSE;
+ 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 = VLC_FALSE;
+ 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( b_audio && OpenDevice( p_this, p_sys, adevname, 1 ) != VLC_SUCCESS )
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;
if( SUCCEEDED(pXbar->Route(VideoOutputIndex, VideoInputIndex)) )
{
- msg_Dbg( p_this, "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 )
if( SUCCEEDED( pXbar->Route(AudioOutputIndex,
AudioInputIndex)) )
{
- msg_Dbg(p_this, "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 );
}
}
/* Initialize some data */
p_sys->i_current_stream = 0;
- vlc_mutex_init( p_this, &p_sys->lock );
- vlc_cond_init( p_this, &p_sys->wait );
if( !p_sys->i_streams ) return VLC_EGENERIC;
memset( p_sys, 0, sizeof( access_sys_t ) );
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;
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 )
{
p_access->p_sys = p_sys = (access_sys_t *)malloc( sizeof( access_sys_t ) );
memset( p_sys, 0, sizeof( access_sys_t ) );
- if( CommonOpen( p_this, p_sys, VLC_TRUE ) != VLC_SUCCESS )
+ if( CommonOpen( p_this, p_sys, false ) != VLC_SUCCESS )
{
CommonClose( p_this, p_sys );
return VLC_EGENERIC;
p_stream->i_fourcc == VLC_FOURCC('d','v','s','d') ||
p_stream->i_fourcc == VLC_FOURCC('d','v','h','d') )
{
+ free( p_access->psz_demux );
p_access->psz_demux = strdup( "rawdv" );
}
else if( p_stream->i_fourcc == VLC_FOURCC('m','p','2','v') )
{
- p_access->psz_demux = "mpgv";
+ free( p_access->psz_demux );
+ p_access->psz_demux = strdup( "mpgv" );
}
}
/* Setup Access */
- p_access->pf_read = ReadCompressed;
- p_access->pf_block = NULL;
+ 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 = 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;
*****************************************************************************/
static void CommonClose( vlc_object_t *p_this, access_sys_t *p_sys )
{
- msg_Dbg( p_this, "Releasing DirectShow");
+ msg_Dbg( p_this, "releasing DirectShow");
DeleteDirectShowGraph( p_sys );
/* Uninitialize OLE/COM */
CoUninitialize();
- /* 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 );
+ 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 );
vlc_mutex_destroy( &p_sys->lock );
vlc_cond_destroy( &p_sys->wait );
// 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;
#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++ )
{
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;
}
- size_t mt_count = 0;
- AM_MEDIA_TYPE *mt = NULL;
-
- if( !b_audio )
- {
- // Insert prefered video 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 = 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 = 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;
-
- mt_count = 1;
- mt = (AM_MEDIA_TYPE *)malloc( sizeof(AM_MEDIA_TYPE)*mt_count );
- CopyMediaType(mt, &mtr);
- }
- else
- {
- // Insert prefered 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;
-
- mt_count = 1;
- mt = (AM_MEDIA_TYPE *)malloc( sizeof(AM_MEDIA_TYPE)*mt_count );
- CopyMediaType(mt, &mtr);
- }
-
// 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, p_sys->i_chroma,
+ 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;
if( media_count > 0 )
{
- mt = (AM_MEDIA_TYPE *)realloc( mt, sizeof(AM_MEDIA_TYPE) *
- (mt_count + media_count) );
+ mt = (AM_MEDIA_TYPE *)CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE) * media_count);
// Order and copy returned media types according to arbitrary
// fourcc priority
}
if( slot_copy != c )
{
- mt[c+mt_count] = media_types[slot_copy];
+ mt[c] = media_types[slot_copy];
media_types[slot_copy] = media_types[c];
}
else
{
- mt[c+mt_count] = media_types[c];
+ mt[c] = media_types[c];
}
}
- mt_count += media_count;
+ }
+ 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"),
+ _("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_this, p_sys, 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
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();
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 )
+ 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 );
}
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;
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);
- if( p_devicename && *p_devicename == string(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();
+ 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 == devname )
{
/* Bind Moniker to a filter object */
hr = p_moniker->BindToObject( 0, 0, IID_IBaseFilter,
}
p_class_enum->Release();
+
+ if( p_listdevices ) {
+ devicelist.sort();
+ *p_listdevices = devicelist;
+ }
return NULL;
}
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 !");
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 )) )
+ {
+ int piCount, piSize;
+ if( SUCCEEDED(pSC->GetNumberOfCapabilities(&piCount, &piSize)) )
+ {
+ BYTE *pSCC= (BYTE *)CoTaskMemAlloc(piSize);
+ if( NULL != pSCC )
+ {
+ int i_priority = -1;
+ for( int i=0; i<piCount; ++i )
+ {
+ if( SUCCEEDED(pSC->GetStreamCaps(i, &p_mt, pSCC)) )
+ {
+ int i_current_fourcc = GetFourCCFromMediaType( *p_mt );
+ int i_current_priority = GetFourCCPriority(i_current_fourcc);
+
+ if( (i_fourcc && (i_current_fourcc != i_fourcc))
+ || (i_priority > i_current_priority) )
+ {
+ // unwanted chroma, try next media type
+ FreeMediaType( *p_mt );
+ CoTaskMemFree( (PVOID)p_mt );
+ continue;
+ }
+
+ if( MEDIATYPE_Video == p_mt->majortype
+ && FORMAT_VideoInfo == p_mt->formattype )
+ {
+ VIDEO_STREAM_CONFIG_CAPS *pVSCC = reinterpret_cast<VIDEO_STREAM_CONFIG_CAPS*>(pSCC);
+ VIDEOINFOHEADER *pVih = reinterpret_cast<VIDEOINFOHEADER*>(p_mt->pbFormat);
+
+ 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;
+ }
+
+ 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;
+ }
+
+ 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;
+ }
+
+ // 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);
+
+ // no cropping, use full video input buffer
+ memset(&(pVih->rcSource), 0, sizeof(RECT));
+ memset(&(pVih->rcTarget), 0, sizeof(RECT));
+
+ // 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<AUDIO_STREAM_CONFIG_CAPS*>(pSCC);
+ WAVEFORMATEX *pWfx = reinterpret_cast<WAVEFORMATEX*>(p_mt->pbFormat);
+
+ 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();
+ }
+
+ /*
+ ** Probe pin for available medias (may be a previously configured one)
+ */
+
+ if( FAILED( p_output_pin->EnumMediaTypes( &p_enummt ) ) )
{
p_output_pin->Release();
continue;
}
- AM_MEDIA_TYPE *p_mt;
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 )
+ if( i_current_fourcc && p_mt->majortype == MEDIATYPE_Video
+ && p_mt->formattype == FORMAT_VideoInfo )
{
- int i_current_width = p_mt->pbFormat ?
- ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biWidth :0;
- int i_current_height = p_mt->pbFormat ?
- ((VIDEOINFOHEADER *)p_mt->pbFormat)->bmiHeader.biHeight :0;
+ 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;
+ i_current_height = -i_current_height;
msg_Dbg( p_this, "EnumDeviceCaps: input pin "
- "accepts chroma: %4.4s, width:%i, height:%i",
+ "accepts chroma: %4.4s, width:%i, height:%i, fps:%f",
(char *)&i_current_fourcc, i_current_width,
- i_current_height );
+ 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 */
}
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 =
((WAVEFORMATEX *)p_mt->pbFormat)->nChannels;
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: unknown format "
+ 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 );
}
+ 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.
+
+ 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();
}
* 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) */
while( 1 )
{
- if( p_access->b_die || p_access->b_error ) return 0;
+ if( !vlc_object_alive (p_access) || p_access->b_error ) return 0;
/* Get new sample/frame from the elementary stream (blocking). */
vlc_mutex_lock( &p_sys->lock );
/*
* We got our sample
*/
- i_data_size = sample.p_sample->GetActualDataLength();
- sample.p_sample->GetPointer( &p_data );
+ block_t *p_block;
+ uint8_t *p_data;
+ int i_data_size = sample.p_sample->GetActualDataLength();
-#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 );
-
- 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 );
+ vlc_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 */
}
/* Try to grab a video sample */
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 )
+ for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
- break;
+ 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;
+ }
}
}
{
/* Use our data timestamp */
i_pts = sample.i_timestamp;
- p_stream->b_pts = VLC_TRUE;
+ p_stream->b_pts = true;
}
}
i_pts /= 10; /* Dshow works with 100 nano-seconds resolution */
#if 0
- msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: "I64Fd,
+ 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_vlc->pf_memcpy( p_block->p_buffer, p_data, 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();
*****************************************************************************/
static int AccessControl( access_t *p_access, int i_query, va_list args )
{
- vlc_bool_t *pb_bool;
+ bool *pb_bool;
int *pi_int;
int64_t *pi_64;
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;
/* */
****************************************************************************/
static int DemuxControl( demux_t *p_demux, int i_query, va_list args )
{
- vlc_bool_t *pb;
+ 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:
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 )
/* 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<char *>(p_item->ppsz_list[i]) );
+ free( const_cast<char *>(p_item->ppsz_list_text[i]) );
}
/* TODO: Remove when no more needed */
p_item->ppsz_list[i] = NULL;
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;
/* 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( !strcmp( psz_name, "dshow-adev" ) ) b_audio = true;
string devicename;
if( p_device_filter )
{
ShowPropertyPage( p_device_filter );
+ p_device_filter->Release();
}
else
{
}
static void ShowDeviceProperties( vlc_object_t *p_this,
- ICaptureGraphBuilder2 *p_capture_graph,
+ ICaptureGraphBuilder2 *p_graph,
IBaseFilter *p_device_filter,
- vlc_bool_t b_audio )
+ bool b_audio )
{
HRESULT hr;
- msg_Dbg( p_this, "Configuring Device Properties" );
+ msg_Dbg( p_this, "configuring Device Properties" );
/*
* Video or audio capture filter page
/*
* Audio capture pin
*/
- if( p_capture_graph && b_audio )
+ if( p_graph && b_audio )
{
IAMStreamConfig *p_SC;
- msg_Dbg( p_this, "Showing WDM Audio Configuration Pages" );
+ msg_Dbg( p_this, "showing WDM Audio Configuration Pages" );
- hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
- &MEDIATYPE_Audio, p_device_filter,
- IID_IAMStreamConfig,
- (void **)&p_SC );
+ hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
+ &MEDIATYPE_Audio, p_device_filter,
+ IID_IAMStreamConfig, (void **)&p_SC );
if( SUCCEEDED(hr) )
{
ShowPropertyPage(p_SC);
* TV Audio filter
*/
IAMTVAudio *p_TVA;
- HRESULT 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) )
/*
* Video capture pin
*/
- if( p_capture_graph && !b_audio )
+ if( p_graph && !b_audio )
{
IAMStreamConfig *p_SC;
- msg_Dbg( p_this, "Showing WDM Video Configuration Pages" );
+ msg_Dbg( p_this, "showing WDM Video Configuration Pages" );
- hr = p_capture_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
- &MEDIATYPE_Interleaved,
- p_device_filter,
- IID_IAMStreamConfig,
- (void **)&p_SC );
+ hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
+ &MEDIATYPE_Interleaved, 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_Video, p_device_filter,
+ IID_IAMStreamConfig, (void **)&p_SC );
+ }
+
+ if( FAILED(hr) )
+ {
+ hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
+ &MEDIATYPE_Stream, p_device_filter,
+ IID_IAMStreamConfig, (void **)&p_SC );
}
if( SUCCEEDED(hr) )
}
static void ShowTunerProperties( vlc_object_t *p_this,
- ICaptureGraphBuilder2 *p_capture_graph,
+ ICaptureGraphBuilder2 *p_graph,
IBaseFilter *p_device_filter,
- vlc_bool_t b_audio )
+ bool b_audio )
{
HRESULT hr;
- msg_Dbg( p_this, "Configuring Tuner Properties" );
+ msg_Dbg( p_this, "configuring Tuner Properties" );
+
+ if( !p_graph || b_audio ) return;
- if( p_capture_graph && !b_audio )
+ IAMTVTuner *p_TV;
+ hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
+ &MEDIATYPE_Interleaved, p_device_filter,
+ IID_IAMTVTuner, (void **)&p_TV );
+ if( FAILED(hr) )
{
- 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 );
- }
+ hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
+ &MEDIATYPE_Video, p_device_filter,
+ IID_IAMTVTuner, (void **)&p_TV );
+ }
- if( SUCCEEDED(hr) )
- {
- ShowPropertyPage(p_TV);
- p_TV->Release();
- }
+ if( FAILED(hr) )
+ {
+ hr = p_graph->FindInterface( &PIN_CATEGORY_CAPTURE,
+ &MEDIATYPE_Stream, p_device_filter,
+ IID_IAMTVTuner, (void **)&p_TV );
+ }
+
+ if( SUCCEEDED(hr) )
+ {
+ ShowPropertyPage(p_TV);
+ p_TV->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;
+
+ if( !p_graph ) return;
+
+ 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();
+}
projects / vlc / blobdiff