#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
-#include <vlc_vout.h>
#include <vlc_aout.h>
#ifndef WIN32
# define LOADER
#else
# include <objbase.h>
+# include <vlc_charset.h>
#endif
#ifdef LOADER
es_format_t *, bool );
static void CopyPicture( picture_t *, uint8_t * );
-vlc_module_begin();
- set_description( N_("DirectMedia Object decoder") );
- add_shortcut( "dmo" );
- set_capability( "decoder", 1 );
- set_callbacks( DecoderOpen, DecoderClose );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_SCODEC );
+vlc_module_begin ()
+ set_description( N_("DirectMedia Object decoder") )
+ add_shortcut( "dmo" )
+ set_capability( "decoder", 1 )
+ set_callbacks( DecoderOpen, DecoderClose )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_VCODEC )
# define ENC_CFG_PREFIX "sout-dmo-"
- add_submodule();
- set_description( N_("DirectMedia Object encoder") );
- set_capability( "encoder", 10 );
- set_callbacks( EncoderOpen, EncoderClose );
+ add_submodule ()
+ set_description( N_("DirectMedia Object encoder") )
+ add_shortcut( "dmo" )
+ set_capability( "encoder", 10 )
+ set_callbacks( EncoderOpen, EncoderClose )
-vlc_module_end();
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
vlc_thread_t thread;
vlc_mutex_t lock;
vlc_cond_t wait_input, wait_output;
- bool ready, works;
- block_t **input;
- void *output;
+ bool b_ready, b_works;
+ block_t **pp_input;
+
+ int i_output;
+ void **pp_output;
};
const GUID IID_IWMCodecPrivateData = {0x73f0be8e, 0x57f7, 0x4f01, {0xaa, 0x66, 0x9f, 0x57, 0x34, 0xc, 0xfe, 0xe}};
static const codec_dll decoders_table[] =
{
/* WVC1 */
- { VLC_FOURCC('W','V','C','1'), "wvc1dmod.dll", &guid_wvc1 },
- { VLC_FOURCC('w','v','c','1'), "wvc1dmod.dll", &guid_wvc1 },
+ { VLC_CODEC_VC1, "wvc1dmod.dll", &guid_wvc1 },
/* WMV3 */
- { VLC_FOURCC('W','M','V','3'), "wmv9dmod.dll", &guid_wmv9 },
- { VLC_FOURCC('w','m','v','3'), "wmv9dmod.dll", &guid_wmv9 },
- { VLC_FOURCC('W','M','V','P'), "wmv9dmod.dll", &guid_wmv9 },
- { VLC_FOURCC('w','m','v','p'), "wmv9dmod.dll", &guid_wmv9 },
+ { VLC_CODEC_WMV3, "wmv9dmod.dll", &guid_wmv9 },
/* WMV2 */
- { VLC_FOURCC('W','M','V','2'), "wmvdmod.dll", &guid_wmv },
- { VLC_FOURCC('w','m','v','2'), "wmvdmod.dll", &guid_wmv },
+ { VLC_CODEC_WMV2, "wmvdmod.dll", &guid_wmv },
/* WMV1 */
- { VLC_FOURCC('W','M','V','1'), "wmvdmod.dll", &guid_wmv },
- { VLC_FOURCC('w','m','v','1'), "wmvdmod.dll", &guid_wmv },
+ { VLC_CODEC_WMV1, "wmvdmod.dll", &guid_wmv },
/* Screen codecs */
{ VLC_FOURCC('M','S','S','2'), "wmsdmod.dll", &guid_wms },
{ VLC_FOURCC('m','s','s','2'), "wmsdmod.dll", &guid_wms },
{ VLC_FOURCC('M','S','S','1'), "wmsdmod.dll", &guid_wms },
{ VLC_FOURCC('m','s','s','1'), "wmsdmod.dll", &guid_wms },
/* Windows Media Video Adv */
- { VLC_FOURCC('W','M','V','A'), "wmvadvd.dll", &guid_wmva },
- { VLC_FOURCC('w','m','v','a'), "wmvadvd.dll", &guid_wmva },
- { VLC_FOURCC('W','V','P','2'), "wmvadvd.dll", &guid_wmva },
- { VLC_FOURCC('w','v','p','2'), "wmvadvd.dll", &guid_wmva },
+ { VLC_CODEC_WMVA, "wmvadvd.dll", &guid_wmva },
/* WMA 3 */
- { VLC_FOURCC('W','M','A','3'), "wma9dmod.dll", &guid_wma9 },
- { VLC_FOURCC('w','m','a','3'), "wma9dmod.dll", &guid_wma9 },
- { VLC_FOURCC('W','M','A','P'), "wma9dmod.dll", &guid_wma9 },
- { VLC_FOURCC('w','m','a','p'), "wma9dmod.dll", &guid_wma9 },
+ { VLC_CODEC_WMAP, "wma9dmod.dll", &guid_wma9 },
+ { VLC_CODEC_WMAL, "wma9dmod.dll", &guid_wma9 },
+
/* WMA 2 */
- { VLC_FOURCC('W','M','A','2'), "wma9dmod.dll", &guid_wma9 },
- { VLC_FOURCC('w','m','a','2'), "wma9dmod.dll", &guid_wma9 },
+ { VLC_CODEC_WMA2, "wma9dmod.dll", &guid_wma9 },
/* WMA Speech */
- { VLC_FOURCC('W','M','A','S'), "wmspdmod.dll", &guid_wma },
- { VLC_FOURCC('w','m','a','s'), "wmspdmod.dll", &guid_wma },
+ { VLC_CODEC_WMAS, "wmspdmod.dll", &guid_wma },
/* */
{ 0, NULL, NULL }
static const codec_dll encoders_table[] =
{
/* WMV3 */
- { VLC_FOURCC('W','M','V','3'), "wmvdmoe2.dll", &guid_wmv_enc2 },
- { VLC_FOURCC('w','m','v','3'), "wmvdmoe2.dll", &guid_wmv_enc2 },
+ { VLC_CODEC_WMV3, "wmvdmoe2.dll", &guid_wmv_enc2 },
/* WMV2 */
- { VLC_FOURCC('W','M','V','2'), "wmvdmoe2.dll", &guid_wmv_enc2 },
- { VLC_FOURCC('w','m','v','2'), "wmvdmoe2.dll", &guid_wmv_enc2 },
+ { VLC_CODEC_WMV2, "wmvdmoe2.dll", &guid_wmv_enc2 },
/* WMV1 */
- { VLC_FOURCC('W','M','V','1'), "wmvdmoe2.dll", &guid_wmv_enc2 },
- { VLC_FOURCC('w','m','v','1'), "wmvdmoe2.dll", &guid_wmv_enc2 },
+ { VLC_CODEC_WMV1, "wmvdmoe2.dll", &guid_wmv_enc2 },
/* WMA 3 */
- { VLC_FOURCC('W','M','A','3'), "wmadmoe.dll", &guid_wma_enc },
- { VLC_FOURCC('w','m','a','3'), "wmadmoe.dll", &guid_wma_enc },
+ { VLC_CODEC_WMAP, "wmadmoe.dll", &guid_wma_enc },
/* WMA 2 */
- { VLC_FOURCC('W','M','A','2'), "wmadmoe.dll", &guid_wma_enc },
- { VLC_FOURCC('w','m','a','2'), "wmadmoe.dll", &guid_wma_enc },
+ { VLC_CODEC_WMA2, "wmadmoe.dll", &guid_wma_enc },
/* */
{ 0, NULL, NULL }
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;
+ p_sys->b_works =
+ p_sys->b_ready = false;
+ p_sys->pp_input = NULL;
+ TAB_INIT( p_sys->i_output, p_sys->pp_output );
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 )
+ while( !p_sys->b_ready )
vlc_cond_wait( &p_sys->wait_output, &p_sys->lock );
vlc_mutex_unlock( &p_sys->lock );
- if( p_sys->works )
+ if( p_sys->b_works )
return VLC_SUCCESS;
vlc_join( p_sys->thread, NULL );
decoder_sys_t *p_sys = p_dec->p_sys;
vlc_mutex_lock( &p_sys->lock );
- p_sys->ready = false;
+ p_sys->b_ready = false;
vlc_cond_signal( &p_sys->wait_input );
vlc_mutex_unlock( &p_sys->lock );
vlc_join( p_sys->thread, NULL );
+ TAB_CLEAN( p_sys->i_output, p_sys->pp_output );
vlc_cond_destroy( &p_sys->wait_input );
vlc_cond_destroy( &p_sys->wait_output );
vlc_mutex_destroy( &p_sys->lock );
static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
- void *ret;
+ void *p_ret;
vlc_mutex_lock( &p_sys->lock );
- p_sys->input = pp_block;
- vlc_cond_signal( &p_sys->wait_input );
+ if( p_sys->i_output <= 0 )
+ {
+ p_sys->pp_input = pp_block;
+ vlc_cond_signal( &p_sys->wait_input );
+
+ while( p_sys->pp_input )
+ vlc_cond_wait( &p_sys->wait_output, &p_sys->lock );
+ }
+
+ p_ret = NULL;
+ if( p_sys->i_output > 0 )
+ {
+ p_ret = p_sys->pp_output[0];
+ TAB_REMOVE( p_sys->i_output, p_sys->pp_output, p_ret );
+ }
- 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;
+ return p_ret;
}
/*****************************************************************************
dmo_input_type.majortype = MEDIATYPE_Audio;
dmo_input_type.subtype = dmo_input_type.majortype;
- dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_codec;
+ dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
fourcc_to_wf_tag( p_dec->fmt_in.i_codec, &i_tag );
if( i_tag ) dmo_input_type.subtype.Data1 = i_tag;
memcpy( &p_vih[1], p_dec->fmt_in.p_extra, p_dec->fmt_in.i_extra );
p_bih = &p_vih->bmiHeader;
- p_bih->biCompression = p_dec->fmt_in.i_codec;
+ p_bih->biCompression = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
p_bih->biWidth = p_dec->fmt_in.video.i_width;
p_bih->biHeight = p_dec->fmt_in.video.i_height;
p_bih->biBitCount = p_dec->fmt_in.video.i_bits_per_pixel;
dmo_input_type.majortype = MEDIATYPE_Video;
dmo_input_type.subtype = dmo_input_type.majortype;
- dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_codec;
+ dmo_input_type.subtype.Data1 = p_dec->fmt_in.i_original_fourcc ?: p_dec->fmt_in.i_codec;
dmo_input_type.formattype = FORMAT_VideoInfo;
dmo_input_type.bFixedSizeSamples = 0;
dmo_input_type.bTemporalCompression = 1;
if( p_dec->fmt_in.i_cat == AUDIO_ES )
{
/* Setup the format */
- p_dec->fmt_out.i_codec = AOUT_FMT_S16_NE;
+ p_dec->fmt_out.i_codec = VLC_CODEC_S16N;
p_dec->fmt_out.audio.i_rate = p_dec->fmt_in.audio.i_rate;
p_dec->fmt_out.audio.i_channels = p_dec->fmt_in.audio.i_channels;
p_dec->fmt_out.audio.i_bitspersample = 16;//p_dec->fmt_in.audio.i_bitspersample; We request 16
{
BITMAPINFOHEADER *p_bih;
DMO_MEDIA_TYPE mt;
- unsigned i_chroma = VLC_FOURCC('Y','U','Y','2');
+ unsigned i_chroma = VLC_CODEC_YUYV;
int i_planes = 1, i_bpp = 16;
int i = 0;
/* Find out which chroma to use */
while( !p_dmo->vt->GetOutputType( p_dmo, 0, i++, &mt ) )
{
- if( mt.subtype.Data1 == VLC_FOURCC('Y','V','1','2') )
+ if( mt.subtype.Data1 == VLC_CODEC_YV12 )
{
i_chroma = mt.subtype.Data1;
i_planes = 3; i_bpp = 12;
DMOFreeMediaType( &mt );
}
- p_dec->fmt_out.i_codec = i_chroma == VLC_FOURCC('Y','V','1','2') ?
- VLC_FOURCC('I','4','2','0') : i_chroma;
+ p_dec->fmt_out.i_codec = i_chroma == VLC_CODEC_YV12 ?
+ VLC_CODEC_I420 : i_chroma;
p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width;
p_dec->fmt_out.video.i_height = p_dec->fmt_in.video.i_height;
p_dec->fmt_out.video.i_bits_per_pixel = i_bpp;
/* If an aspect-ratio was specified in the input format then force it */
- if( p_dec->fmt_in.video.i_aspect )
+ if( p_dec->fmt_in.video.i_sar_num > 0 &&
+ p_dec->fmt_in.video.i_sar_den > 0 )
{
- p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect;
+ p_dec->fmt_out.video.i_sar_num = p_dec->fmt_in.video.i_sar_num;
+ p_dec->fmt_out.video.i_sar_den = p_dec->fmt_in.video.i_sar_den;
}
else
{
- p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR *
- p_dec->fmt_out.video.i_width / p_dec->fmt_out.video.i_height;
+ p_dec->fmt_out.video.i_sar_num = 1;
+ p_dec->fmt_out.video.i_sar_den = 1;
}
p_bih = &p_vih->bmiHeader;
free( p_wf );
vlc_mutex_lock( &p_sys->lock );
- p_sys->ready = p_sys->works = true;
+ p_sys->b_ready =
+ p_sys->b_works = true;
vlc_cond_signal( &p_sys->wait_output );
vlc_mutex_unlock( &p_sys->lock );
free( p_wf );
vlc_mutex_lock( &p_sys->lock );
- p_sys->ready = true;
+ p_sys->b_ready = true;
vlc_cond_signal( &p_sys->wait_output );
vlc_mutex_unlock( &p_sys->lock );
return VLC_EGENERIC;
uint16_t i_tag;
dmo_partial_type.type = MEDIATYPE_Audio;
dmo_partial_type.subtype = dmo_partial_type.type;
- dmo_partial_type.subtype.Data1 = p_fmt->i_codec;
+ dmo_partial_type.subtype.Data1 = p_fmt->i_original_fourcc ?: p_fmt->i_codec;
fourcc_to_wf_tag( p_fmt->i_codec, &i_tag );
if( i_tag ) dmo_partial_type.subtype.Data1 = i_tag;
}
{
dmo_partial_type.type = MEDIATYPE_Video;
dmo_partial_type.subtype = dmo_partial_type.type;
- dmo_partial_type.subtype.Data1 = p_fmt->i_codec;
+ dmo_partial_type.subtype.Data1 = p_fmt->i_original_fourcc ?: p_fmt->i_codec;
}
#ifndef LOADER
while( ( S_OK == p_enum_dmo->vt->Next( p_enum_dmo, 1, &clsid_dmo,
&psz_dmo_name, &i_dummy /* NULL doesn't work */ ) ) )
{
- char psz_temp[MAX_PATH];
- wcstombs( psz_temp, psz_dmo_name, MAX_PATH );
+ char *psz_temp = FromWide( psz_dmo_name );
msg_Dbg( p_this, "found DMO: %s", psz_temp );
CoTaskMemFree( psz_dmo_name );
&IID_IMediaObject, (void **)pp_dmo ) )
{
msg_Warn( p_this, "can't create DMO: %s", psz_temp );
+ free( psz_temp );
*pp_dmo = 0;
}
- else break;
+ else
+ {
+ free( psz_temp );
+ break;
+ }
}
p_enum_dmo->vt->Release( (IUnknown *)p_enum_dmo );
}
i_err = GetClass( codecs_table[i_codec].p_guid, &IID_IClassFactory,
- (void**)&cFactory );
+ &cFactory );
if( i_err || cFactory == NULL )
{
msg_Dbg( p_this, "no such class object" );
}
i_err = cFactory->vt->CreateInstance( cFactory, 0, &IID_IUnknown,
- (void**)&cObject );
+ &cObject );
cFactory->vt->Release( (IUnknown*)cFactory );
if( i_err || !cObject )
{
return VLC_EGENERIC;
}
i_err = cObject->vt->QueryInterface( cObject, &IID_IMediaObject,
- (void**)pp_dmo );
+ pp_dmo );
cObject->vt->Release( (IUnknown*)cObject );
if( i_err || !*pp_dmo )
{
/****************************************************************************
* DecodeBlock: the whole thing
****************************************************************************
- * This function must be fed with ogg packets.
+ * This function must be fed with packets.
****************************************************************************/
static void *DecBlock( decoder_t *p_dec, block_t **pp_block )
{
p_block = *pp_block;
/* Won't work with streams with B-frames, but do we have any ? */
- if( p_block && p_block->i_pts <= 0 ) p_block->i_pts = p_block->i_dts;
+ if( p_block && p_block->i_pts <= VLC_TS_INVALID )
+ p_block->i_pts = p_block->i_dts;
/* Date management */
- if( p_block && p_block->i_pts > 0 &&
+ if( p_block && p_block->i_pts > VLC_TS_INVALID &&
p_block->i_pts != date_Get( &p_sys->end_date ) )
{
date_Set( &p_sys->end_date, p_block->i_pts );
}
else
{
- //msg_Dbg( p_dec, "ProcessInput(): successful" );
- *pp_block = 0;
+#ifdef DMO_DEBUG
+ msg_Dbg( p_dec, "ProcessInput(): successful" );
+#endif
+ *pp_block = NULL;
}
}
else if( p_block && !p_block->i_buffer )
{
block_Release( p_block );
- *pp_block = 0;
+ *pp_block = NULL;
}
/* Get output from the DMO */
if( p_dec->fmt_out.i_cat == VIDEO_ES )
{
/* Get a new picture */
- picture_t *p_pic = p_dec->pf_vout_buffer_new( p_dec );
+ picture_t *p_pic = decoder_NewPicture( p_dec );
if( !p_pic ) return NULL;
CopyPicture( p_pic, block_out.p_buffer );
memcpy( p_aout_buffer->p_buffer,
block_out.p_buffer, block_out.i_buffer );
/* Date management */
- p_aout_buffer->start_date = date_Get( &p_sys->end_date );
- p_aout_buffer->end_date =
- date_Increment( &p_sys->end_date, i_samples );
+ p_aout_buffer->i_pts = date_Get( &p_sys->end_date );
+ p_aout_buffer->i_length =
+ date_Increment( &p_sys->end_date, i_samples )
+ - p_aout_buffer->i_pts;
}
p_out->vt->Release( (IUnknown *)p_out );
vlc_mutex_lock( &p_sys->lock );
for( ;; )
{
- while( p_sys->ready && !p_sys->input )
+ while( p_sys->b_ready && !p_sys->pp_input )
vlc_cond_wait( &p_sys->wait_input, &p_sys->lock );
- if( !p_sys->ready )
+ if( !p_sys->b_ready )
break;
- p_sys->output = DecBlock( p_dec, p_sys->input );
- p_sys->input = NULL;
+ for( ;; )
+ {
+ void *p_output = DecBlock( p_dec, p_sys->pp_input );
+ if( !p_output )
+ break;
+ TAB_APPEND( p_sys->i_output, p_sys->pp_output, p_output );
+ }
+ p_sys->pp_input = NULL;
+ vlc_cond_signal( &p_sys->wait_output );
}
vlc_mutex_unlock( &p_sys->lock );
memset( &vih, 0, sizeof(VIDEOINFOHEADER) );
p_bih = &vih.bmiHeader;
- p_bih->biCompression = VLC_FOURCC('I','4','2','0');
+ p_bih->biCompression = VLC_CODEC_I420;
p_bih->biWidth = p_enc->fmt_in.video.i_width;
p_bih->biHeight = p_enc->fmt_in.video.i_height;
p_bih->biBitCount = p_enc->fmt_in.video.i_bits_per_pixel;
i_err = p_dmo->vt->QueryInterface( (IUnknown *)p_dmo,
&IID_IWMCodecPrivateData,
- (void **)&p_privdata );
+ &p_privdata );
if( i_err ) break;
i_err = p_privdata->vt->SetPartialOutputType( p_privdata, &dmo_type );
i_err = p_dmo->vt->SetOutputType( p_dmo, 0, &dmo_type, 0 );
p_vih = (VIDEOINFOHEADER *)dmo_type.pbFormat;
- p_enc->fmt_in.i_codec = VLC_FOURCC('I','4','2','0');
+ p_enc->fmt_in.i_codec = VLC_CODEC_I420;
DMOFreeMediaType( &dmo_type );
if( i_err )
fourcc_to_wf_tag( p_enc->fmt_out.i_codec, &i_tag );
if( i_tag == 0 ) return VLC_EGENERIC;
- p_enc->fmt_in.i_codec = AOUT_FMT_S16_NE;
+ p_enc->fmt_in.i_codec = VLC_CODEC_S16N;
p_enc->fmt_in.audio.i_bitspersample = 16;
/* We first need to choose an output type from the predefined
}
/* Allocate the memory needed to store the decoder's structure */
- if( ( p_enc->p_sys = p_sys =
- (encoder_sys_t *)malloc(sizeof(encoder_sys_t)) ) == NULL )
+ if( ( p_enc->p_sys = p_sys = malloc(sizeof(*p_sys)) ) == NULL )
{
goto error;
}
else
{
aout_buffer_t *p_aout_buffer = (aout_buffer_t *)p_data;
- p_block_in = block_New( p_enc, p_aout_buffer->i_nb_bytes );
+ p_block_in = block_New( p_enc, p_aout_buffer->i_buffer );
memcpy( p_block_in->p_buffer, p_aout_buffer->p_buffer,
p_block_in->i_buffer );
- i_pts = p_aout_buffer->start_date;
+ i_pts = p_aout_buffer->i_pts;
}
/* Feed input to the DMO */