* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_demux.h>
-#include <vlc_meta.h>
#include <vlc_codec.h>
#include <vlc_input.h>
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
set_description( _("MPEG audio / MP3 demuxer" ) );
- set_capability( "demux2", 100 );
+ set_capability( "demux", 100 );
set_callbacks( Open, Close );
add_shortcut( "mpga" );
add_shortcut( "mp3" );
struct demux_sys_t
{
es_out_id_t *p_es;
- vlc_meta_t *meta;
- vlc_bool_t b_start;
+ bool b_start;
decoder_t *p_packetizer;
mtime_t i_pts;
mtime_t i_time_offset;
int i_bitrate_avg; /* extracted from Xing header */
- vlc_bool_t b_initial_sync_failed;
+ 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;
-
- int i_attachments;
- input_attachment_t **attachments;
};
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;
}
#define MPGA_VERSION( h ) ( 1 - (((h)>>19)&0x01) )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- vlc_bool_t b_forced = VLC_FALSE;
+ bool b_forced = false;
uint32_t header;
const uint8_t *p_peek;
- module_t *p_id3;
block_t *p_block_in, *p_block_out;
- if( demux2_IsPathExtension( p_demux, ".mp3" ) )
- b_forced = VLC_TRUE;
+ if( demux_IsPathExtension( p_demux, ".mp3" ) )
+ b_forced = true;
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( !p_demux->b_force && !b_forced ) return VLC_EGENERIC;
{
if( HeaderCheck( header = GetDWBE( p_peek ) ) )
{
- b_ok = VLC_TRUE;
+ b_ok = true;
break;
}
p_peek += 1;
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 = VLC_TRUE;
- p_sys->meta = 0;
+ p_sys->b_start = true;
/* Load the mpeg audio packetizer */
INIT_APACKETIZER( p_sys->p_packetizer, 'm', 'p', 'g', 'a' );
if( p_block_out == NULL )
{
msg_Dbg( p_demux, "did not sync on first block" );
- p_sys->b_initial_sync_failed = VLC_TRUE;
+ p_sys->b_initial_sync_failed = true;
}
else
- p_sys->b_initial_sync_failed = VLC_FALSE;
+ p_sys->b_initial_sync_failed = false;
p_sys->i_bitrate_avg = p_sys->p_packetizer->fmt_out.i_bitrate;
p_sys->p_block_in = p_block_in;
p_sys->p_block_out = p_block_out;
- /* Parse possible id3 header */
- if( !var_CreateGetBool( p_demux, "meta-preparsed" ) )
- {
- p_demux->p_private = malloc( sizeof( demux_meta_t ) );
- if( !p_demux->p_private )
- return VLC_ENOMEM;
- if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
- {
- module_Unneed( p_demux, p_id3 );
- demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
- p_sys->meta = p_demux_meta->p_meta;
- p_sys->i_attachments = p_demux_meta->i_attachments;
- p_sys->attachments = p_demux_meta->attachments;
- }
- free( p_demux->p_private );
- }
/* */
- p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
- vlc_audio_replay_gain_MergeFromMeta( &p_sys->p_packetizer->fmt_out.audio_replay_gain,
- p_sys->meta );
+ 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;
block_t *p_block_in, *p_block_out;
if( p_sys->b_start )
{
- p_sys->b_start = VLC_FALSE;
+ 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;
{
return 0;
}
- if( p_demux->p_sys->b_initial_sync_failed == VLC_TRUE )
+ if( p_demux->p_sys->b_initial_sync_failed == true )
{
p_block_in->i_pts = p_block_in->i_dts = 1;
/* Only try to resync once */
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- var_Destroy( p_demux, "meta-preparsed" );
-
DESTROY_PACKETIZER( p_sys->p_packetizer );
- if( p_sys->meta ) vlc_meta_Delete( p_sys->meta );
if( p_sys->p_block_out ) block_Release( p_sys->p_block_out );
- int i;
- for( i = 0; i < p_sys->i_attachments; i++ )
- free( p_sys->attachments[i] );
- TAB_CLEAN( p_sys->i_attachments, p_sys->attachments);
-
free( p_sys );
}
{
demux_sys_t *p_sys = p_demux->p_sys;
int64_t *pi64;
- vlc_meta_t *p_meta;
+ bool *pb_bool;
int i_ret;
+ va_list args_save;
- input_attachment_t ***ppp_attach;
- int *pi_int, i;
+ va_copy ( args_save, args );
switch( i_query )
{
- case DEMUX_GET_META:
- p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
- vlc_meta_Merge( p_meta, p_sys->meta );
- return VLC_SUCCESS;
-
- case DEMUX_GET_ATTACHMENTS:
- ppp_attach =
- (input_attachment_t***)va_arg( args, input_attachment_t*** );
- pi_int = (int*)va_arg( args, int * );
-
- if( p_sys->i_attachments <= 0 )
- return VLC_EGENERIC;
-
- *pi_int = p_sys->i_attachments;
- *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
- for( i = 0; i < p_sys->i_attachments; i++ )
- (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
+ case DEMUX_HAS_UNSUPPORTED_META:
+ pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
/* FIXME TODO: implement a high precision seek (with mp3 parsing)
* needed for multi-input */
- default:
- i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+ 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 && i_query == DEMUX_GET_LENGTH &&!p_sys->i_bitrate_avg )
+ if( i_ret && !p_sys->i_bitrate_avg )
{
- float f_pos = (double)( stream_Tell( p_demux->s ) ) /
- (double)( stream_Size( p_demux->s ) );
+ 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, int64_t * );
+ 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) )
{
projects / vlc / blobdiff