Skip to content

V
vlc
Commit a75d76c1 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/access/dshow/*: fixes and optimizations. Also changed all the... 

* modules/access/dshow/*: fixes and optimizations. Also changed all the parameters into config options.
parent d20e5f41
Show whitespace changes
Inline Side-by-side
Showing with 392 additions and 357 deletions
modules/access/dshow/dshow.cpp
View file @ a75d76c1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* dshow.cpp : DirectShow access module for vlc * dshow.cpp : DirectShow access module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: dshow.cpp,v 1.9 2003/09/21 10:23:59 gbazin Exp $ * $Id: dshow.cpp,v 1.10 2003/10/18 20:09:23 gbazin Exp $
* *
* Author: Gildas Bazin <gbazin@netcourrier.com> * Author: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -49,9 +49,16 @@ static int OpenDevice( input_thread_t *, string, vlc_bool_t ); ...@@ -49,9 +49,16 @@ static int OpenDevice( input_thread_t *, string, vlc_bool_t );
static IBaseFilter *FindCaptureDevice( vlc_object_t *, string *, static IBaseFilter *FindCaptureDevice( vlc_object_t *, string *,
list<string> *, vlc_bool_t ); list<string> *, vlc_bool_t );
static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *, IBaseFilter *, static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *, IBaseFilter *,
vlc_bool_t, int, int, int ); int, int, int, int, int, int );
static bool ConnectFilters( IFilterGraph *, IBaseFilter *, IPin * ); static bool ConnectFilters( IFilterGraph *, IBaseFilter *, IPin * );
#if 0
/* Debug only, use this to find out GUIDs */
unsigned char p_st[];
UuidToString( (IID *)&IID_IAMBufferNegotiation, &p_st );
msg_Err( p_input, "BufferNegotiation: %s" , p_st );
#endif
/***************************************************************************** /*****************************************************************************
* Module descriptior * Module descriptior
*****************************************************************************/ *****************************************************************************/
...@@ -59,12 +66,36 @@ static bool ConnectFilters( IFilterGraph *, IBaseFilter *, IPin * ); ...@@ -59,12 +66,36 @@ static bool ConnectFilters( IFilterGraph *, IBaseFilter *, IPin * );
#define CACHING_LONGTEXT N_( \ #define CACHING_LONGTEXT N_( \
"Allows you to modify the default caching value for directshow streams. " \ "Allows you to modify the default caching value for directshow streams. " \
"This value should be set in miliseconds units." ) "This value should be set in miliseconds units." )
#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 " \
"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 " \
"DirectShow plugin. If you don't specify anything, the default device " \
"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 " \
"DirectShow plugin. If you don't specify anything the default size for " \
"your device will be used.")
#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...)")
vlc_module_begin(); vlc_module_begin();
set_description( _("DirectShow input") ); set_description( _("DirectShow input") );
add_category_hint( N_("dshow"), NULL, VLC_TRUE ); add_category_hint( N_("dshow"), NULL, VLC_TRUE );
add_integer( "dshow-caching", DEFAULT_PTS_DELAY / 1000, NULL, add_integer( "dshow-caching", (mtime_t)(0.2*CLOCK_FREQ) / 1000, NULL,
CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE ); CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_string( "dshow-vdev", NULL, NULL, VDEV_TEXT, VDEV_LONGTEXT, VLC_FALSE);
add_string( "dshow-adev", NULL, NULL, ADEV_TEXT, ADEV_LONGTEXT, VLC_FALSE);
add_string( "dshow-size", NULL, NULL, SIZE_TEXT, SIZE_LONGTEXT, VLC_FALSE);
add_string( "dshow-chroma", NULL, NULL, CHROMA_TEXT, CHROMA_LONGTEXT,
VLC_TRUE );
add_shortcut( "dshow" ); add_shortcut( "dshow" );
set_capability( "access", 0 ); set_capability( "access", 0 );
set_callbacks( AccessOpen, AccessClose ); set_callbacks( AccessOpen, AccessClose );
...@@ -135,10 +166,7 @@ typedef struct dshow_stream_t ...@@ -135,10 +166,7 @@ typedef struct dshow_stream_t
} header; } header;
VLCMediaSample sample; vlc_bool_t b_pts;
int i_data_size;
int i_data_pos;
uint8_t *p_data;
} dshow_stream_t; } dshow_stream_t;
...@@ -147,6 +175,9 @@ typedef struct dshow_stream_t ...@@ -147,6 +175,9 @@ typedef struct dshow_stream_t
****************************************************************************/ ****************************************************************************/
struct access_sys_t struct access_sys_t
{ {
vlc_mutex_t lock;
vlc_cond_t wait;
IFilterGraph *p_graph; IFilterGraph *p_graph;
IMediaControl *p_control; IMediaControl *p_control;
...@@ -173,130 +204,72 @@ static int AccessOpen( vlc_object_t *p_this ) ...@@ -173,130 +204,72 @@ static int AccessOpen( vlc_object_t *p_this )
{ {
input_thread_t *p_input = (input_thread_t *)p_this; input_thread_t *p_input = (input_thread_t *)p_this;
access_sys_t *p_sys; access_sys_t *p_sys;
vlc_value_t val;
/* parse url and open device(s) */ /* Get/parse options and open device(s) */
char *psz_dup, *psz_parser;
psz_dup = strdup( p_input->psz_name );
psz_parser = psz_dup;
string vdevname, adevname; string vdevname, adevname;
int i_width = 0, i_height = 0, i_chroma = VLC_FOURCC('I','4','2','0'); int i_width = 0, i_height = 0, i_chroma = VLC_FOURCC('I','4','2','0');
while( *psz_parser && *psz_parser != ':' ) var_Create( p_input, "dshow-vdev", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
{ var_Get( p_input, "dshow-vdev", &val );
psz_parser++; if( val.psz_string ) vdevname = string( val.psz_string );
} if( val.psz_string ) free( val.psz_string );
if( *psz_parser == ':' )
{
/* read options */
for( ;; )
{
int i_len;
*psz_parser++ = '\0';
if( !strncmp( psz_parser, "vdev=", strlen( "vdev=" ) ) )
{
psz_parser += strlen( "vdev=" );
if( strchr( psz_parser, ':' ) )
{
i_len = strchr( psz_parser, ':' ) - psz_parser;
}
else
{
i_len = strlen( psz_parser );
}
vdevname = string( psz_parser, i_len );
psz_parser += i_len;
}
else if( !strncmp( psz_parser, "adev=", strlen( "adev=" ) ) )
{
psz_parser += strlen( "adev=" );
if( strchr( psz_parser, ':' ) )
{
i_len = strchr( psz_parser, ':' ) - psz_parser;
}
else
{
i_len = strlen( psz_parser );
}
adevname = string( psz_parser, i_len ); var_Create( p_input, "dshow-adev", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Get( p_input, "dshow-adev", &val );
if( val.psz_string ) adevname = string( val.psz_string );
if( val.psz_string ) free( val.psz_string );
psz_parser += i_len; var_Create( p_input, "dshow-size", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
} var_Get( p_input, "dshow-size", &val );
else if( !strncmp( psz_parser, "size=", strlen( "size=" ) ) ) if( val.psz_string && *val.psz_string )
{ {
psz_parser += strlen( "size=" ); if( !strcmp( val.psz_string, "subqcif" ) )
if( !strncmp( psz_parser, "subqcif", strlen( "subqcif" ) ) )
{ {
i_width = 128; i_width = 128; i_height = 96;
i_height = 96;
} }
else if( !strncmp( psz_parser, "qsif", strlen( "qsif" ) ) ) else if( !strcmp( val.psz_string, "qsif" ) )
{ {
i_width = 160; i_width = 160; i_height = 120;
i_height = 120;
} }
else if( !strncmp( psz_parser, "qcif", strlen( "qcif" ) ) ) else if( !strcmp( val.psz_string, "qcif" ) )
{ {
i_width = 176; i_width = 176; i_height = 144;
i_height = 144;
} }
else if( !strncmp( psz_parser, "sif", strlen( "sif" ) ) ) else if( !strcmp( val.psz_string, "sif" ) )
{ {
i_width = 320; i_width = 320; i_height = 240;
i_height = 240;
} }
else if( !strncmp( psz_parser, "cif", strlen( "cif" ) ) ) else if( !strcmp( val.psz_string, "cif" ) )
{ {
i_width = 352; i_width = 352; i_height = 288;
i_height = 288;
} }
else if( !strncmp( psz_parser, "vga", strlen( "vga" ) ) ) else if( !strcmp( val.psz_string, "vga" ) )
{ {
i_width = 640; i_width = 640; i_height = 480;
i_height = 480;
} }
else else
{ {
/* widthxheight */ /* Width x Height */
i_width = strtol( psz_parser, &psz_parser, 0 ); char *psz_parser;
i_width = strtol( val.psz_string, &psz_parser, 0 );
if( *psz_parser == 'x' || *psz_parser == 'X') if( *psz_parser == 'x' || *psz_parser == 'X')
{ {
i_height = strtol( psz_parser + 1, &psz_parser, 0 ); i_height = strtol( psz_parser + 1, &psz_parser, 0 );
} }
msg_Dbg( p_input, "WidthxHeight %dx%d", i_width, i_height ); msg_Dbg( p_input, "Width x Height %dx%d", i_width, i_height );
}
}
else if( !strncmp( psz_parser, "chroma=", strlen( "chroma=" ) ) )
{
psz_parser += strlen( "chroma=" );
if( strlen( psz_parser ) >= 4 )
{
i_chroma = VLC_FOURCC( psz_parser[0],psz_parser[1],
psz_parser[2],psz_parser[3] );
}
} }
else
{
msg_Warn( p_input, "unknown option" );
} }
if( val.psz_string ) free( val.psz_string );
while( *psz_parser && *psz_parser != ':' ) var_Create( p_input, "dshow-chroma", VLC_VAR_STRING | VLC_VAR_DOINHERIT);
var_Get( p_input, "dshow-chroma", &val );
if( val.psz_string && strlen( val.psz_string ) >= 4 )
{ {
psz_parser++; i_chroma = VLC_FOURCC( val.psz_string[0], val.psz_string[1],
val.psz_string[2], val.psz_string[3] );
} }
if( val.psz_string ) free( val.psz_string );
if( *psz_parser == '\0' )
{
break;
}
}
}
free( psz_dup );
p_input->pf_read = Read; p_input->pf_read = Read;
p_input->pf_seek = NULL; p_input->pf_seek = NULL;
...@@ -310,7 +283,10 @@ static int AccessOpen( vlc_object_t *p_this ) ...@@ -310,7 +283,10 @@ static int AccessOpen( vlc_object_t *p_this )
p_input->stream.p_selected_area->i_tell = 0; p_input->stream.p_selected_area->i_tell = 0;
p_input->stream.i_method = INPUT_METHOD_FILE; p_input->stream.i_method = INPUT_METHOD_FILE;
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
p_input->i_pts_delay = config_GetInt( p_input, "dshow-caching" ) * 1000;
var_Create( p_input, "dshow-caching", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT);
var_Get( p_input, "dshow-caching", &val );
p_input->i_pts_delay = val.i_int * 1000;
/* Initialize OLE/COM */ /* Initialize OLE/COM */
CoInitializeEx( 0, COINIT_APARTMENTTHREADED ); CoInitializeEx( 0, COINIT_APARTMENTTHREADED );
...@@ -367,7 +343,10 @@ static int AccessOpen( vlc_object_t *p_this ) ...@@ -367,7 +343,10 @@ static int AccessOpen( vlc_object_t *p_this )
/* Initialize some data */ /* Initialize some data */
p_sys->i_current_stream = 0; p_sys->i_current_stream = 0;
p_sys->i_header_pos = 0; p_input->i_mtu += p_sys->i_header_size + 16 /* data header size */;
vlc_mutex_init( p_input, &p_sys->lock );
vlc_cond_init( p_input, &p_sys->wait );
/* Everything is ready. Let's rock baby */ /* Everything is ready. Let's rock baby */
p_sys->p_control->Run(); p_sys->p_control->Run();
...@@ -390,10 +369,10 @@ static void AccessClose( vlc_object_t *p_this ) ...@@ -390,10 +369,10 @@ static void AccessClose( vlc_object_t *p_this )
/* Remove filters from graph */ /* Remove filters from graph */
for( int i = 0; i < p_sys->i_streams; i++ ) for( int i = 0; i < p_sys->i_streams; i++ )
{ {
p_sys->p_graph->RemoveFilter( p_sys->pp_streams[i]->p_device_filter );
p_sys->p_graph->RemoveFilter( p_sys->pp_streams[i]->p_capture_filter ); p_sys->p_graph->RemoveFilter( p_sys->pp_streams[i]->p_capture_filter );
p_sys->pp_streams[i]->p_device_filter->Release(); p_sys->p_graph->RemoveFilter( p_sys->pp_streams[i]->p_device_filter );
p_sys->pp_streams[i]->p_capture_filter->Release(); p_sys->pp_streams[i]->p_capture_filter->Release();
p_sys->pp_streams[i]->p_device_filter->Release();
} }
p_sys->p_graph->Release(); p_sys->p_graph->Release();
...@@ -467,8 +446,9 @@ static int OpenDevice( input_thread_t *p_input, string devicename, ...@@ -467,8 +446,9 @@ static int OpenDevice( input_thread_t *p_input, string devicename,
} }
AM_MEDIA_TYPE media_type = AM_MEDIA_TYPE media_type =
EnumDeviceCaps( (vlc_object_t *)p_input, p_device_filter, b_audio, EnumDeviceCaps( (vlc_object_t *)p_input, p_device_filter,
p_sys->i_chroma, p_sys->i_width, p_sys->i_height ); p_sys->i_chroma, p_sys->i_width, p_sys->i_height,
0, 0, 0 );
/* Create and add our capture filter */ /* Create and add our capture filter */
CaptureFilter *p_capture_filter = new CaptureFilter( p_input, media_type ); CaptureFilter *p_capture_filter = new CaptureFilter( p_input, media_type );
...@@ -486,6 +466,7 @@ static int OpenDevice( input_thread_t *p_input, string devicename, ...@@ -486,6 +466,7 @@ static int OpenDevice( input_thread_t *p_input, string devicename,
/* Success */ /* Success */
dshow_stream_t dshow_stream; dshow_stream_t dshow_stream;
dshow_stream.b_invert = VLC_FALSE; dshow_stream.b_invert = VLC_FALSE;
dshow_stream.b_pts = VLC_FALSE;
dshow_stream.mt = dshow_stream.mt =
p_capture_filter->CustomGetPin()->CustomGetMediaType(); p_capture_filter->CustomGetPin()->CustomGetMediaType();
...@@ -568,6 +549,11 @@ static int OpenDevice( input_thread_t *p_input, string devicename, ...@@ -568,6 +549,11 @@ static int OpenDevice( input_thread_t *p_input, string devicename,
SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 12], i_height ); SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 12], i_height );
SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 16], 0 ); SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 16], 0 );
p_sys->i_header_pos = p_sys->i_header_size; p_sys->i_header_pos = p_sys->i_header_size;
/* Greatly simplifies the reading routine */
int i_mtu = dshow_stream.header.video.bmiHeader.biWidth *
dshow_stream.header.video.bmiHeader.biHeight * 4;
p_input->i_mtu = __MAX(p_input->i_mtu,i_mtu);
} }
else if( dshow_stream.mt.majortype == MEDIATYPE_Audio && else if( dshow_stream.mt.majortype == MEDIATYPE_Audio &&
...@@ -577,10 +563,8 @@ static int OpenDevice( input_thread_t *p_input, string devicename, ...@@ -577,10 +563,8 @@ static int OpenDevice( input_thread_t *p_input, string devicename,
if( dshow_stream.mt.subtype == MEDIASUBTYPE_PCM ) if( dshow_stream.mt.subtype == MEDIASUBTYPE_PCM )
dshow_stream.i_fourcc = VLC_FOURCC( 'a', 'r', 'a', 'w' ); dshow_stream.i_fourcc = VLC_FOURCC( 'a', 'r', 'a', 'w' );
#if 0
else if( dshow_stream.mt.subtype == MEDIASUBTYPE_IEEE_FLOAT ) else if( dshow_stream.mt.subtype == MEDIASUBTYPE_IEEE_FLOAT )
dshow_stream.i_fourcc = VLC_FOURCC( 'f', 'l', '3', '2' ); dshow_stream.i_fourcc = VLC_FOURCC( 'f', 'l', '3', '2' );
#endif
else goto fail; else goto fail;
dshow_stream.header.audio = dshow_stream.header.audio =
...@@ -600,13 +584,35 @@ static int OpenDevice( input_thread_t *p_input, string devicename, ...@@ -600,13 +584,35 @@ static int OpenDevice( input_thread_t *p_input, string devicename,
SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 16], SetDWBE( &p_sys->p_header[p_sys->i_header_pos + 16],
dshow_stream.header.audio.wBitsPerSample ); dshow_stream.header.audio.wBitsPerSample );
p_sys->i_header_pos = p_sys->i_header_size; p_sys->i_header_pos = p_sys->i_header_size;
/* Greatly simplifies the reading routine */
IAMBufferNegotiation *p_ambuf;
IPin *p_pin;
int i_mtu;
p_capture_filter->CustomGetPin()->ConnectedTo( &p_pin );
if( SUCCEEDED( p_pin->QueryInterface(
IID_IAMBufferNegotiation, (void **)&p_ambuf ) ) )
{
ALLOCATOR_PROPERTIES AllocProp;
memset( &AllocProp, 0, sizeof( ALLOCATOR_PROPERTIES ) );
p_ambuf->GetAllocatorProperties( &AllocProp );
p_ambuf->Release();
i_mtu = AllocProp.cbBuffer;
}
else
{
/* Worst case */
i_mtu = dshow_stream.header.audio.nSamplesPerSec *
dshow_stream.header.audio.nChannels *
dshow_stream.header.audio.wBitsPerSample / 8;
}
p_pin->Release();
p_input->i_mtu = __MAX( p_input->i_mtu, i_mtu );
} }
else goto fail; else goto fail;
/* Add directshow elementary stream to our list */ /* Add directshow elementary stream to our list */
dshow_stream.sample.p_sample = NULL;
dshow_stream.i_data_size = 0;
dshow_stream.i_data_pos = 0;
dshow_stream.p_device_filter = p_device_filter; dshow_stream.p_device_filter = p_device_filter;
dshow_stream.p_capture_filter = p_capture_filter; dshow_stream.p_capture_filter = p_capture_filter;
...@@ -732,8 +738,10 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename, ...@@ -732,8 +738,10 @@ FindCaptureDevice( vlc_object_t *p_this, string *p_devicename,
} }
static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this, static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this,
IBaseFilter *p_filter, vlc_bool_t b_audio, IBaseFilter *p_filter,
int i_chroma, int i_width, int i_height ) int i_chroma, int i_width, int i_height,
int i_channels, int i_samplespersec,
int i_bitspersample )
{ {
IEnumPins *p_enumpins; IEnumPins *p_enumpins;
IPin *p_output_pin; IPin *p_output_pin;
...@@ -752,11 +760,13 @@ static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this, ...@@ -752,11 +760,13 @@ static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this,
/*while*/if( p_enumpins->Next( 1, &p_output_pin, NULL ) == S_OK ) /*while*/if( p_enumpins->Next( 1, &p_output_pin, NULL ) == S_OK )
{ {
/* Probe pin */ /* Probe pin */
if( !b_audio && if( SUCCEEDED( p_output_pin->EnumMediaTypes( &p_enummt ) ) )
SUCCEEDED( p_output_pin->EnumMediaTypes( &p_enummt ) ) )
{ {
AM_MEDIA_TYPE *p_mt; AM_MEDIA_TYPE *p_mt;
while( p_enummt->Next( 1, &p_mt, NULL ) == S_OK ) while( p_enummt->Next( 1, &p_mt, NULL ) == S_OK )
{
if( p_mt->majortype == MEDIATYPE_Video )
{ {
int i_fourcc = VLC_FOURCC(' ', ' ', ' ', ' '); int i_fourcc = VLC_FOURCC(' ', ' ', ' ', ' ');
...@@ -789,25 +799,80 @@ static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this, ...@@ -789,25 +799,80 @@ static AM_MEDIA_TYPE EnumDeviceCaps( vlc_object_t *p_this,
(char *)&i_fourcc, i_current_width, (char *)&i_fourcc, i_current_width,
i_current_height ); i_current_height );
if( i_fourcc == i_chroma ) if( (!i_chroma || i_fourcc == i_chroma) &&
(!i_width || i_width == i_current_width) &&
(!i_height || i_height == i_current_height) )
{ {
media_type.subtype = p_mt->subtype; /* Pick the 1st match */
media_type = *p_mt;
i_chroma = i_fourcc;
i_width = i_current_width;
i_height = i_current_height;
} }
else
if( i_fourcc == i_chroma && p_mt->pbFormat &&
i_width && i_height && i_width == i_current_width &&
i_height == i_current_height )
{ {
FreeMediaType( *p_mt );
}
}
else if( p_mt->majortype == MEDIATYPE_Audio )
{
int i_fourcc;
int i_current_channels =
((WAVEFORMATEX *)p_mt->pbFormat)->nChannels;
int i_current_samplespersec =
((WAVEFORMATEX *)p_mt->pbFormat)->nSamplesPerSec;
int i_current_bitspersample =
((WAVEFORMATEX *)p_mt->pbFormat)->wBitsPerSample;
if( p_mt->subtype == MEDIASUBTYPE_PCM )
i_fourcc = VLC_FOURCC( 'p', 'c', 'm', ' ' );
else i_fourcc = *((int *)&p_mt->subtype);
msg_Dbg( p_this, "EnumDeviceCaps: input pin "
"accepts format: %4.4s, channels:%i, "
"samples/sec:%i bits/sample:%i",
(char *)&i_fourcc, i_current_channels,
i_current_samplespersec, i_current_bitspersample);
if( (!i_channels || i_channels == i_current_channels) &&
(!i_samplespersec ||
i_samplespersec == i_current_samplespersec) &&
(!i_bitspersample ||
i_bitspersample == i_current_bitspersample) )
{
/* Pick the 1st match */
media_type = *p_mt; media_type = *p_mt;
i_channels = i_current_channels;
i_samplespersec = i_current_samplespersec;
i_bitspersample = i_current_bitspersample;
/* Setup a few properties like the audio latency */
IAMBufferNegotiation *p_ambuf;
if( SUCCEEDED( p_output_pin->QueryInterface(
IID_IAMBufferNegotiation, (void **)&p_ambuf ) ) )
{
ALLOCATOR_PROPERTIES AllocProp;
AllocProp.cbAlign = -1;
AllocProp.cbBuffer = i_channels * i_samplespersec *
i_bitspersample / 8 / 10 ; /*100 ms of latency*/
AllocProp.cbPrefix = -1;
AllocProp.cBuffers = -1;
p_ambuf->SuggestAllocatorProperties( &AllocProp );
p_ambuf->Release();
}
} }
else else
{ {
FreeMediaType( *p_mt ); FreeMediaType( *p_mt );
} }
}
CoTaskMemFree( (PVOID)p_mt ); CoTaskMemFree( (PVOID)p_mt );
} }
p_enummt->Release(); p_enummt->Release();
} }
p_output_pin->Release(); p_output_pin->Release();
} }
...@@ -825,45 +890,106 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, ...@@ -825,45 +890,106 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer,
size_t i_len ) size_t i_len )
{ {
access_sys_t *p_sys = p_input->p_access_data; access_sys_t *p_sys = p_input->p_access_data;
dshow_stream_t *p_stream = p_sys->pp_streams[p_sys->i_current_stream]; dshow_stream_t *p_stream = NULL;
int i_data = 0; byte_t *p_buf_orig = p_buffer;
VLCMediaSample sample;
int i_data_size;
uint8_t *p_data;
#if 0 if( p_sys->i_header_pos )
msg_Info( p_input, "access read data_size %i, data_pos %i", {
p_sys->i_data_size, p_sys->i_data_pos ); /* First header of the stream */
#endif memcpy( p_buffer, p_sys->p_header, p_sys->i_header_size );
p_buffer += p_sys->i_header_size;
p_sys->i_header_pos = 0;
}
while( 1 )
{
/* Get new sample/frame from next elementary stream.
* We first loop through all the elementary streams and if all our
* fifos are empty we block until we are signaled some new data has
* arrived. */
vlc_mutex_lock( &p_sys->lock );
while( i_len > 0 ) int i_stream;
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
p_stream = p_sys->pp_streams[i_stream];
if( p_stream->mt.majortype == MEDIATYPE_Audio &&
p_stream->p_capture_filter &&
p_stream->p_capture_filter->CustomGetPin()
->CustomGetSample( &sample ) == S_OK )
{
break;
}
}
if( i_stream == p_sys->i_streams )
for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
{
p_stream = p_sys->pp_streams[i_stream];
if( p_stream->p_capture_filter &&
p_stream->p_capture_filter->CustomGetPin()
->CustomGetSample( &sample ) == S_OK )
{ {
/* First copy header if any */ break;
if( i_len > 0 && p_sys->i_header_pos < p_sys->i_header_size ) }
}
if( i_stream == p_sys->i_streams )
{ {
int i_copy; /* No data available. Wait until some data has arrived */
vlc_cond_wait( &p_sys->wait, &p_sys->lock );
vlc_mutex_unlock( &p_sys->lock );
continue;
}
i_copy = __MIN( p_sys->i_header_size - vlc_mutex_unlock( &p_sys->lock );
p_sys->i_header_pos, (int)i_len );
memcpy( p_buffer, &p_sys->p_header[p_sys->i_header_pos], i_copy );
p_sys->i_header_pos += i_copy;
p_buffer += i_copy; /*
i_len -= i_copy; * We got our sample
i_data += i_copy; */
} i_data_size = sample.p_sample->GetActualDataLength();
sample.p_sample->GetPointer( &p_data );
/* Then copy stream data if any */ REFERENCE_TIME i_pts, i_end_date;
if( i_len > 0 && p_stream->i_data_pos < p_stream->i_data_size ) 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 )
{ {
int i_copy = __MIN( p_stream->i_data_size - /* Use our data timestamp */
p_stream->i_data_pos, (int)i_len ); i_pts = sample.i_timestamp;
p_stream->b_pts = VLC_TRUE;
}
}
#if 0
msg_Dbg( p_input, "Read() stream: %i PTS: "I64Fd, i_stream, i_pts );
#endif
/* Create pseudo header */
SetDWBE( &p_sys->p_header[0], i_stream );
SetDWBE( &p_sys->p_header[4], i_data_size );
SetQWBE( &p_sys->p_header[8], i_pts * 9 / 1000 );
#if 0
msg_Info( p_input, "access read %i data_size %i", i_len, i_data_size );
#endif
/* First copy header */
memcpy( p_buffer, p_sys->p_header, 16 /* header size */ );
p_buffer += 16 /* header size */;
/* Then copy stream data if any */
if( !p_stream->b_invert ) if( !p_stream->b_invert )
{ {
p_input->p_vlc->pf_memcpy( p_buffer, p_input->p_vlc->pf_memcpy( p_buffer, p_data, i_data_size );
&p_stream->p_data[p_stream->i_data_pos], i_copy ); p_buffer += i_data_size;
} }
else else
{ {
int i_copied;
int i_width = p_stream->header.video.bmiHeader.biWidth; int i_width = p_stream->header.video.bmiHeader.biWidth;
int i_height = p_stream->header.video.bmiHeader.biHeight; int i_height = p_stream->header.video.bmiHeader.biHeight;
...@@ -882,114 +1008,22 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer, ...@@ -882,114 +1008,22 @@ static ssize_t Read( input_thread_t * p_input, byte_t * p_buffer,
break; break;
} }
int i_line_pos = i_height - 1 - p_stream->i_data_pos / i_width; for( int i = i_height - 1; i >= 0; i-- )
int i_offset = p_stream->i_data_pos % i_width;
i_copied = __MIN( i_width - i_offset, i_copy );
/* copy already started line if any */
if( i_copied )
{ {
memcpy( p_buffer, p_input->p_vlc->pf_memcpy( p_buffer,
&p_stream->p_data[i_line_pos * i_width + i_offset], &p_data[i * i_width], i_width );
i_copied );
p_stream->i_data_pos += i_copied;
p_buffer += i_copied;
i_len -= i_copied;
i_data += i_copied;
i_copy -= i_copied;
}
/* The caller got what he wanted */
if( i_len <= 0 ) return i_data;
i_line_pos = i_height - 1 - p_stream->i_data_pos / i_width;
i_copied = i_copy / i_width;
while( i_copied )
{
memcpy( p_buffer, &p_stream->p_data[i_line_pos * i_width],
i_width );
p_stream->i_data_pos += i_width;
p_buffer += i_width; p_buffer += i_width;
i_len -= i_width;
i_data += i_width;
i_copy -= i_width;
i_line_pos--;
i_copied--;
}
/* copy left over if any */
if( i_copy )
{
memcpy( p_buffer, &p_stream->p_data[i_line_pos * i_width],
i_copy );
} }
} }
p_stream->i_data_pos += i_copy; sample.p_sample->Release();
p_buffer += i_copy;
i_len -= i_copy;
i_data += i_copy;
}
/* The caller got what he wanted */ /* The caller got what he wanted */
if( i_len <= 0 ) return i_data; return p_buffer - p_buf_orig;
/* Read no more than one frame at a time, otherwise we kill latency */
if( p_stream->i_data_size && i_data &&
p_stream->i_data_pos == p_stream->i_data_size )
{
p_stream->i_data_pos = p_stream->i_data_size = 0;
return i_data;
} }
/* Get new sample/frame from next stream */ return 0; /* never reached */
if( p_stream->sample.p_sample )
{
p_stream->sample.p_sample->Release();
p_stream->sample.p_sample = NULL;
}
p_sys->i_current_stream =
(p_sys->i_current_stream + 1) % p_sys->i_streams;
p_stream = p_sys->pp_streams[p_sys->i_current_stream];
if( p_stream->p_capture_filter &&
p_stream->p_capture_filter->CustomGetPin()
->CustomGetSample( &p_stream->sample ) == S_OK )
{
p_stream->i_data_pos = 0;
p_stream->i_data_size =
p_stream->sample.p_sample->GetActualDataLength();
p_stream->sample.p_sample->GetPointer( &p_stream->p_data );
REFERENCE_TIME i_pts, i_end_date;
HRESULT hr =
p_stream->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 )
{
/* Use our data timestamp */
i_pts = p_stream->sample.i_timestamp;
}
#if 0
msg_Dbg( p_input, "Read() stream: %i PTS: "I64Fd,
p_sys->i_current_stream, i_pts );
#endif
/* Create pseudo header */
p_sys->i_header_size = 16;
p_sys->i_header_pos = 0;
SetDWBE( &p_sys->p_header[0], p_sys->i_current_stream );
SetDWBE( &p_sys->p_header[4], p_stream->i_data_size );
SetQWBE( &p_sys->p_header[8], i_pts * 9 / 1000 );
}
else msleep( 1000 );
}
return i_data;
} }
/**************************************************************************** /****************************************************************************
...@@ -1005,18 +1039,11 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -1005,18 +1039,11 @@ static int DemuxOpen( vlc_object_t *p_this )
data_packet_t *p_pk; data_packet_t *p_pk;
/* Initialize access plug-in structures. */
if( p_input->i_mtu == 0 )
{
/* Improve speed. */
p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE ;
}
/* a little test to see if it's a dshow stream */ /* a little test to see if it's a dshow stream */
if( input_Peek( p_input, &p_peek, 8 ) < 8 ) if( input_Peek( p_input, &p_peek, 8 ) < 8 )
{ {
msg_Warn( p_input, "dshow plugin discarded (cannot peek)" ); msg_Warn( p_input, "dshow plugin discarded (cannot peek)" );
return( VLC_EGENERIC ); return VLC_EGENERIC;
} }
if( strcmp( (const char *)p_peek, ".dsh" ) || if( strcmp( (const char *)p_peek, ".dsh" ) ||
...@@ -1032,13 +1059,13 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -1032,13 +1059,13 @@ static int DemuxOpen( vlc_object_t *p_this )
{ {
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Err( p_input, "cannot init stream" ); msg_Err( p_input, "cannot init stream" );
return( VLC_EGENERIC ); return VLC_EGENERIC;
} }
if( input_AddProgram( p_input, 0, 0) == NULL ) if( input_AddProgram( p_input, 0, 0) == NULL )
{ {
vlc_mutex_unlock( &p_input->stream.stream_lock ); vlc_mutex_unlock( &p_input->stream.stream_lock );
msg_Err( p_input, "cannot add program" ); msg_Err( p_input, "cannot add program" );
return( VLC_EGENERIC ); return VLC_EGENERIC;
} }
p_input->stream.p_selected_program = p_input->stream.pp_programs[0]; p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
...@@ -1049,7 +1076,7 @@ static int DemuxOpen( vlc_object_t *p_this ) ...@@ -1049,7 +1076,7 @@ static int DemuxOpen( vlc_object_t *p_this )
< 8 + 20 * i_streams ) < 8 + 20 * i_streams )
{ {
msg_Err( p_input, "dshow plugin discarded (cannot peek)" ); msg_Err( p_input, "dshow plugin discarded (cannot peek)" );
return( VLC_EGENERIC ); return VLC_EGENERIC;
} }
p_peek += 8; p_peek += 8;
...@@ -1146,16 +1173,13 @@ static int Demux( input_thread_t *p_input ) ...@@ -1146,16 +1173,13 @@ static int Demux( input_thread_t *p_input )
if( input_Peek( p_input, &p_peek, 16 ) < 16 ) if( input_Peek( p_input, &p_peek, 16 ) < 16 )
{ {
msg_Warn( p_input, "cannot peek (EOF ?)" ); msg_Warn( p_input, "cannot peek (EOF ?)" );
return( 0 ); return 0;
} }
i_stream = GetDWBE( &p_peek[0] ); i_stream = GetDWBE( &p_peek[0] );
i_size = GetDWBE( &p_peek[4] ); i_size = GetDWBE( &p_peek[4] );
i_pcr = GetQWBE( &p_peek[8] ); i_pcr = GetQWBE( &p_peek[8] );
//msg_Dbg( p_input, "stream=%d size=%d", i_stream, i_size );
//p_es = input_FindES( p_input, i_stream );
p_es = p_input->stream.p_selected_program->pp_es[i_stream]; p_es = p_input->stream.p_selected_program->pp_es[i_stream];
if( !p_es ) if( !p_es )
{ {
...@@ -1167,7 +1191,7 @@ static int Demux( input_thread_t *p_input ) ...@@ -1167,7 +1191,7 @@ static int Demux( input_thread_t *p_input )
{ {
msg_Warn( p_input, "cannot allocate PES" ); msg_Warn( p_input, "cannot allocate PES" );
msleep( 1000 ); msleep( 1000 );
return( 1 ); return 1;
} }
i_size += 16; i_size += 16;
while( i_size > 0 ) while( i_size > 0 )
...@@ -1175,11 +1199,10 @@ static int Demux( input_thread_t *p_input ) ...@@ -1175,11 +1199,10 @@ static int Demux( input_thread_t *p_input )
data_packet_t *p_data; data_packet_t *p_data;
int i_read; int i_read;
if( (i_read = input_SplitBuffer( p_input, &p_data, if( (i_read = input_SplitBuffer( p_input, &p_data, i_size ) ) <= 0 )
__MIN( i_size, 10000 ) ) ) <= 0 )
{ {
input_DeletePES( p_input->p_method_data, p_pes ); input_DeletePES( p_input->p_method_data, p_pes );
return( 0 ); return 0;
} }
if( !p_pes->p_first ) if( !p_pes->p_first )
{ {
......
modules/access/dshow/filter.cpp
View file @ a75d76c1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* filter.c : DirectShow access module for vlc * filter.c : DirectShow access module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: filter.cpp,v 1.5 2003/08/31 22:06:17 gbazin Exp $ * $Id: filter.cpp,v 1.6 2003/10/18 20:09:23 gbazin Exp $
* *
* Author: Gildas Bazin <gbazin@netcourrier.com> * Author: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -36,6 +36,12 @@ ...@@ -36,6 +36,12 @@
#define DEBUG_DSHOW 1 #define DEBUG_DSHOW 1
struct access_sys_t
{
vlc_mutex_t lock;
vlc_cond_t wait;
};
/***************************************************************************** /*****************************************************************************
* DirectShow GUIDs. * DirectShow GUIDs.
* Easier to define them hear as mingw doesn't provide them all. * Easier to define them hear as mingw doesn't provide them all.
...@@ -59,6 +65,8 @@ const GUID IID_IMemInputPin = {0x56a8689d, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20 ...@@ -59,6 +65,8 @@ const GUID IID_IMemInputPin = {0x56a8689d, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20
const GUID IID_IEnumPins = {0x56a86892, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}}; const GUID IID_IEnumPins = {0x56a86892, 0x0ad4, 0x11ce, {0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70}};
const GUID IID_IEnumMediaTypes = {0x89c31040, 0x846b, 0x11ce, {0x97,0xd3, 0x00,0xaa,0x00,0x55,0x59,0x5a}}; const GUID IID_IEnumMediaTypes = {0x89c31040, 0x846b, 0x11ce, {0x97,0xd3, 0x00,0xaa,0x00,0x55,0x59,0x5a}};
const GUID IID_IAMBufferNegotiation = {0x56ed71a0, 0xaf5f, 0x11d0, {0xb3, 0xf0, 0x00, 0xaa, 0x00, 0x37, 0x61, 0xc5}};
/* /*
* MEDIATYPEs and MEDIASUBTYPEs * MEDIATYPEs and MEDIASUBTYPEs
*/ */
...@@ -92,6 +100,7 @@ const GUID MEDIASUBTYPE_I420 = {0x30323449, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0 ...@@ -92,6 +100,7 @@ const GUID MEDIASUBTYPE_I420 = {0x30323449, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0
const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID MEDIATYPE_Audio = {0x73647561, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
const GUID FORMAT_WaveFormatEx = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}}; const GUID FORMAT_WaveFormatEx = {0x05589f81, 0xc356, 0x11ce, {0xbf, 0x01, 0x00, 0xaa, 0x00, 0x55, 0x59, 0x5a}};
const GUID MEDIASUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}}; const GUID MEDIASUBTYPE_PCM = {0x00000001, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
const GUID MEDIASUBTYPE_IEEE_FLOAT = {0x00000003, 0x0000, 0x0010, {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}};
const GUID GUID_NULL = {0x0000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}}; const GUID GUID_NULL = {0x0000, 0x0000, 0x0000, {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}};
...@@ -196,7 +205,7 @@ STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv) ...@@ -196,7 +205,7 @@ STDMETHODIMP CapturePin::QueryInterface(REFIID riid, void **ppv)
STDMETHODIMP_(ULONG) CapturePin::AddRef() STDMETHODIMP_(ULONG) CapturePin::AddRef()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::AddRef" ); msg_Dbg( p_input, "CapturePin::AddRef (ref: %i)", i_ref );
#endif #endif
return i_ref++; return i_ref++;
...@@ -204,13 +213,12 @@ STDMETHODIMP_(ULONG) CapturePin::AddRef() ...@@ -204,13 +213,12 @@ STDMETHODIMP_(ULONG) CapturePin::AddRef()
STDMETHODIMP_(ULONG) CapturePin::Release() STDMETHODIMP_(ULONG) CapturePin::Release()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::Release" ); msg_Dbg( p_input, "CapturePin::Release (ref: %i)", i_ref );
#endif #endif
i_ref--; if( !InterlockedDecrement(&i_ref) ) delete this;
if( !i_ref ) delete this;
return i_ref; return 0;
}; };
/* IPin methods */ /* IPin methods */
...@@ -397,6 +405,7 @@ STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES *pProps ...@@ -397,6 +405,7 @@ STDMETHODIMP CapturePin::GetAllocatorRequirements( ALLOCATOR_PROPERTIES *pProps
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" ); msg_Dbg( p_input, "CapturePin::GetAllocatorRequirements" );
#endif #endif
return E_NOTIMPL; return E_NOTIMPL;
} }
STDMETHODIMP CapturePin::Receive( IMediaSample *pSample ) STDMETHODIMP CapturePin::Receive( IMediaSample *pSample )
...@@ -408,6 +417,9 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample ) ...@@ -408,6 +417,9 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample )
pSample->AddRef(); pSample->AddRef();
mtime_t i_timestamp = mdate() * 10; mtime_t i_timestamp = mdate() * 10;
VLCMediaSample vlc_sample = {pSample, i_timestamp}; VLCMediaSample vlc_sample = {pSample, i_timestamp};
access_sys_t *p_sys = p_input->p_access_data;
vlc_mutex_lock( &p_sys->lock );
samples_queue.push_front( vlc_sample ); samples_queue.push_front( vlc_sample );
/* Make sure we don't cache too many samples */ /* Make sure we don't cache too many samples */
...@@ -419,6 +431,9 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample ) ...@@ -419,6 +431,9 @@ STDMETHODIMP CapturePin::Receive( IMediaSample *pSample )
vlc_sample.p_sample->Release(); vlc_sample.p_sample->Release();
} }
vlc_cond_signal( &p_sys->wait );
vlc_mutex_unlock( &p_sys->lock );
return S_OK; return S_OK;
} }
STDMETHODIMP CapturePin::ReceiveMultiple( IMediaSample **pSamples, STDMETHODIMP CapturePin::ReceiveMultiple( IMediaSample **pSamples,
...@@ -504,7 +519,7 @@ STDMETHODIMP CaptureFilter::QueryInterface( REFIID riid, void **ppv ) ...@@ -504,7 +519,7 @@ STDMETHODIMP CaptureFilter::QueryInterface( REFIID riid, void **ppv )
STDMETHODIMP_(ULONG) CaptureFilter::AddRef() STDMETHODIMP_(ULONG) CaptureFilter::AddRef()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::AddRef" ); msg_Dbg( p_input, "CaptureFilter::AddRef (ref: %i)", i_ref );
#endif #endif
return i_ref++; return i_ref++;
...@@ -512,13 +527,12 @@ STDMETHODIMP_(ULONG) CaptureFilter::AddRef() ...@@ -512,13 +527,12 @@ STDMETHODIMP_(ULONG) CaptureFilter::AddRef()
STDMETHODIMP_(ULONG) CaptureFilter::Release() STDMETHODIMP_(ULONG) CaptureFilter::Release()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureFilter::Release" ); msg_Dbg( p_input, "CaptureFilter::Release (ref: %i)", i_ref );
#endif #endif
i_ref--; if( !InterlockedDecrement(&i_ref) ) delete this;
if( !i_ref ) delete this;
return i_ref; return 0;
}; };
/* IPersist method */ /* IPersist method */
...@@ -683,7 +697,7 @@ STDMETHODIMP CaptureEnumPins::QueryInterface( REFIID riid, void **ppv ) ...@@ -683,7 +697,7 @@ STDMETHODIMP CaptureEnumPins::QueryInterface( REFIID riid, void **ppv )
STDMETHODIMP_(ULONG) CaptureEnumPins::AddRef() STDMETHODIMP_(ULONG) CaptureEnumPins::AddRef()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureEnumPins::AddRef" ); msg_Dbg( p_input, "CaptureEnumPins::AddRef (ref: %i)", i_ref );
#endif #endif
return i_ref++; return i_ref++;
...@@ -691,13 +705,12 @@ STDMETHODIMP_(ULONG) CaptureEnumPins::AddRef() ...@@ -691,13 +705,12 @@ STDMETHODIMP_(ULONG) CaptureEnumPins::AddRef()
STDMETHODIMP_(ULONG) CaptureEnumPins::Release() STDMETHODIMP_(ULONG) CaptureEnumPins::Release()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureEnumPins::Release" ); msg_Dbg( p_input, "CaptureEnumPins::Release (ref: %i)", i_ref );
#endif #endif
i_ref--; if( !InterlockedDecrement(&i_ref) ) delete this;
if( !i_ref ) delete this;
return i_ref; return 0;
}; };
/* IEnumPins */ /* IEnumPins */
...@@ -807,7 +820,7 @@ STDMETHODIMP CaptureEnumMediaTypes::QueryInterface( REFIID riid, void **ppv ) ...@@ -807,7 +820,7 @@ STDMETHODIMP CaptureEnumMediaTypes::QueryInterface( REFIID riid, void **ppv )
STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::AddRef() STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::AddRef()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureEnumMediaTypes::AddRef" ); msg_Dbg( p_input, "CaptureEnumMediaTypes::AddRef (ref: %i)", i_ref );
#endif #endif
return i_ref++; return i_ref++;
...@@ -815,13 +828,12 @@ STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::AddRef() ...@@ -815,13 +828,12 @@ STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::AddRef()
STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::Release() STDMETHODIMP_(ULONG) CaptureEnumMediaTypes::Release()
{ {
#ifdef DEBUG_DSHOW #ifdef DEBUG_DSHOW
msg_Dbg( p_input, "CaptureEnumMediaTypes::Release" ); msg_Dbg( p_input, "CaptureEnumMediaTypes::Release (ref: %i)", i_ref );
#endif #endif
i_ref--; if( !InterlockedDecrement(&i_ref) ) delete this;
if( !i_ref ) delete this;
return i_ref; return 0;
}; };
/* IEnumMediaTypes */ /* IEnumMediaTypes */
......
modules/access/dshow/filter.h
View file @ a75d76c1
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* filter.h : DirectShow access module for vlc * filter.h : DirectShow access module for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * Copyright (C) 2002 VideoLAN
* $Id: filter.h,v 1.2 2003/08/31 22:06:17 gbazin Exp $ * $Id: filter.h,v 1.3 2003/10/18 20:09:23 gbazin Exp $
* *
* Author: Gildas Bazin <gbazin@netcourrier.com> * Author: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -72,7 +72,7 @@ class CapturePin: public IPin, public IMemInputPin ...@@ -72,7 +72,7 @@ class CapturePin: public IPin, public IMemInputPin
deque<VLCMediaSample> samples_queue; deque<VLCMediaSample> samples_queue;
int i_ref; long i_ref;
public: public:
CapturePin( input_thread_t * _p_input, CaptureFilter *_p_filter, CapturePin( input_thread_t * _p_input, CaptureFilter *_p_filter,
...@@ -128,7 +128,7 @@ class CaptureFilter : public IBaseFilter ...@@ -128,7 +128,7 @@ class CaptureFilter : public IBaseFilter
IFilterGraph *p_graph; IFilterGraph *p_graph;
AM_MEDIA_TYPE media_type; AM_MEDIA_TYPE media_type;
int i_ref; long i_ref;
public: public:
CaptureFilter( input_thread_t * _p_input, AM_MEDIA_TYPE mt ); CaptureFilter( input_thread_t * _p_input, AM_MEDIA_TYPE mt );
...@@ -170,7 +170,7 @@ class CaptureEnumPins : public IEnumPins ...@@ -170,7 +170,7 @@ class CaptureEnumPins : public IEnumPins
CaptureFilter *p_filter; CaptureFilter *p_filter;
int i_position; int i_position;
int i_ref; long i_ref;
public: public:
CaptureEnumPins( input_thread_t * _p_input, CaptureFilter *_p_filter, CaptureEnumPins( input_thread_t * _p_input, CaptureFilter *_p_filter,
...@@ -198,7 +198,7 @@ class CaptureEnumMediaTypes : public IEnumMediaTypes ...@@ -198,7 +198,7 @@ class CaptureEnumMediaTypes : public IEnumMediaTypes
CapturePin *p_pin; CapturePin *p_pin;
int i_position; int i_position;
int i_ref; long i_ref;
public: public:
CaptureEnumMediaTypes( input_thread_t * _p_input, CapturePin *_p_pin, CaptureEnumMediaTypes( input_thread_t * _p_input, CapturePin *_p_pin,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment