#include <vlc/vlc.h>
#include <vlc_demux.h>
#include <vlc_codec.h>
-#include <vlc_meta.h>
#include <vlc_input.h>
/*****************************************************************************
{
vlc_bool_t 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;
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 */
- 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;
- int i;
- /* attachments not supported in this demuxer */
- for( i = 0; i < p_demux_meta->i_attachments; i++ )
- free( p_demux_meta->attachments[i] );
- TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
- }
- free( p_demux->p_private );
- }
return VLC_SUCCESS;
}
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- var_Destroy( p_demux, "meta-preparsed" );
- if( p_sys->meta ) vlc_meta_Delete( p_sys->meta );
-
DESTROY_PACKETIZER( p_sys->p_packetizer );
free( p_sys );
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_es = es_out_Add( p_demux->out,
&p_sys->p_packetizer->fmt_out);
}
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;
-
+ vlc_bool_t *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 = (vlc_bool_t *)va_arg( args, vlc_bool_t* );
+ *pb_bool = VLC_TRUE;
return VLC_SUCCESS;
case DEMUX_GET_TIME: