X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fmpeg_audio.c;h=f893dd257a9ec52728ab1b9ee4356cff89f4582d;hb=46814a092d56e9675ad5096c437bad3ecf965633;hp=c04c1a1a721b1311a803673a229c9d2c1b687a90;hpb=f5266ccf92db33ce9f6234de82b46b96f089e37d;p=vlc diff --git a/modules/codec/mpeg_audio.c b/modules/codec/mpeg_audio.c index c04c1a1a72..f893dd257a 100644 --- a/modules/codec/mpeg_audio.c +++ b/modules/codec/mpeg_audio.c @@ -1,7 +1,7 @@ /***************************************************************************** * mpeg_audio.c: parse MPEG audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2001-2003 the VideoLAN team + * Copyright (C) 2001-2003 VLC authors and VideoLAN * $Id$ * * Authors: Laurent Aimar @@ -9,19 +9,19 @@ * Christophe Massiot * Gildas Bazin * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -31,14 +31,17 @@ # include "config.h" #endif -#include +#include #include #include #include -#include +#include +#include #include +#include "../packetizer/packetizer_helper.h" + /***************************************************************************** * decoder_sys_t : decoder descriptor *****************************************************************************/ @@ -57,8 +60,8 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; - unsigned int i_current_layer; + date_t end_date; + unsigned int i_current_layer; mtime_t i_pts; @@ -68,25 +71,13 @@ struct decoder_sys_t unsigned int i_layer, i_bit_rate; bool b_discontinuity; - - int i_input_rate; -}; - -enum { - - STATE_NOSYNC, - STATE_SYNC, - STATE_HEADER, - STATE_NEXT_SYNC, - STATE_GET_DATA, - STATE_SEND_DATA }; /* This isn't the place to put mad-specific stuff. However, it makes the * mad plug-in's life much easier if we put 8 extra bytes at the end of the - * buffer, because that way it doesn't have to copy the aout_buffer_t to a - * bigger buffer. This has no implication on other plug-ins, and we only - * lose 8 bytes per frame. --Meuuh */ + * buffer, because that way it doesn't have to copy the block_t to a bigger + * buffer. This has no implication on other plug-ins, and we only lose 8 bytes + * per frame. --Meuuh */ #define MAD_BUFFER_GUARD 8 #define MPGA_HEADER_SIZE 4 @@ -96,11 +87,11 @@ enum { static int OpenDecoder ( vlc_object_t * ); static int OpenPacketizer( vlc_object_t * ); static void CloseDecoder ( vlc_object_t * ); -static void *DecodeBlock ( decoder_t *, block_t ** ); +static block_t *DecodeBlock ( decoder_t *, block_t ** ); -static uint8_t *GetOutBuffer ( decoder_t *, void ** ); -static aout_buffer_t *GetAoutBuffer( decoder_t * ); -static block_t *GetSoutBuffer( decoder_t * ); +static uint8_t *GetOutBuffer ( decoder_t *, block_t ** ); +static block_t *GetAoutBuffer( decoder_t * ); +static block_t *GetSoutBuffer( decoder_t * ); static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, unsigned int * pi_channels_conf, @@ -112,39 +103,29 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, /***************************************************************************** * Module descriptor *****************************************************************************/ -vlc_module_begin(); - set_description( _("MPEG audio layer I/II/III decoder") ); - set_category( CAT_INPUT ); - set_subcategory( SUBCAT_INPUT_ACODEC ); -#if defined(UNDER_CE) - set_capability( "decoder", 5 ); -#else - set_capability( "decoder", 100 ); -#endif - set_callbacks( OpenDecoder, CloseDecoder ); - - add_submodule(); - set_description( _("MPEG audio layer I/II/III packetizer") ); - set_capability( "packetizer", 10 ); - set_callbacks( OpenPacketizer, CloseDecoder ); -vlc_module_end(); +vlc_module_begin () + set_description( N_("MPEG audio layer I/II/III decoder") ) + set_category( CAT_INPUT ) + set_subcategory( SUBCAT_INPUT_ACODEC ) + set_capability( "decoder", 100 ) + set_callbacks( OpenDecoder, CloseDecoder ) + + add_submodule () + set_description( N_("MPEG audio layer I/II/III packetizer") ) + set_capability( "packetizer", 10 ) + set_callbacks( OpenPacketizer, CloseDecoder ) +vlc_module_end () /***************************************************************************** - * OpenDecoder: probe the decoder and return score + * Open: probe the decoder and return score *****************************************************************************/ -static int OpenDecoder( vlc_object_t *p_this ) +static int Open( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; decoder_sys_t *p_sys; - if( p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','a') ) - { - return VLC_EGENERIC; - } - - /* HACK: Don't use this codec if we don't have an mpga audio filter */ - if( p_dec->i_object_type == VLC_OBJECT_DECODER && - !module_Exists( p_this, "mpgatofixed32" ) ) + if(( p_dec->fmt_in.i_codec != VLC_CODEC_MPGA ) && + ( p_dec->fmt_in.i_codec != VLC_CODEC_MP3 ) ) { return VLC_EGENERIC; } @@ -157,21 +138,19 @@ static int OpenDecoder( vlc_object_t *p_this ) /* Misc init */ p_sys->b_packetizer = false; p_sys->i_state = STATE_NOSYNC; - aout_DateSet( &p_sys->end_date, 0 ); - p_sys->bytestream = block_BytestreamInit(); + date_Set( &p_sys->end_date, 0 ); + block_BytestreamInit( &p_sys->bytestream ); + p_sys->i_pts = VLC_TS_INVALID; p_sys->b_discontinuity = false; - p_sys->i_input_rate = INPUT_RATE_DEFAULT; /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; - p_dec->fmt_out.i_codec = VLC_FOURCC('m','p','g','a'); + p_dec->fmt_out.i_codec = VLC_CODEC_MPGA; p_dec->fmt_out.audio.i_rate = 0; /* So end_date gets initialized */ /* Set callback */ - p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) - DecodeBlock; - p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) - DecodeBlock; + p_dec->pf_decode_audio = DecodeBlock; + p_dec->pf_packetize = DecodeBlock; /* Start with the minimum size for a free bitrate frame */ p_sys->i_free_frame_size = MPGA_HEADER_SIZE; @@ -179,11 +158,20 @@ static int OpenDecoder( vlc_object_t *p_this ) return VLC_SUCCESS; } +static int OpenDecoder( vlc_object_t *p_this ) +{ + /* HACK: Don't use this codec if we don't have an mpga audio filter */ + if( !module_exists( "mpgatofixed32" ) ) + return VLC_EGENERIC; + + return Open( p_this ); +} + static int OpenPacketizer( vlc_object_t *p_this ) { decoder_t *p_dec = (decoder_t*)p_this; - int i_ret = OpenDecoder( p_this ); + int i_ret = Open( p_this ); if( i_ret == VLC_SUCCESS ) p_dec->p_sys->b_packetizer = true; @@ -195,41 +183,41 @@ static int OpenPacketizer( vlc_object_t *p_this ) **************************************************************************** * This function is called just after the thread is launched. ****************************************************************************/ -static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) +static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) { decoder_sys_t *p_sys = p_dec->p_sys; uint8_t p_header[MAD_BUFFER_GUARD]; uint32_t i_header; uint8_t *p_buf; - void *p_out_buffer; + block_t *p_out_buffer; - if( !pp_block || !*pp_block ) return NULL; + block_t *p_block = pp_block ? *pp_block : NULL; - if( (*pp_block)->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) - { - if( (*pp_block)->i_flags&BLOCK_FLAG_CORRUPTED ) + if (p_block) { + if( p_block->i_flags&(BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) ) { - p_sys->i_state = STATE_NOSYNC; - block_BytestreamFlush( &p_sys->bytestream ); + if( p_block->i_flags&BLOCK_FLAG_CORRUPTED ) + { + p_sys->i_state = STATE_NOSYNC; + block_BytestreamEmpty( &p_sys->bytestream ); + } + date_Set( &p_sys->end_date, 0 ); + block_Release( p_block ); + p_sys->b_discontinuity = true; + return NULL; } -// aout_DateSet( &p_sys->end_date, 0 ); - block_Release( *pp_block ); - p_sys->b_discontinuity = true; - return NULL; - } - if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) - { - /* We've just started the stream, wait for the first PTS. */ - msg_Dbg( p_dec, "waiting for PTS" ); - block_Release( *pp_block ); - return NULL; - } - - if( (*pp_block)->i_rate > 0 ) - p_sys->i_input_rate = (*pp_block)->i_rate; + if( !date_Get( &p_sys->end_date ) && p_block->i_pts <= VLC_TS_INVALID ) + { + /* We've just started the stream, wait for the first PTS. */ + msg_Dbg( p_dec, "waiting for PTS" ); + block_Release( p_block ); + return NULL; + } - block_BytestreamPush( &p_sys->bytestream, *pp_block ); + block_BytestreamPush( &p_sys->bytestream, p_block ); + } else + p_sys->i_state = STATE_SEND_DATA; /* return all the data we have left */ while( 1 ) { @@ -259,10 +247,10 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) case STATE_SYNC: /* New frame, set the Presentation Time Stamp */ p_sys->i_pts = p_sys->bytestream.p_block->i_pts; - if( p_sys->i_pts != 0 && - p_sys->i_pts != aout_DateGet( &p_sys->end_date ) ) + if( p_sys->i_pts > VLC_TS_INVALID && + p_sys->i_pts > date_Get( &p_sys->end_date ) ) { - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_sys->i_state = STATE_HEADER; @@ -276,8 +264,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) } /* Build frame header */ - i_header = (p_header[0]<<24)|(p_header[1]<<16)|(p_header[2]<<8) - |p_header[3]; + i_header = GetDWBE(p_header); /* Check if frame is valid and get frame info */ p_sys->i_frame_size = SyncInfo( i_header, @@ -289,6 +276,8 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) &p_sys->i_max_frame_size, &p_sys->i_layer ); + p_dec->fmt_in.i_profile = p_sys->i_layer; + if( p_sys->i_frame_size == -1 ) { msg_Dbg( p_dec, "emulated startcode" ); @@ -334,8 +323,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) unsigned int i_next_layer; /* Build frame header */ - i_header = (p_header[0]<<24)|(p_header[1]<<16)|(p_header[2]<<8) - |p_header[3]; + i_header = GetDWBE(p_header); i_next_frame_size = SyncInfo( i_header, &i_next_channels, @@ -460,13 +448,17 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->i_free_frame_size = p_sys->i_frame_size; } - /* Copy the whole frame into the buffer. When we reach this point - * we already know we have enough data available. */ - block_GetBytes( &p_sys->bytestream, p_buf, p_sys->i_frame_size ); + /* Copy the whole frame into the buffer. */ + if (block_GetBytes( &p_sys->bytestream, + p_buf, __MIN( (unsigned)p_sys->i_frame_size, p_out_buffer->i_buffer ) )) { + block_Release(p_out_buffer); + return NULL; + } /* Get beginning of next frame for libmad */ if( !p_sys->b_packetizer ) { + assert( p_out_buffer->i_buffer >= (unsigned)p_sys->i_frame_size + MAD_BUFFER_GUARD ); memcpy( p_buf + p_sys->i_frame_size, p_header, MAD_BUFFER_GUARD ); } @@ -475,10 +467,14 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* Make sure we don't reuse the same pts twice */ if( p_sys->i_pts == p_sys->bytestream.p_block->i_pts ) - p_sys->i_pts = p_sys->bytestream.p_block->i_pts = 0; + p_sys->i_pts = p_sys->bytestream.p_block->i_pts = VLC_TS_INVALID; /* So p_block doesn't get re-added several times */ - *pp_block = block_BytestreamPop( &p_sys->bytestream ); + p_block = block_BytestreamPop( &p_sys->bytestream ); + if (pp_block) + *pp_block = p_block; + else if (p_block) + block_Release(p_block); return p_out_buffer; } @@ -490,7 +486,7 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /***************************************************************************** * GetOutBuffer: *****************************************************************************/ -static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) +static uint8_t *GetOutBuffer( decoder_t *p_dec, block_t **pp_out_buffer ) { decoder_sys_t *p_sys = p_dec->p_sys; uint8_t *p_buf; @@ -500,8 +496,8 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) msg_Dbg( p_dec, "MPGA channels:%d samplerate:%d bitrate:%d", p_sys->i_channels, p_sys->i_rate, p_sys->i_bit_rate ); - aout_DateInit( &p_sys->end_date, p_sys->i_rate ); - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + date_Init( &p_sys->end_date, p_sys->i_rate, 1 ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_dec->fmt_out.audio.i_rate = p_sys->i_rate; @@ -524,7 +520,7 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) } else { - aout_buffer_t *p_aout_buffer = GetAoutBuffer( p_dec ); + block_t *p_aout_buffer = GetAoutBuffer( p_dec ); p_buf = p_aout_buffer ? p_aout_buffer->p_buffer : NULL; *pp_out_buffer = p_aout_buffer; } @@ -535,23 +531,23 @@ static uint8_t *GetOutBuffer( decoder_t *p_dec, void **pp_out_buffer ) /***************************************************************************** * GetAoutBuffer: *****************************************************************************/ -static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) +static block_t *GetAoutBuffer( decoder_t *p_dec ) { decoder_sys_t *p_sys = p_dec->p_sys; - aout_buffer_t *p_buf; + block_t *p_buf; - p_buf = p_dec->pf_aout_buffer_new( p_dec, p_sys->i_frame_length ); + p_buf = decoder_NewAudioBuffer( p_dec, p_sys->i_frame_length ); if( p_buf == NULL ) return NULL; - p_buf->start_date = aout_DateGet( &p_sys->end_date ); - p_buf->end_date = - aout_DateIncrement( &p_sys->end_date, - p_sys->i_frame_length * p_sys->i_input_rate / INPUT_RATE_DEFAULT ); - p_buf->b_discontinuity = p_sys->b_discontinuity; + p_buf->i_pts = date_Get( &p_sys->end_date ); + p_buf->i_length = date_Increment( &p_sys->end_date, p_sys->i_frame_length ) + - p_buf->i_pts; + if( p_sys->b_discontinuity ) + p_buf->i_flags |= BLOCK_FLAG_DISCONTINUITY; p_sys->b_discontinuity = false; /* Hack for libmad filter */ - p_buf->i_nb_bytes = p_sys->i_frame_size + MAD_BUFFER_GUARD; + p_buf = block_Realloc( p_buf, 0, p_sys->i_frame_size + MAD_BUFFER_GUARD ); return p_buf; } @@ -564,15 +560,13 @@ static block_t *GetSoutBuffer( decoder_t *p_dec ) decoder_sys_t *p_sys = p_dec->p_sys; block_t *p_block; - p_block = block_New( p_dec, p_sys->i_frame_size ); + p_block = block_Alloc( p_sys->i_frame_size ); if( p_block == NULL ) return NULL; - p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); + p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date ); p_block->i_length = - aout_DateIncrement( &p_sys->end_date, - p_sys->i_frame_length * p_sys->i_input_rate / INPUT_RATE_DEFAULT ) - - p_block->i_pts; + date_Increment( &p_sys->end_date, p_sys->i_frame_length ) - p_block->i_pts; return p_block; } @@ -633,7 +627,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, }; int i_version, i_mode, i_emphasis; - bool b_padding, b_mpeg_2_5, b_crc; + bool b_padding, b_mpeg_2_5; int i_frame_size = 0; int i_bitrate_index, i_samplerate_index; int i_max_bit_rate; @@ -641,7 +635,7 @@ static int SyncInfo( uint32_t i_header, unsigned int * pi_channels, b_mpeg_2_5 = 1 - ((i_header & 0x100000) >> 20); i_version = 1 - ((i_header & 0x80000) >> 19); *pi_layer = 4 - ((i_header & 0x60000) >> 17); - b_crc = !((i_header >> 16) & 0x01); + //bool b_crc = !((i_header >> 16) & 0x01); i_bitrate_index = (i_header & 0xf000) >> 12; i_samplerate_index = (i_header & 0xc00) >> 10; b_padding = (i_header & 0x200) >> 9;