X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fdmo%2Fdmo.c;h=7e22a3dd2471102e9ce8f0930533f2b8dcd1e7a2;hb=74da7a424fdcaea34fed38e37f844dbeade9a3b3;hp=c97ff41939eb56aec335eec7fe0c3f0d8672e830;hpb=a78b832aae9df6435496f5b81d75dea46a6f5639;p=vlc diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index c97ff41939..7e22a3dd24 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -24,13 +24,11 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include -#include -#include #include -#include -#include +#include +#include +#include #ifndef WIN32 # define LOADER @@ -45,7 +43,7 @@ # include #endif -#include "codecs.h" +#include #include "dmo.h" //#define DMO_DEBUG 1 @@ -134,14 +132,17 @@ struct decoder_sys_t }; static const GUID guid_wvc1 = { 0xc9bfbccf, 0xe60e, 0x4588, { 0xa3, 0xdf, 0x5a, 0x03, 0xb1, 0xfd, 0x95, 0x85 } }; - static const GUID guid_wmv9 = { 0x724bb6a4, 0xe526, 0x450f, { 0xaf, 0xfa, 0xab, 0x9b, 0x45, 0x12, 0x91, 0x11 } }; -static const GUID guid_wma9 = { 0x27ca0808, 0x01f5, 0x4e7a, { 0x8b, 0x05, 0x87, 0xf8, 0x07, 0xa2, 0x33, 0xd1 } }; static const GUID guid_wmv = { 0x82d353df, 0x90bd, 0x4382, { 0x8b, 0xc2, 0x3f, 0x61, 0x92, 0xb7, 0x6e, 0x34 } }; +static const GUID guid_wms = { 0x7bafb3b1, 0xd8f4, 0x4279, { 0x92, 0x53, 0x27, 0xda, 0x42, 0x31, 0x08, 0xde } }; +static const GUID guid_wmva ={ 0x03be3ac4, 0x84b7, 0x4e0e, { 0xa7, 0x8d, 0xd3, 0x52, 0x4e, 0x60, 0x39, 0x5a } }; + static const GUID guid_wma = { 0x874131cb, 0x4ecc, 0x443b, { 0x89, 0x48, 0x74, 0x6b, 0x89, 0x59, 0x5d, 0x20 } }; +static const GUID guid_wma9 = { 0x27ca0808, 0x01f5, 0x4e7a, { 0x8b, 0x05, 0x87, 0xf8, 0x07, 0xa2, 0x33, 0xd1 } }; static const GUID guid_wmv_enc = { 0x3181343b, 0x94a2, 0x4feb, { 0xad, 0xef, 0x30, 0xa1, 0xdd, 0xe6, 0x17, 0xb4 } }; +static const GUID guid_wmv_enc2 = { 0x96b57cdd, 0x8966, 0x410c,{ 0xbb, 0x1f, 0xc9, 0x7e, 0xea, 0x76, 0x5c, 0x04 } }; static const GUID guid_wma_enc = { 0x70f598e9, 0xf4ab, 0x495a, { 0x99, 0xe2, 0xa7, 0xc4, 0xd3, 0xd8, 0x9a, 0xbf } }; typedef struct @@ -159,6 +160,7 @@ static const codec_dll decoders_table[] = { VLC_FOURCC('w','v','c','1'), "wvc1dmod.dll", &guid_wvc1 }, /* WMV3 */ { 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','3'), "wmv9dmod.dll", &guid_wmv9 }, /* WMV2 */ { VLC_FOURCC('W','M','V','2'), "wmvdmod.dll", &guid_wmv }, @@ -166,6 +168,12 @@ static const codec_dll decoders_table[] = /* WMV1 */ { VLC_FOURCC('W','M','V','1'), "wmvdmod.dll", &guid_wmv }, { VLC_FOURCC('w','m','v','1'), "wmvdmod.dll", &guid_wmv }, + /* Screen codecs */ + { VLC_FOURCC('M','S','S','1'), "wmsdmod.dll", &guid_wms }, + { VLC_FOURCC('M','S','S','2'), "wmsdmod.dll", &guid_wms }, + /* Windows Media Video Adv */ + { VLC_FOURCC('W','M','V','A'), "wmvadvd.dll", &guid_wmva }, + { VLC_FOURCC('W','V','P','2'), "wmvadvd.dll", &guid_wmva }, /* WMA 3 */ { VLC_FOURCC('W','M','A','3'), "wma9dmod.dll", &guid_wma9 }, @@ -184,12 +192,15 @@ static const codec_dll decoders_table[] = 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 }, /* WMV2 */ - { VLC_FOURCC('W','M','V','2'), "wmvdmoe.dll", &guid_wmv_enc }, - { VLC_FOURCC('w','m','v','2'), "wmvdmoe.dll", &guid_wmv_enc }, + { VLC_FOURCC('W','M','V','2'), "wmvdmoe2.dll", &guid_wmv_enc2 }, + { VLC_FOURCC('w','m','v','2'), "wmvdmoe2.dll", &guid_wmv_enc2 }, /* WMV1 */ - { VLC_FOURCC('W','M','V','1'), "wmvdmoe.dll", &guid_wmv_enc }, - { VLC_FOURCC('w','m','v','1'), "wmvdmoe.dll", &guid_wmv_enc }, + { VLC_FOURCC('W','M','V','1'), "wmvdmoe2.dll", &guid_wmv_enc2 }, + { VLC_FOURCC('w','m','v','1'), "wmvdmoe2.dll", &guid_wmv_enc2 }, /* WMA 3 */ { VLC_FOURCC('W','M','A','3'), "wmadmoe.dll", &guid_wma_enc }, @@ -421,8 +432,17 @@ static int DecOpen( vlc_object_t *p_this ) 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; - p_dec->fmt_out.video.i_aspect = VOUT_ASPECT_FACTOR * - p_dec->fmt_out.video.i_width / p_dec->fmt_out.video.i_height; + + /* If an aspect-ratio was specified in the input format then force it */ + if( p_dec->fmt_in.video.i_aspect ) + { + p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect; + } + 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_bih = &p_vih->bmiHeader; p_bih->biCompression = i_chroma; @@ -837,7 +857,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { if( i_result != S_FALSE ) msg_Dbg( p_dec, "ProcessOutput(): failed" ); -#if DMO_DEBUG +#ifdef DMO_DEBUG else msg_Dbg( p_dec, "ProcessOutput(): no output" ); #endif @@ -846,13 +866,13 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return NULL; } -#if DMO_DEBUG +#ifdef DMO_DEBUG msg_Dbg( p_dec, "ProcessOutput(): success" ); #endif if( !block_out.i_buffer ) { -#if DMO_DEBUG +#ifdef DMO_DEBUG msg_Dbg( p_dec, "ProcessOutput(): no output (i_buffer_out == 0)" ); #endif p_out->vt->Release( (IUnknown *)p_out ); @@ -916,7 +936,7 @@ static void CopyPicture( decoder_t *p_dec, picture_t *p_pic, uint8_t *p_in ) for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_width ); + p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); p_src += i_width; p_dst += i_dst_stride; } @@ -951,31 +971,9 @@ static int EncoderOpen( vlc_object_t *p_this ) { encoder_t *p_enc = (encoder_t*)p_this; -#ifndef LOADER int i_ret = EncOpen( p_this ); if( i_ret != VLC_SUCCESS ) return i_ret; -#else - /* We can't open it now, because of ldt_keeper or something - * Open/Encode/Close has to be done in the same thread */ - int i; - - /* Probe if we support it */ - for( i = 0; encoders_table[i].i_fourcc != 0; i++ ) - { - if( encoders_table[i].i_fourcc == p_enc->fmt_out.i_codec ) - { - msg_Dbg( p_enc, "DMO codec for %4.4s may work with dll=%s", - (char*)&p_enc->fmt_out.i_codec, - encoders_table[i].psz_dll ); - break; - } - } - - p_enc->p_sys = NULL; - if( !encoders_table[i].i_fourcc ) return VLC_EGENERIC; -#endif /* LOADER */ - /* Set callbacks */ p_enc->pf_encode_video = (block_t *(*)(encoder_t *, picture_t *)) EncodeBlock; @@ -996,7 +994,7 @@ static int EncoderSetVideoType( encoder_t *p_enc, IMediaObject *p_dmo ) BITMAPINFOHEADER *p_bih; /* FIXME */ - p_enc->fmt_in.video.i_bits_per_pixel = + p_enc->fmt_in.video.i_bits_per_pixel = p_enc->fmt_out.video.i_bits_per_pixel = 12; /* Enumerate input format (for debug output) */ @@ -1017,7 +1015,6 @@ static int EncoderSetVideoType( encoder_t *p_enc, IMediaObject *p_dmo ) /* Setup input format */ memset( &dmo_type, 0, sizeof(dmo_type) ); - dmo_type.pUnk = 0; memset( &vih, 0, sizeof(VIDEOINFOHEADER) ); p_bih = &vih.bmiHeader; @@ -1200,7 +1197,7 @@ static int EncoderSetAudioType( encoder_t *p_enc, IMediaObject *p_dmo ) if( i_selected < 0 ) { - msg_Err( p_enc, "couldn't find a matching ouput" ); + msg_Err( p_enc, "couldn't find a matching output" ); return VLC_EGENERIC; } @@ -1395,16 +1392,6 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) int i_result; mtime_t i_pts; - if( p_sys == NULL ) - { - if( EncOpen( VLC_OBJECT(p_enc) ) ) - { - msg_Err( p_enc, "EncOpen failed" ); - return NULL; - } - p_sys = p_enc->p_sys; - } - if( !p_data ) return NULL; if( p_enc->fmt_out.i_cat == VIDEO_ES ) @@ -1431,7 +1418,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_enc->p_vlc->pf_memcpy( p_dst, p_src, i_width ); + p_enc->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); p_dst += i_width; p_src += i_src_stride; } @@ -1474,7 +1461,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) return NULL; } -#if DMO_DEBUG +#ifdef DMO_DEBUG msg_Dbg( p_enc, "ProcessInput(): success" ); #endif @@ -1498,7 +1485,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) { if( i_result != S_FALSE ) msg_Dbg( p_enc, "ProcessOutput(): failed: %x", i_result ); -#if DMO_DEBUG +#ifdef DMO_DEBUG else msg_Dbg( p_enc, "ProcessOutput(): no output" ); #endif @@ -1510,7 +1497,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) if( !p_block_out->i_buffer ) { -#if DMO_DEBUG +#ifdef DMO_DEBUG msg_Dbg( p_enc, "ProcessOutput(): no output (i_buffer_out == 0)" ); #endif p_out->vt->Release( (IUnknown *)p_out ); @@ -1520,7 +1507,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) if( db.dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIME ) { -#if DMO_DEBUG +#ifdef DMO_DEBUG msg_Dbg( p_enc, "ProcessOutput(): pts: "I64Fd", "I64Fd, i_pts, db.rtTimestamp / 10 ); #endif @@ -1530,7 +1517,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data ) if( db.dwStatus & DMO_OUTPUT_DATA_BUFFERF_TIMELENGTH ) { p_block_out->i_length = db.rtTimelength / 10; -#if DMO_DEBUG +#ifdef DMO_DEBUG msg_Dbg( p_enc, "ProcessOutput(): length: "I64Fd, p_block_out->i_length ); #endif