X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fpacketizer%2Fcopy.c;h=b6046ac21e55d211d60068aed91041324bef249c;hb=873bcee7d2eb03fe944fe28dad5ca11251e51196;hp=634bc8a0ac4eacf859a4acde8da4cab2f2ec92ef;hpb=2cb472dba008f7d877ffe6bae9c5575253365282;p=vlc diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c index 634bc8a0ac..b6046ac21e 100644 --- a/modules/packetizer/copy.c +++ b/modules/packetizer/copy.c @@ -1,7 +1,7 @@ /***************************************************************************** * copy.c ***************************************************************************** - * Copyright (C) 2001, 2002 the VideoLAN team + * Copyright (C) 2001, 2002, 2006 the VideoLAN team * $Id$ * * Authors: Laurent Aimar @@ -25,11 +25,15 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include /***************************************************************************** * Module descriptor @@ -37,13 +41,13 @@ static int Open ( vlc_object_t * ); static void Close( vlc_object_t * ); -vlc_module_begin(); - set_category( CAT_SOUT ); - set_subcategory( SUBCAT_SOUT_PACKETIZER ); - set_description( _("Copy packetizer") ); - set_capability( "packetizer", 1 ); - set_callbacks( Open, Close ); -vlc_module_end(); +vlc_module_begin () + set_category( CAT_SOUT ) + set_subcategory( SUBCAT_SOUT_PACKETIZER ) + set_description( N_("Copy packetizer") ) + set_capability( "packetizer", 1 ) + set_callbacks( Open, Close ) +vlc_module_end () /***************************************************************************** * Local prototypes @@ -83,149 +87,19 @@ static int Open( vlc_object_t *p_this ) /* Create the output format */ es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in ); - /* Fix the value of the fourcc */ - switch( p_dec->fmt_in.i_codec ) + /* Fix the value of the fourcc for audio */ + if( p_dec->fmt_in.i_cat == AUDIO_ES ) { - /* video */ - case VLC_FOURCC( 'm', '4', 's', '2'): - case VLC_FOURCC( 'M', '4', 'S', '2'): - case VLC_FOURCC( 'm', 'p', '4', 's'): - case VLC_FOURCC( 'M', 'P', '4', 'S'): - case VLC_FOURCC( 'D', 'I', 'V', 'X'): - case VLC_FOURCC( 'd', 'i', 'v', 'x'): - case VLC_FOURCC( 'X', 'V', 'I', 'D'): - case VLC_FOURCC( 'X', 'v', 'i', 'D'): - case VLC_FOURCC( 'x', 'v', 'i', 'd'): - case VLC_FOURCC( 'D', 'X', '5', '0'): - case VLC_FOURCC( 0x04, 0, 0, 0): - case VLC_FOURCC( '3', 'I', 'V', '2'): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v'); - break; - - case VLC_FOURCC( 'm', 'p', 'g', '1' ): - case VLC_FOURCC( 'm', 'p', 'g', '2' ): - case VLC_FOURCC( 'm', 'p', '1', 'v' ): - case VLC_FOURCC( 'm', 'p', '2', 'v' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' ); - break; - - case VLC_FOURCC( 'd', 'i', 'v', '1' ): - case VLC_FOURCC( 'M', 'P', 'G', '4' ): - case VLC_FOURCC( 'm', 'p', 'g', '4' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'D', 'I', 'V', '1' ); - break; - - case VLC_FOURCC( 'd', 'i', 'v', '2' ): - case VLC_FOURCC( 'M', 'P', '4', '2' ): - case VLC_FOURCC( 'm', 'p', '4', '2' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'D', 'I', 'V', '2' ); - break; - - case VLC_FOURCC( 'd', 'i', 'v', '3' ): - case VLC_FOURCC( 'd', 'i', 'v', '4' ): - case VLC_FOURCC( 'D', 'I', 'V', '4' ): - case VLC_FOURCC( 'd', 'i', 'v', '5' ): - case VLC_FOURCC( 'D', 'I', 'V', '5' ): - case VLC_FOURCC( 'd', 'i', 'v', '6' ): - case VLC_FOURCC( 'D', 'I', 'V', '6' ): - case VLC_FOURCC( 'M', 'P', '4', '3' ): - case VLC_FOURCC( 'm', 'p', '4', '3' ): - case VLC_FOURCC( 'm', 'p', 'g', '3' ): - case VLC_FOURCC( 'M', 'P', 'G', '3' ): - case VLC_FOURCC( 'A', 'P', '4', '1' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'D', 'I', 'V', '3' ); - break; - - case VLC_FOURCC( 'h', '2', '6', '3' ): - case VLC_FOURCC( 'U', '2', '6', '3' ): - case VLC_FOURCC( 'u', '2', '6', '3' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'H', '2', '6', '3' ); - break; - - case VLC_FOURCC( 'i', '2', '6', '3' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'I', '2', '6', '3' ); - break; - - case VLC_FOURCC( 'm', 'j', 'p', 'g' ): - case VLC_FOURCC( 'm', 'j', 'p', 'a' ): - case VLC_FOURCC( 'j', 'p', 'e', 'g' ): - case VLC_FOURCC( 'J', 'P', 'E', 'G' ): - case VLC_FOURCC( 'J', 'F', 'I', 'F' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'M', 'J', 'P', 'G' ); - break; - - case VLC_FOURCC( 'd', 'v', 's', 'd' ): - case VLC_FOURCC( 'D', 'V', 'S', 'D' ): - case VLC_FOURCC( 'd', 'v', 'h', 'd' ): - p_dec->fmt_out.i_codec = VLC_FOURCC( 'd', 'v', 's', 'l' ); - break; - - /* audio */ - case VLC_FOURCC( 'a', 'r', 'a', 'w' ): - switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 ) - { - case 1: - p_dec->fmt_out.i_codec = VLC_FOURCC('u','8',' ',' '); - break; - case 2: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','1','6','l'); - break; - case 3: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','2','4','l'); - break; - case 4: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','3','2','l'); - break; - default: - msg_Err( p_dec, "unknown raw audio sample size" ); - return VLC_EGENERIC; - } - break; - - case VLC_FOURCC( 't', 'w', 'o', 's' ): - switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 ) - { - case 1: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','8',' ',' '); - break; - case 2: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','1','6','b'); - break; - case 3: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','2','4','b'); - break; - case 4: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','3','2','b'); - break; - default: - msg_Err( p_dec, "unknown raw audio sample size" ); - return VLC_EGENERIC; - } - break; - - case VLC_FOURCC( 's', 'o', 'w', 't' ): - switch( ( p_dec->fmt_in.audio.i_bitspersample + 7 ) / 8 ) - { - case 1: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','8',' ',' '); - break; - case 2: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','1','6','l'); - break; - case 3: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','2','4','l'); - break; - case 4: - p_dec->fmt_out.i_codec = VLC_FOURCC('s','3','2','l'); - break; - default: - msg_Err( p_dec, "unknown raw audio sample size" ); - return VLC_EGENERIC; - } - break; + p_dec->fmt_out.i_codec = vlc_fourcc_GetCodecAudio( p_dec->fmt_in.i_codec, + p_dec->fmt_in.audio.i_bitspersample ); + if( !p_dec->fmt_out.i_codec ) + { + msg_Err( p_dec, "unknown raw audio sample size" ); + return VLC_EGENERIC; + } } - p_dec->p_sys = p_sys = malloc( sizeof( block_t ) ); + p_dec->p_sys = p_sys = malloc( sizeof(*p_sys) ); p_sys->p_block = NULL; return VLC_SUCCESS; @@ -243,6 +117,7 @@ static void Close( vlc_object_t *p_this ) block_ChainRelease( p_dec->p_sys->p_block ); } + es_format_Clean( &p_dec->fmt_out ); free( p_dec->p_sys ); } @@ -255,20 +130,24 @@ static block_t *Packetize ( decoder_t *p_dec, block_t **pp_block ) block_t *p_ret = p_dec->p_sys->p_block; if( pp_block == NULL || *pp_block == NULL ) + return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { + block_Release( *pp_block ); return NULL; } + p_block = *pp_block; *pp_block = NULL; - if( p_block->i_dts <= 0 ) + if( p_block->i_dts <= VLC_TS_INVALID ) { p_block->i_dts = p_block->i_pts; } - if( p_block->i_dts <= 0 ) + if( p_block->i_dts <= VLC_TS_INVALID ) { - msg_Dbg( p_dec, "need dts > 0" ); + msg_Dbg( p_dec, "need valid dts" ); block_Release( p_block ); return NULL; } @@ -290,20 +169,24 @@ static block_t *PacketizeSub( decoder_t *p_dec, block_t **pp_block ) block_t *p_block; if( pp_block == NULL || *pp_block == NULL ) + return NULL; + if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { + block_Release( *pp_block ); return NULL; } + p_block = *pp_block; *pp_block = NULL; - if( p_block->i_dts <= 0 ) + if( p_block->i_dts <= VLC_TS_INVALID ) { p_block->i_dts = p_block->i_pts; } - if( p_block->i_dts <= 0 ) + if( p_block->i_dts <= VLC_TS_INVALID ) { - msg_Dbg( p_dec, "need dts > 0" ); + msg_Dbg( p_dec, "need valid dts" ); block_Release( p_block ); return NULL; }