videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

DMO: fix serialization, check for errors in DecOpen...

pull/2/head
Rémi Denis-Courmont 18 years ago
parent
17485fb47d
commit
9d4a329f77
1 changed files with 122 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 174
      modules/codec/dmo/dmo.c

174
modules/codec/dmo/dmo.c
View File

@ -85,18 +85,18 @@ static const int pi_channels_maps[7] =
* Module descriptor
*****************************************************************************/
static int DecoderOpen ( vlc_object_t * );
static int DecOpen ( vlc_object_t * );
static void DecoderClose ( vlc_object_t * );
static void *DecodeBlock ( decoder_t *, block_t ** );
static void *DecoderThread( void * );
static int EncoderOpen ( vlc_object_t * );
static int EncOpen ( vlc_object_t * );
static void EncoderClose ( vlc_object_t * );
static block_t *EncodeBlock( encoder_t *, void * );
static int EncOpen ( vlc_object_t * );
static int LoadDMO( vlc_object_t *, HINSTANCE *, IMediaObject **,
es_format_t *, bool );
static void CopyPicture( decoder_t *, picture_t *, uint8_t * );
static void CopyPicture( picture_t *, uint8_t * );
vlc_module_begin();
set_description( N_("DirectMedia Object decoder") );
@ -134,6 +134,13 @@ struct decoder_sys_t
#ifdef LOADER
ldt_fs_t *ldt_fs;
#endif
vlc_thread_t thread;
vlc_mutex_t lock;
vlc_cond_t wait_input, wait_output;
bool ready, works;
block_t **input;
void *output;
};
const GUID IID_IWMCodecPrivateData = {0x73f0be8e, 0x57f7, 0x4f01, {0xaa, 0x66, 0x9f, 0x57, 0x34, 0xc, 0xfe, 0xe}};
@ -255,34 +262,28 @@ static void WINAPI DMOFreeMediaType( DMO_MEDIA_TYPE *mt )
static int DecoderOpen( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys;
#ifndef LOADER
int i_ret = DecOpen( p_this );
if( i_ret != VLC_SUCCESS ) return i_ret;
#else
/* We can't open it now, because of ldt_keeper or something
* Open/Decode/Close has to be done in the same thread */
int i;
p_dec->p_sys = NULL;
/* Probe if we support it */
for( i = 0; decoders_table[i].i_fourcc != 0; i++ )
for( unsigned i = 0; decoders_table[i].i_fourcc != 0; i++ )
{
if( decoders_table[i].i_fourcc == p_dec->fmt_in.i_codec )
{
msg_Dbg( p_dec, "DMO codec for %4.4s may work with dll=%s",
(char*)&p_dec->fmt_in.i_codec,
decoders_table[i].psz_dll );
break;
goto found;
}
}
return VLC_EGENERIC;
p_dec->p_sys = NULL;
if( !decoders_table[i].i_fourcc ) return VLC_EGENERIC;
#endif /* LOADER */
found:
p_sys = p_dec->p_sys = malloc(sizeof(*p_sys));
if( !p_sys )
return VLC_ENOMEM;
/* Set callbacks */
p_dec->pf_decode_video = (picture_t *(*)(decoder_t *, block_t **))
@ -290,16 +291,74 @@ static int DecoderOpen( vlc_object_t *p_this )
p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **))
DecodeBlock;
return VLC_SUCCESS;
vlc_mutex_init( &p_sys->lock );
vlc_cond_init( &p_sys->wait_input );
vlc_cond_init( &p_sys->wait_output );
p_sys->works = p_sys->ready = false;
if( vlc_clone( &p_sys->thread, DecoderThread, p_dec,
VLC_THREAD_PRIORITY_INPUT ) )
goto error;
vlc_mutex_lock( &p_sys->lock );
while( !p_sys->ready )
vlc_cond_wait( &p_sys->wait_output, &p_sys->lock );
vlc_mutex_unlock( &p_sys->lock );
if( p_sys->works )
return VLC_SUCCESS;
vlc_join( p_sys->thread, NULL );
error:
vlc_cond_destroy( &p_sys->wait_input );
vlc_cond_destroy( &p_sys->wait_output );
vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
return VLC_ENOMEM;
}
/*****************************************************************************
* DecOpen: open dmo codec
* DecoderClose: close codec
*****************************************************************************/
static int DecOpen( vlc_object_t *p_this )
static void DecoderClose( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = NULL;
decoder_sys_t *p_sys = p_dec->p_sys;
vlc_mutex_lock( &p_sys->lock );
p_sys->ready = false;
vlc_mutex_unlock( &p_sys->lock );
vlc_join( p_sys->thread, NULL );
vlc_cond_destroy( &p_sys->wait_input );
vlc_cond_destroy( &p_sys->wait_output );
vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
}
static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
void *ret;
vlc_mutex_lock( &p_sys->lock );
p_sys->input = pp_block;
vlc_cond_signal( &p_sys->wait_input );
while( !(ret = p_sys->output) )
vlc_cond_wait( &p_sys->wait_output, &p_sys->lock );
p_sys->output = NULL;
vlc_mutex_unlock( &p_sys->lock );
return ret;
}
/*****************************************************************************
* DecOpen: open dmo codec
*****************************************************************************/
static int DecOpen( decoder_t *p_dec )
{
decoder_sys_t *p_sys = p_dec->p_sys;
DMO_MEDIA_TYPE dmo_input_type, dmo_output_type;
IMediaObject *p_dmo = NULL;
@ -315,7 +374,7 @@ static int DecOpen( vlc_object_t *p_this )
CoInitialize( 0 );
#endif /* LOADER */
if( LoadDMO( p_this, &hmsdmo_dll, &p_dmo, &p_dec->fmt_in, false )
if( LoadDMO( VLC_OBJECT(p_dec), &hmsdmo_dll, &p_dmo, &p_dec->fmt_in, false )
!= VLC_SUCCESS )
{
hmsdmo_dll = 0;
@ -517,12 +576,6 @@ static int DecOpen( vlc_object_t *p_this )
msg_Dbg( p_dec, "DMO output type set" );
/* Allocate the memory needed to store the decoder's structure */
if( ( p_dec->p_sys = p_sys =
(decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
{
goto error;
}
p_sys->hmsdmo_dll = hmsdmo_dll;
p_sys->p_dmo = p_dmo;
#ifdef LOADER
@ -559,6 +612,11 @@ static int DecOpen( vlc_object_t *p_this )
free( p_vih );
free( p_wf );
vlc_mutex_lock( &p_sys->lock );
p_sys->ready = p_sys->works = true;
vlc_cond_signal( &p_sys->wait_output );
vlc_mutex_unlock( &p_sys->lock );
return VLC_SUCCESS;
error:
@ -575,8 +633,11 @@ static int DecOpen( vlc_object_t *p_this )
free( p_vih );
free( p_wf );
free( p_sys );
vlc_mutex_lock( &p_sys->lock );
p_sys->ready = true;
vlc_cond_signal( &p_sys->wait_output );
vlc_mutex_unlock( &p_sys->lock );
return VLC_EGENERIC;
}
@ -749,16 +810,10 @@ loader:
return VLC_SUCCESS;
}
/*****************************************************************************
* DecoderClose: close codec
*****************************************************************************/
void DecoderClose( vlc_object_t *p_this )
static void DecClose( decoder_t *p_dec )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
if( !p_sys ) return;
if( p_sys->p_dmo ) p_sys->p_dmo->vt->Release( (IUnknown *)p_sys->p_dmo );
FreeLibrary( p_sys->hmsdmo_dll );
@ -772,7 +827,6 @@ void DecoderClose( vlc_object_t *p_this )
#endif
free( p_sys->p_buffer );
free( p_sys );
}
/****************************************************************************
@ -780,7 +834,7 @@ void DecoderClose( vlc_object_t *p_this )
****************************************************************************
* This function must be fed with ogg packets.
****************************************************************************/
static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
static void *DecBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
@ -791,16 +845,6 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
block_t block_out;
uint32_t i_status;
if( p_sys == NULL )
{
if( DecOpen( VLC_OBJECT(p_dec) ) )
{
msg_Err( p_dec, "DecOpen failed" );
return NULL;
}
p_sys = p_dec->p_sys;
}
if( !pp_block ) return NULL;
p_block = *pp_block;
@ -911,7 +955,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
picture_t *p_pic = p_dec->pf_vout_buffer_new( p_dec );
if( !p_pic ) return NULL;
CopyPicture( p_dec, p_pic, block_out.p_buffer );
CopyPicture( p_pic, block_out.p_buffer );
/* Date management */
p_pic->date = date_Get( &p_sys->end_date );
@ -946,7 +990,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
return NULL;
}
static void CopyPicture( decoder_t *p_dec, picture_t *p_pic, uint8_t *p_in )
static void CopyPicture( picture_t *p_pic, uint8_t *p_in )
{
int i_plane, i_line, i_width, i_dst_stride;
uint8_t *p_dst, *p_src = p_in;
@ -974,6 +1018,32 @@ static void CopyPicture( decoder_t *p_dec, picture_t *p_pic, uint8_t *p_in )
p_pic->p[2].p_pixels = p_dst;
}
static void *DecoderThread( void *data )
{
decoder_t *p_dec = data;
decoder_sys_t *p_sys = p_dec->p_sys;
if( DecOpen( p_dec ) )
return NULL; /* failed */
vlc_mutex_lock( &p_sys->lock );
for( ;; )
{
while( p_sys->ready && !p_sys->input )
vlc_cond_wait( &p_sys->wait_input, &p_sys->lock );
if( !p_sys->ready )
break;
p_sys->output = DecBlock( p_dec, p_sys->input );
p_sys->input = NULL;
}
vlc_mutex_unlock( &p_sys->lock );
DecClose( p_dec );
return NULL;
}
/****************************************************************************
* Encoder descriptor declaration
****************************************************************************/
@ -1208,7 +1278,7 @@ static int EncoderSetAudioType( encoder_t *p_enc, IMediaObject *p_dmo )
p_wf->nChannels == p_enc->fmt_in.audio.i_channels &&
p_wf->wBitsPerSample == p_enc->fmt_in.audio.i_bitspersample )
{
if( (int)p_wf->nAvgBytesPerSec <
if( p_wf->nAvgBytesPerSec <
p_enc->fmt_out.i_bitrate * 110 / 800 /* + 10% */ &&
p_wf->nAvgBytesPerSec > i_last_byterate )
{

Write Preview
Loading…
Cancel
Save