X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fcodec%2Fa52.c;h=4fec50c7c073dbb5d2228062cd957be81f2dee40;hb=56220f86120b3d7b7d8c7b2957befede19f669b6;hp=38c7d7cca1942ea28ead8527f4f6bcef4b7754e8;hpb=7f12470415d98e9e0ac725f2bb96b5fa74ef27f1;p=vlc diff --git a/modules/codec/a52.c b/modules/codec/a52.c index 38c7d7cca1..4fec50c7c0 100644 --- a/modules/codec/a52.c +++ b/modules/codec/a52.c @@ -1,26 +1,26 @@ /***************************************************************************** * a52.c: parse A/52 audio sync info and packetize the stream ***************************************************************************** - * Copyright (C) 2001-2002 the VideoLAN team + * Copyright (C) 2001-2002 VLC authors and VideoLAN * $Id$ * * Authors: Stéphane Borel * 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. *****************************************************************************/ /***************************************************************************** @@ -33,11 +33,13 @@ #include #include #include -#include #include +#include #include "a52.h" +#include "../packetizer/packetizer_helper.h" + /***************************************************************************** * Module descriptor *****************************************************************************/ @@ -77,31 +79,21 @@ struct decoder_sys_t /* * Common properties */ - audio_date_t end_date; + date_t end_date; mtime_t i_pts; vlc_a52_header_t frame; }; -enum { - - STATE_NOSYNC, - STATE_SYNC, - STATE_HEADER, - STATE_NEXT_SYNC, - STATE_GET_DATA, - STATE_SEND_DATA -}; - /**************************************************************************** * Local prototypes ****************************************************************************/ -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 * ); /***************************************************************************** * OpenCommon: probe the decoder/packetizer and return score @@ -136,9 +128,10 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) /* Misc init */ p_sys->b_packetizer = b_packetizer; p_sys->i_state = STATE_NOSYNC; - aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); + p_sys->i_pts = VLC_TS_INVALID; - p_sys->bytestream = block_BytestreamInit(); + block_BytestreamInit( &p_sys->bytestream ); /* Set output properties */ p_dec->fmt_out.i_cat = AUDIO_ES; @@ -148,16 +141,17 @@ static int OpenCommon( vlc_object_t *p_this, bool b_packetizer ) /* Set callback */ if( b_packetizer ) - p_dec->pf_packetize = (block_t *(*)(decoder_t *, block_t **)) - DecodeBlock; + p_dec->pf_packetize = DecodeBlock; else - p_dec->pf_decode_audio = (aout_buffer_t *(*)(decoder_t *, block_t **)) - DecodeBlock; + p_dec->pf_decode_audio = DecodeBlock; return VLC_SUCCESS; } static int OpenDecoder( vlc_object_t *p_this ) { + /* HACK: Don't use this codec if we don't have an a52 audio filter */ + if( !module_exists( "a52tofloat32" ) ) + return VLC_EGENERIC; return OpenCommon( p_this, false ); } @@ -171,12 +165,12 @@ 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[VLC_A52_HEADER_SIZE]; uint8_t *p_buf; - void *p_out_buffer; + block_t *p_out_buffer; if( !pp_block || !*pp_block ) return NULL; @@ -187,12 +181,12 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) p_sys->i_state = STATE_NOSYNC; block_BytestreamEmpty( &p_sys->bytestream ); } - aout_DateSet( &p_sys->end_date, 0 ); + date_Set( &p_sys->end_date, 0 ); block_Release( *pp_block ); return NULL; } - if( !aout_DateGet( &p_sys->end_date ) && !(*pp_block)->i_pts ) + if( !date_Get( &p_sys->end_date ) && (*pp_block)->i_pts <= VLC_TS_INVALID) { /* We've just started the stream, wait for the first PTS. */ block_Release( *pp_block ); @@ -227,10 +221,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; @@ -306,11 +300,12 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* 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->frame.i_size ); + block_GetBytes( &p_sys->bytestream, + p_buf, __MIN( p_sys->frame.i_size, p_out_buffer->i_buffer ) ); /* 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 ); @@ -320,8 +315,6 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) return p_out_buffer; } } - - return NULL; } /***************************************************************************** @@ -340,18 +333,18 @@ static void CloseCommon( vlc_object_t *p_this ) /***************************************************************************** * 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; if( p_dec->fmt_out.audio.i_rate != p_sys->frame.i_rate ) { - msg_Info( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d", - p_sys->frame.i_channels, p_sys->frame.i_rate, p_sys->frame.i_bitrate ); + msg_Dbg( p_dec, "A/52 channels:%d samplerate:%d bitrate:%d", + p_sys->frame.i_channels, p_sys->frame.i_rate, p_sys->frame.i_bitrate ); - aout_DateInit( &p_sys->end_date, p_sys->frame.i_rate ); - aout_DateSet( &p_sys->end_date, p_sys->i_pts ); + date_Init( &p_sys->end_date, p_sys->frame.i_rate, 1 ); + date_Set( &p_sys->end_date, p_sys->i_pts ); } p_dec->fmt_out.audio.i_rate = p_sys->frame.i_rate; @@ -374,7 +367,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; } @@ -385,16 +378,17 @@ 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; - - p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples ); - 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->frame.i_samples ); + block_t *p_buf = decoder_NewAudioBuffer( p_dec, p_sys->frame.i_samples ); + if( p_buf ) + { + p_buf->i_pts = date_Get( &p_sys->end_date ); + p_buf->i_length = date_Increment( &p_sys->end_date, + p_sys->frame.i_samples ) - p_buf->i_pts; + } return p_buf; } @@ -405,15 +399,14 @@ static aout_buffer_t *GetAoutBuffer( decoder_t *p_dec ) 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->frame.i_size ); - if( p_block == NULL ) return NULL; - p_block->i_pts = p_block->i_dts = aout_DateGet( &p_sys->end_date ); - - p_block->i_length = - aout_DateIncrement( &p_sys->end_date, p_sys->frame.i_samples ) - p_block->i_pts; + block_t *p_block = block_Alloc( p_sys->frame.i_size ); + if( p_block ) + { + p_block->i_pts = p_block->i_dts = date_Get( &p_sys->end_date ); + p_block->i_length = + date_Increment( &p_sys->end_date, p_sys->frame.i_samples ) - p_block->i_pts; + } return p_block; }