* Preamble
*****************************************************************************/
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
+#include <vlc_codec.h>
#include <vlc_input.h>
-#include "vlc_codec.h"
/*****************************************************************************
* Module descriptor
vlc_module_begin();
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
- set_description( _("MPEG-4 audio demuxer" ) );
- set_capability( "demux2", 110 );
+ set_description( N_("MPEG-4 audio demuxer" ) );
+ set_capability( "demux", 110 );
set_callbacks( Open, Close );
add_shortcut( "m4a" );
add_shortcut( "mp4a" );
*****************************************************************************/
struct demux_sys_t
{
- vlc_bool_t b_start;
+ bool b_start;
es_out_id_t *p_es;
- vlc_meta_t *meta;
decoder_t *p_packetizer;
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- module_t *p_id3;
const uint8_t *p_peek;
- int b_forced = VLC_FALSE;
+ int b_forced = false;
- if( demux2_IsPathExtension( p_demux, ".aac" ) )
- b_forced = VLC_TRUE;
+ if( demux_IsPathExtension( p_demux, ".aac" ) )
+ b_forced = true;
if( !p_demux->b_force && !b_forced )
return VLC_EGENERIC;
p_demux->pf_demux = Demux;
p_demux->pf_control= Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->p_es = NULL;
- p_sys->b_start = VLC_TRUE;
- p_sys->i_pts = 0;
- p_sys->i_bytes = 0;
- p_sys->i_time_offset = 0;
- p_sys->i_bitrate_avg = 0;
+ p_demux->p_sys = p_sys = calloc( sizeof( demux_sys_t ), 1 );
+ p_sys->b_start = true;
/* Load the mpeg 4 audio packetizer */
INIT_APACKETIZER( p_sys->p_packetizer, 'm', 'p', '4', 'a' );
es_format_Init( &p_sys->p_packetizer->fmt_out, UNKNOWN_ES, 0 );
LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mp4 audio" );
- /* Parse possible id3 header */
- 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 ) ) )
- {
- demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
- p_sys->meta = p_demux_meta->p_meta;
- p_demux->p_private = NULL;
- module_Unneed( p_demux, p_id3 );
- TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
- }
- free( p_demux->p_private );
return VLC_SUCCESS;
}
}
p_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? M4A_PTS_START : 0;
- p_sys->b_start = VLC_FALSE;
+ p_sys->b_start = false;
while( (p_block_out = p_sys->p_packetizer->pf_packetize(
p_sys->p_packetizer, &p_block_in )) )
if( p_sys->p_es == NULL )
{
- 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);
}
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
-
- p_block_out->p_next = NULL;
-
p_sys->i_pts = p_block_out->i_pts;
- if( p_sys->i_pts > M4A_PTS_START + I64C(500000) )
+ if( p_sys->i_pts > M4A_PTS_START + INT64_C(500000) )
p_sys->i_bitrate_avg =
- 8*I64C(1000000)*p_sys->i_bytes/(p_sys->i_pts-M4A_PTS_START);
+ 8*INT64_C(1000000)*p_sys->i_bytes/(p_sys->i_pts-M4A_PTS_START);
p_sys->i_bytes += p_block_out->i_buffer;
+
+ /* Correct timestamp */
+ p_block_out->i_pts += p_sys->i_time_offset;
+ p_block_out->i_dts += p_sys->i_time_offset;
+
+ /* */
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
+
es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
p_block_out = p_next;
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
- vlc_meta_t *p_meta;
-
+ bool *pb_bool;
int64_t *pi64;
int i_ret;
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 );
+ case DEMUX_HAS_UNSUPPORTED_META:
+ pb_bool = (bool *)va_arg( args, bool* );
+ *pb_bool = true;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
case DEMUX_SET_TIME: /* TODO high precision seek for multi-input */
default:
- i_ret = demux2_vaControlHelper( p_demux->s, 0, -1,
+ i_ret = demux_vaControlHelper( p_demux->s, 0, -1,
p_sys->i_bitrate_avg, 1, i_query, args);
/* Fix time_offset */
if( (i_query == DEMUX_SET_POSITION || i_query == DEMUX_SET_TIME ) &&
i_ret == VLC_SUCCESS && p_sys->i_bitrate_avg > 0 )
{
- int64_t i_time = I64C(8000000) * stream_Tell(p_demux->s) /
+ int64_t i_time = INT64_C(8000000) * stream_Tell(p_demux->s) /
p_sys->i_bitrate_avg;
if( i_time >= 0 )