X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fmpeg%2Fmpga.c;h=eccdea19d3e1d58d1dfd08f2b0c1e69987fd4523;hb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;hp=fe85261155e5c739079d72d107bd7ec0bf054239;hpb=bdd53052b177397b7691a42bcbcbdec5ccda078b;p=vlc diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c index fe85261155..eccdea19d3 100644 --- a/modules/demux/mpeg/mpga.c +++ b/modules/demux/mpeg/mpga.c @@ -1,10 +1,11 @@ /***************************************************************************** * mpga.c : MPEG-I/II Audio input module for vlc ***************************************************************************** - * Copyright (C) 2001 VideoLAN - * $Id: mpga.c,v 1.13 2003/12/27 14:47:10 asmax Exp $ + * Copyright (C) 2001-2004 the VideoLAN team + * $Id$ * * Authors: Laurent Aimar + * 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 @@ -18,47 +19,64 @@ * * 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include -#include +#include +#include +#include + +#define MPGA_PACKET_SIZE 1024 /***************************************************************************** * Module descriptor *****************************************************************************/ -static int Open ( vlc_object_t * ); -static void Close ( vlc_object_t * ); +static int Open ( vlc_object_t * ); +static void Close( vlc_object_t * ); vlc_module_begin(); - set_description( _("MPEG-I/II audio demuxer" ) ); + set_category( CAT_INPUT ); + set_subcategory( SUBCAT_INPUT_DEMUX ); + set_description( _("MPEG audio / MP3 demuxer" ) ); set_capability( "demux", 100 ); set_callbacks( Open, Close ); add_shortcut( "mpga" ); add_shortcut( "mp3" ); vlc_module_end(); -/* TODO: - * - free bitrate - */ - /***************************************************************************** * Local prototypes *****************************************************************************/ -static int Demux ( input_thread_t * ); +static int Demux ( demux_t * ); +static int Control( demux_t *, int, va_list ); struct demux_sys_t { - mtime_t i_time; + es_out_id_t *p_es; - int i_bitrate_avg; /* extracted from Xing header */ + bool b_start; + decoder_t *p_packetizer; - es_out_id_t *p_es; + mtime_t i_pts; + mtime_t i_time_offset; + int i_bitrate_avg; /* extracted from Xing header */ + + bool b_initial_sync_failed; + + int i_xing_frames; + int i_xing_bytes; + int i_xing_bitrate_avg; + int i_xing_frame_samples; + block_t *p_block_in, *p_block_out; }; static int HeaderCheck( uint32_t h ) @@ -70,56 +88,15 @@ static int HeaderCheck( uint32_t h ) || (((h >> 10) & 0x03) == 0x03 ) /* valide sampling freq ? */ || ((h & 0x03) == 0x02 )) /* valid emphasis ? */ { - return( VLC_FALSE ); + return false; } - return( VLC_TRUE ); + return true; } -static int mpga_sample_rate[2][4] = -{ - { 44100, 48000, 32000, 0 }, - { 22050, 24000, 16000, 0 } -}; - -static int mpga_bitrate[2][3][16] = -{ - { - { 0, 32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 0}, - { 0, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 0}, - { 0, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 0} - }, - { - { 0, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 0}, - { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0}, - { 0, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160, 0} - } -}; - - #define MPGA_VERSION( h ) ( 1 - (((h)>>19)&0x01) ) #define MPGA_LAYER( h ) ( 3 - (((h)>>17)&0x03) ) -#define MPGA_SAMPLE_RATE(h) \ - ( mpga_sample_rate[MPGA_VERSION(h)][((h)>>10)&0x03] / ( ((h>>20)&0x01) ? 1 : 2) ) -#define MPGA_CHANNELS(h) ( (((h)>>6)&0x03) == 3 ? 1 : 2) -#define MPGA_BITRATE(h) mpga_bitrate[MPGA_VERSION(h)][MPGA_LAYER(h)][((h)>>12)&0x0f] -#define MPGA_PADDING(h) ( ((h)>>9)&0x01 ) #define MPGA_MODE(h) (((h)>> 6)&0x03) -static int mpga_frame_size( uint32_t h ) -{ - switch( MPGA_LAYER(h) ) - { - case 0: - return ( ( 12000 * MPGA_BITRATE(h) ) / MPGA_SAMPLE_RATE(h) + MPGA_PADDING(h) ) * 4; - case 1: - return ( 144000 * MPGA_BITRATE(h) ) / MPGA_SAMPLE_RATE(h) + MPGA_PADDING(h); - case 2: - return ( ( MPGA_VERSION(h) ? 72000 : 144000 ) * MPGA_BITRATE(h) ) / MPGA_SAMPLE_RATE(h) + MPGA_PADDING(h); - default: - return 0; - } -} - static int mpga_frame_samples( uint32_t h ) { switch( MPGA_LAYER(h) ) @@ -135,288 +112,208 @@ static int mpga_frame_samples( uint32_t h ) } } -#if 0 -static int CheckPS( input_thread_t *p_input ) -{ - uint8_t *p_peek; - int i_startcode = 0; - int i_size = input_Peek( p_input, &p_peek, 8196 ); - - while( i_size > 4 ) - { - if( ( p_peek[0] == 0 ) && ( p_peek[1] == 0 ) && - ( p_peek[2] == 1 ) && ( p_peek[3] >= 0xb9 ) && - ++i_startcode >= 3 ) - { - return 1; - } - p_peek++; - i_size--; - } - - return 0; -} -#endif /***************************************************************************** * Open: initializes demux structures *****************************************************************************/ static int Open( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t *)p_this; - demux_sys_t *p_sys; - vlc_bool_t b_forced = VLC_FALSE; - vlc_bool_t b_extention = VLC_FALSE; - - uint32_t header; - - uint8_t *p_peek; - - module_t *p_id3; - - es_format_t fmt; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys; + bool b_forced = false; + uint32_t header; + const uint8_t *p_peek; + block_t *p_block_in, *p_block_out; - if( p_input->psz_demux && - ( !strncmp( p_input->psz_demux, "mpga", 4 ) || - !strncmp( p_input->psz_demux, "mp3", 3 ) ) ) - { - b_forced = VLC_TRUE; - } - if( p_input->psz_name ) - { - int i_len = strlen( p_input->psz_name ); - - if( i_len > 4 && !strcasecmp( &p_input->psz_name[i_len - 4], ".mp3" ) ) - { - b_extention = VLC_TRUE; - } - } - - /* skip possible id3 header */ - p_id3 = module_Need( p_input, "id3", NULL ); - if ( p_id3 ) - { - module_Unneed( p_input, p_id3 ); - } + if( demux_IsPathExtension( p_demux, ".mp3" ) ) + b_forced = true; - if( input_Peek( p_input, &p_peek, 4 ) < 4 ) - { - msg_Err( p_input, "cannot peek" ); - return VLC_EGENERIC; - } + if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC; if( !HeaderCheck( header = GetDWBE( p_peek ) ) ) { - vlc_bool_t b_ok = VLC_FALSE; + bool b_ok = false; int i_peek; - if( !b_forced && !b_extention ) - { - msg_Warn( p_input, "mpga module discarded" ); - return VLC_EGENERIC; - } - - i_peek = input_Peek( p_input, &p_peek, 8096 ); + if( !p_demux->b_force && !b_forced ) return VLC_EGENERIC; + i_peek = stream_Peek( p_demux->s, &p_peek, 8096 ); while( i_peek > 4 ) { if( HeaderCheck( header = GetDWBE( p_peek ) ) ) { - b_ok = VLC_TRUE; + b_ok = true; break; } - p_peek += 4; - i_peek -= 4; - } - if( !b_ok && !b_forced ) - { - msg_Warn( p_input, "mpga module discarded" ); - return VLC_EGENERIC; + p_peek += 1; + i_peek -= 1; } + if( !b_ok && !p_demux->b_force ) return VLC_EGENERIC; } - p_input->pf_demux = Demux; - p_input->pf_demux_control = demux_vaControlDefault; - - p_input->p_demux_data = p_sys = malloc( sizeof( demux_sys_t ) ); - p_sys->i_time = 0; - p_sys->i_bitrate_avg = 0; + DEMUX_INIT_COMMON(); p_sys = p_demux->p_sys; + memset( p_sys, 0, sizeof( demux_sys_t ) ); + p_sys->p_es = 0; + p_sys->b_start = true; - es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'm', 'p', 'g', 'a' ) ); + /* Load the mpeg audio packetizer */ + INIT_APACKETIZER( p_sys->p_packetizer, 'm', 'p', 'g', 'a' ); + es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 ); + LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mpga" ); + /* Xing header */ if( HeaderCheck( header ) ) { - int i_xing; - uint8_t *p_xing; - char psz_description[50]; + int i_xing, i_skip; + const uint8_t *p_xing; + + if( ( i_xing = stream_Peek( p_demux->s, &p_xing, 1024 ) ) < 21 ) + return VLC_SUCCESS; /* No header */ - p_sys->i_bitrate_avg = MPGA_BITRATE( header ) * 1000; - fprintf(stderr,"rate1 %d\n", p_sys->i_bitrate_avg); - if( ( i_xing = stream_Peek( p_input->s, &p_xing, 1024 ) ) >= 21 ) + if( MPGA_VERSION( header ) == 0 ) { - int i_skip; + i_skip = MPGA_MODE( header ) != 3 ? 36 : 21; + } + else + { + i_skip = MPGA_MODE( header ) != 3 ? 21 : 13; + } + + if( i_skip + 8 < i_xing && !strncmp( (char *)&p_xing[i_skip], "Xing", 4 ) ) + { + unsigned int i_flags = GetDWBE( &p_xing[i_skip+4] ); + + p_xing += i_skip + 8; + i_xing -= i_skip + 8; - if( MPGA_VERSION( header) == 0 ) + i_skip = 0; + if( i_flags&0x01 && i_skip + 4 <= i_xing ) /* XING_FRAMES */ { - i_skip = MPGA_MODE( header ) != 3 ? 36 : 21; + p_sys->i_xing_frames = GetDWBE( &p_xing[i_skip] ); + i_skip += 4; } - else + if( i_flags&0x02 && i_skip + 4 <= i_xing ) /* XING_BYTES */ { - i_skip = MPGA_MODE( header ) != 3 ? 21 : 13; + p_sys->i_xing_bytes = GetDWBE( &p_xing[i_skip] ); + i_skip += 4; } - if( i_skip + 8 < i_xing && - !strncmp( &p_xing[i_skip], "Xing", 4 ) ) + if( i_flags&0x04 ) /* XING_TOC */ { - unsigned int i_flags = GetDWBE( &p_xing[i_skip+4] ); - unsigned int i_bytes = 0, i_frames = 0; - - p_xing += i_skip + 8; - i_xing -= i_skip + 8; - - i_skip = 0; - if( i_flags&0x01 && i_skip + 4 <= i_xing ) /* XING_FRAMES */ - { - i_frames = GetDWBE( &p_xing[i_skip] ); - i_skip += 4; - } - if( i_flags&0x02 && i_skip + 4 <= i_xing ) /* XING_BYTES */ - { - i_bytes = GetDWBE( &p_xing[i_skip] ); - i_skip += 4; - } - if( i_flags&0x04 ) /* XING_TOC */ - { - i_skip += 100; - } -#if 0 -// FIXME: doesn't return the right bitrage average, at least with some MP3's - if( i_flags&0x08 && i_skip + 4 <= i_xing ) /* XING_VBR */ - { - p_sys->i_bitrate_avg = GetDWBE( &p_xing[i_skip] ); - fprintf(stderr,"rate2 %d\n", p_sys->i_bitrate_avg); - msg_Dbg( p_input, "xing vbr value present (%d)", p_sys->i_bitrate_avg ); - } - else -#endif - if( i_frames > 0 && i_bytes > 0 ) - { - p_sys->i_bitrate_avg = (int64_t)i_bytes * - (int64_t)8 * - (int64_t)MPGA_SAMPLE_RATE( header ) / - (int64_t)i_frames / - (int64_t)mpga_frame_samples( header ); - msg_Dbg( p_input, "xing frames&bytes value present (%db/s)", p_sys->i_bitrate_avg ); - } + i_skip += 100; + } + + // FIXME: doesn't return the right bitrage average, at least + // with some MP3's + if( i_flags&0x08 && i_skip + 4 <= i_xing ) /* XING_VBR */ + { + p_sys->i_xing_bitrate_avg = GetDWBE( &p_xing[i_skip] ); + msg_Dbg( p_demux, "xing vbr value present (%d)", + p_sys->i_xing_bitrate_avg ); + } + + if( p_sys->i_xing_frames > 0 && p_sys->i_xing_bytes > 0 ) + { + p_sys->i_xing_frame_samples = mpga_frame_samples( header ); + msg_Dbg( p_demux, "xing frames&bytes value present " + "(%d bytes, %d frames, %d samples/frame)", + p_sys->i_xing_bytes, p_sys->i_xing_frames, + p_sys->i_xing_frame_samples ); } } + } - msg_Dbg( p_input, "version=%d layer=%d channels=%d samplerate=%d", - MPGA_VERSION( header ) + 1, - MPGA_LAYER( header ) + 1, - MPGA_CHANNELS( header ), - MPGA_SAMPLE_RATE( header ) ); - - fmt.audio.i_channels = MPGA_CHANNELS( header ); - fmt.audio.i_rate = MPGA_SAMPLE_RATE( header ); - fmt.i_bitrate = p_sys->i_bitrate_avg; - sprintf( psz_description, "MPEG Audio Layer %d, version %d", - MPGA_LAYER ( header ) + 1, MPGA_VERSION ( header ) + 1 ); - fmt.psz_description = strdup( psz_description ); + if( ( p_block_in = stream_Block( p_demux->s, MPGA_PACKET_SIZE ) ) == NULL ) + { + return VLC_EGENERIC; } + p_block_in->i_pts = p_block_in->i_dts = 1; + p_block_out = p_sys->p_packetizer->pf_packetize( + p_sys->p_packetizer, &p_block_in ); - vlc_mutex_lock( &p_input->stream.stream_lock ); - if( input_InitStream( p_input, 0 ) == -1) + if( p_block_out == NULL ) { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - msg_Err( p_input, "cannot init stream" ); - goto error; + msg_Dbg( p_demux, "did not sync on first block" ); + p_sys->b_initial_sync_failed = true; } - p_input->stream.i_mux_rate = p_sys->i_bitrate_avg / 8 / 50; - vlc_mutex_unlock( &p_input->stream.stream_lock ); + else + p_sys->b_initial_sync_failed = false; - p_sys->p_es = es_out_Add( p_input->p_es_out, &fmt ); - return VLC_SUCCESS; + p_sys->i_bitrate_avg = p_sys->p_packetizer->fmt_out.i_bitrate; -error: - free( p_sys ); - return VLC_EGENERIC; -} + if( p_sys->i_xing_bytes && p_sys->i_xing_frames && + p_sys->i_xing_frame_samples ) + { + p_sys->i_bitrate_avg = p_sys->i_xing_bytes * I64C(8) * + p_sys->p_packetizer->fmt_out.audio.i_rate / + p_sys->i_xing_frames / p_sys->i_xing_frame_samples; + } + + p_sys->p_block_in = p_block_in; + p_sys->p_block_out = p_block_out; + /* */ + p_sys->p_packetizer->fmt_out.b_packetized = true; + p_sys->p_es = es_out_Add( p_demux->out, + &p_sys->p_packetizer->fmt_out); + return VLC_SUCCESS; +} /***************************************************************************** * Demux: reads and demuxes data packets ***************************************************************************** * Returns -1 in case of error, 0 in case of EOF, 1 otherwise *****************************************************************************/ -static int Demux( input_thread_t * p_input ) +static int Demux( demux_t *p_demux ) { - demux_sys_t *p_sys = p_input->p_demux_data; - block_t *p_frame; - - uint32_t header; - uint8_t *p_peek; - - if( stream_Peek( p_input->s, &p_peek, 4 ) < 4 ) + demux_sys_t *p_sys = p_demux->p_sys; + block_t *p_block_in, *p_block_out; + if( p_sys->b_start ) { - msg_Warn( p_input, "cannot peek" ); - return 0; + p_sys->b_start = false; + p_block_in = p_sys->p_block_in; + p_sys->p_block_in = NULL; + p_block_out = p_sys->p_block_out; + p_sys->p_block_out = NULL; } - - if( !HeaderCheck( header = GetDWBE( p_peek ) ) ) + else { - /* we need to resynch */ - vlc_bool_t b_ok = VLC_FALSE; - int i_skip = 0; - int i_peek; - - i_peek = stream_Peek( p_input->s, &p_peek, 8096 ); - if( i_peek < 4 ) + if( ( p_block_in = stream_Block( p_demux->s, MPGA_PACKET_SIZE ) ) + == NULL ) { - msg_Warn( p_input, "cannot peek" ); return 0; } - - while( i_peek >= 4 ) + if( p_demux->p_sys->b_initial_sync_failed == true ) { - if( HeaderCheck( header = GetDWBE( p_peek ) ) ) - { - b_ok = VLC_TRUE; - break; - } - - p_peek++; - i_peek--; - i_skip++; + p_block_in->i_pts = p_block_in->i_dts = 1; + /* Only try to resync once */ + p_demux->p_sys->b_initial_sync_failed = 0; } - - msg_Warn( p_input, "garbage=%d bytes", i_skip ); - stream_Read( p_input->s, NULL, i_skip ); - return 1; + else + p_block_in->i_pts = p_block_in->i_dts = 0; + p_block_out = p_sys->p_packetizer->pf_packetize( + p_sys->p_packetizer, &p_block_in ); } - input_ClockManageRef( p_input, - p_input->stream.p_selected_program, - p_sys->i_time * 9 / 100 ); - if( ( p_frame = stream_Block( p_input->s, mpga_frame_size( header ) ) ) == NULL ) + while( p_block_out ) { - msg_Warn( p_input, "cannot read data" ); - return 0; - } + while( p_block_out ) + { + block_t *p_next = p_block_out->p_next; - p_frame->i_dts = - p_frame->i_pts = - input_ClockGetTS( p_input, - p_input->stream.p_selected_program, - p_sys->i_time * 9 / 100 ); + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts ); - es_out_Send( p_input->p_es_out, p_sys->p_es, p_frame ); + p_block_out->p_next = NULL; + p_sys->i_pts = p_block_out->i_pts; + es_out_Send( p_demux->out, p_sys->p_es, p_block_out ); - p_sys->i_time += (mtime_t)1000000 * - (mtime_t)mpga_frame_samples( header ) / - (mtime_t)MPGA_SAMPLE_RATE( header ); - return( 1 ); + p_block_out = p_next; + } + p_block_out = p_sys->p_packetizer->pf_packetize( + p_sys->p_packetizer, &p_block_in ); + } + return 1; } /***************************************************************************** @@ -424,9 +321,80 @@ static int Demux( input_thread_t * p_input ) *****************************************************************************/ static void Close( vlc_object_t * p_this ) { - input_thread_t *p_input = (input_thread_t*)p_this; - demux_sys_t *p_sys = p_input->p_demux_data; + demux_t *p_demux = (demux_t*)p_this; + demux_sys_t *p_sys = p_demux->p_sys; + + DESTROY_PACKETIZER( p_sys->p_packetizer ); + if( p_sys->p_block_out ) block_Release( p_sys->p_block_out ); free( p_sys ); } +/***************************************************************************** + * Control: + *****************************************************************************/ +static int Control( demux_t *p_demux, int i_query, va_list args ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + int64_t *pi64; + bool *pb_bool; + int i_ret; + va_list args_save; + + va_copy ( args_save, args ); + + switch( i_query ) + { + case DEMUX_HAS_UNSUPPORTED_META: + pb_bool = (bool*)va_arg( args, bool* ); + *pb_bool = true; + return VLC_SUCCESS; + + case DEMUX_GET_TIME: + pi64 = (int64_t*)va_arg( args, int64_t * ); + *pi64 = p_sys->i_pts + p_sys->i_time_offset; + return VLC_SUCCESS; + + case DEMUX_SET_TIME: + /* FIXME TODO: implement a high precision seek (with mp3 parsing) + * needed for multi-input */ + + case DEMUX_GET_LENGTH: + i_ret = demux_vaControlHelper( p_demux->s, 0, -1, + p_sys->i_bitrate_avg, 1, i_query, + args ); + /* No bitrate, we can't have it precisely, but we can compute + * a raw approximation with time/position */ + if( i_ret && !p_sys->i_bitrate_avg ) + { + float f_pos = (double)(uint64_t)( stream_Tell( p_demux->s ) ) / + (double)(uint64_t)( stream_Size( p_demux->s ) ); + /* The first few seconds are guaranteed to be very whacky, + * don't bother trying ... Too bad */ + if( f_pos < 0.01 || + (p_sys->i_pts + p_sys->i_time_offset) < 8000000 ) + return VLC_EGENERIC; + + pi64 = (int64_t *)va_arg( args_save, int64_t * ); + *pi64 = (p_sys->i_pts + p_sys->i_time_offset) / f_pos; + return VLC_SUCCESS; + } + va_end( args_save ); + return i_ret; + + default: + i_ret = demux_vaControlHelper( p_demux->s, 0, -1, + p_sys->i_bitrate_avg, 1, i_query, + args ); + if( !i_ret && p_sys->i_bitrate_avg > 0 && + (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME) ) + { + int64_t i_time = I64C(8000000) * stream_Tell(p_demux->s) / + p_sys->i_bitrate_avg; + + /* Fix time_offset */ + if( i_time >= 0 ) p_sys->i_time_offset = i_time - p_sys->i_pts; + } + return i_ret; + } +}