/*****************************************************************************
* Preamble
*****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_demux.h>
#include <vlc_meta.h>
vlc_module_begin();
set_description( _("FLAC demuxer") );
- set_capability( "demux2", 155 );
+ set_capability( "demux", 155 );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
set_callbacks( Open, Close );
struct demux_sys_t
{
- vlc_bool_t b_start;
+ bool b_start;
es_out_id_t *p_es;
/* Packetizer */
decoder_t *p_packetizer;
+
vlc_meta_t *p_meta;
audio_replay_gain_t replay_gain;
seekpoint_t **seekpoint;
/* */
- int i_attachment;
- input_attachment_t **attachment;
+ int i_attachments;
+ input_attachment_t **attachments;
int i_cover_idx;
int i_cover_score;
};
static int Open( vlc_object_t * p_this )
{
demux_t *p_demux = (demux_t*)p_this;
- module_t *p_id3;
demux_sys_t *p_sys;
const byte_t *p_peek;
uint8_t *p_streaminfo;
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
- p_sys->b_start = VLC_TRUE;
+ p_sys->b_start = true;
p_sys->p_meta = NULL;
memset( &p_sys->replay_gain, 0, sizeof(p_sys->replay_gain) );
p_sys->i_length = 0;
p_sys->i_pts_start = 0;
p_sys->p_es = NULL;
TAB_INIT( p_sys->i_seekpoint, p_sys->seekpoint );
- TAB_INIT( p_sys->i_attachment, p_sys->attachment );
+ TAB_INIT( p_sys->i_attachments, p_sys->attachments);
p_sys->i_cover_idx = 0;
p_sys->i_cover_score = 0;
module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
if( !p_sys->p_packetizer->p_module )
{
- if( p_sys->p_packetizer->fmt_in.p_extra )
- free( p_sys->p_packetizer->fmt_in.p_extra );
- vlc_object_destroy( p_sys->p_packetizer );
+ free( p_sys->p_packetizer->fmt_in.p_extra );
+ vlc_object_release( p_sys->p_packetizer );
msg_Err( p_demux, "cannot find flac packetizer" );
return VLC_EGENERIC;
}
- /* Parse possible id3 header */
- if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
- {
- vlc_meta_t *p_meta = (vlc_meta_t *)p_demux->p_private;
-
- if( !p_sys->p_meta )
- {
- p_sys->p_meta = p_meta;
- }
- else if( p_meta )
- {
- vlc_meta_Merge( p_sys->p_meta, p_meta );
- vlc_meta_Delete( p_meta );
- }
- p_demux->p_private = NULL;
- module_Unneed( p_demux, p_id3 );
- }
-
- if( p_sys->i_cover_idx < p_sys->i_attachment )
+ if( p_sys->i_cover_idx < p_sys->i_attachments )
{
char psz_url[128];
if( !p_sys->p_meta )
p_sys->p_meta = vlc_meta_New();
snprintf( psz_url, sizeof(psz_url), "attachment://%s",
- p_sys->attachment[p_sys->i_cover_idx]->psz_name );
- vlc_meta_SetArtURL( p_sys->p_meta, psz_url );
+ p_sys->attachments[p_sys->i_cover_idx]->psz_name );
+ vlc_meta_Set( p_sys->p_meta, vlc_meta_ArtworkURL, psz_url );
}
vlc_audio_replay_gain_MergeFromMeta( &p_sys->replay_gain, p_sys->p_meta );
return VLC_SUCCESS;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
+ TAB_CLEAN( p_sys->i_seekpoint, p_sys->seekpoint );
+
+ 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);
+
/* Unneed module */
module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
- if( p_sys->p_packetizer->fmt_in.p_extra )
- free( p_sys->p_packetizer->fmt_in.p_extra );
+ free( p_sys->p_packetizer->fmt_in.p_extra );
/* Delete the decoder */
- vlc_object_destroy( p_sys->p_packetizer );
+ vlc_object_release( p_sys->p_packetizer );
if( p_sys->p_meta )
vlc_meta_Delete( p_sys->p_meta );
free( p_sys );
return 0;
p_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? 1 : 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;
+ p_sys->p_packetizer->fmt_out.b_packetized = true;
p_sys->p_packetizer->fmt_out.audio_replay_gain = p_sys->replay_gain;
p_sys->p_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
}
int64_t i_next_offset;
int64_t i_delta_time;
int64_t i_delta_offset;
- vlc_bool_t b_seekable;
+ bool b_seekable;
int i;
/* */
i_next_offset = stream_Size(p_demux->s)-p_sys->i_data_pos;
}
i_delta_time = i_time - p_sys->seekpoint[i]->i_time_offset;
- i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time /
+ i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time /
(p_sys->seekpoint[i+1]->i_time_offset-p_sys->seekpoint[i]->i_time_offset);
/* XXX We do exact seek if it's not too far away(45s) */
vlc_meta_Merge( p_meta, p_demux->p_sys->p_meta );
return VLC_SUCCESS;
}
+ else if( i_query == DEMUX_HAS_UNSUPPORTED_META )
+ {
+ bool *pb_bool = (bool*)va_arg( args, bool* );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+ }
else if( i_query == DEMUX_GET_LENGTH )
{
int64_t *pi64 = (int64_t*)va_arg( args, int64_t * );
int *pi_int = (int*)va_arg( args, int * );
int i;
- if( p_sys->i_attachment <= 0 )
+ if( p_sys->i_attachments <= 0 )
return VLC_EGENERIC;
- *pi_int = p_sys->i_attachment;;
- *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachment );
- for( i = 0; i < p_sys->i_attachment; i++ )
- *(ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachment[i] );
+ *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] );
return VLC_SUCCESS;
}
- return demux2_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
+ return demux_vaControlHelper( p_demux->s, p_sys->i_data_pos, -1,
8*0, 1, i_query, args );
}
demux_sys_t *p_sys = p_demux->p_sys;
int i_peek;
const uint8_t *p_peek;
- vlc_bool_t b_last;
+ bool b_last;
int i_sample_rate;
int64_t i_sample_count;
seekpoint_t *s;
s->i_byte_offset = 0;
TAB_APPEND( p_sys->i_seekpoint, p_sys->seekpoint, s );
-
-
b_last = (*pp_streaminfo)[4]&0x80;
while( !b_last )
{
/* TODO sort it by size and remove wrong seek entry (time not increasing) */
}
-static inline void astrcat( char **ppsz_dst, const char *psz_src )
-{
- char *psz_old = *ppsz_dst;
-
- if( !psz_src || !psz_src[0] )
- return;
-
- if( psz_old )
- {
- if( asprintf( ppsz_dst, "%s,%s", psz_old, psz_src ) == -1 )
- *ppsz_dst = NULL;
- free( psz_old );
- }
- else
- {
- *ppsz_dst = strdup( psz_src );
- }
-}
-
#define RM(x) do { i_data -= (x); p_data += (x); } while(0)
static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
{
EnsureUTF8( psz );
-#define IF_EXTRACT(txt,var) if( !strncasecmp(psz, txt, strlen(txt)) ) { astrcat( &p_sys->p_meta->var, &psz[strlen(txt)] ); }
- IF_EXTRACT("TITLE=", psz_title )
- else IF_EXTRACT("ALBUM=", psz_album )
- else IF_EXTRACT("TRACKNUMBER=", psz_tracknum )
- else IF_EXTRACT("ARTIST=", psz_artist )
- else IF_EXTRACT("COPYRIGHT=", psz_copyright )
- else IF_EXTRACT("DESCRIPTION=", psz_description )
- else IF_EXTRACT("GENRE=", psz_genre )
- else IF_EXTRACT("DATE=", psz_date )
+#define IF_EXTRACT(txt,var) \
+ if( !strncasecmp(psz, txt, strlen(txt)) ) \
+ { \
+ const char *oldval = vlc_meta_Get( p_sys->p_meta, vlc_meta_ ## var ); \
+ if( oldval ) \
+ { \
+ char * newval; \
+ asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ); \
+ vlc_meta_Set( p_sys->p_meta, vlc_meta_ ## var, newval ); \
+ free( newval ); \
+ } \
+ else \
+ vlc_meta_Set( p_sys->p_meta, vlc_meta_ ## var, &psz[strlen(txt)] ); \
+ }
+ IF_EXTRACT("TITLE=", Title )
+ else IF_EXTRACT("ALBUM=", Album )
+ else IF_EXTRACT("TRACKNUMBER=", TrackNumber )
+ else IF_EXTRACT("ARTIST=", Artist )
+ else IF_EXTRACT("COPYRIGHT=", Copyright )
+ else IF_EXTRACT("DESCRIPTION=", Description )
+ else IF_EXTRACT("GENRE=", Genre )
+ else IF_EXTRACT("DATE=", Date )
else if( strchr( psz, '=' ) )
{
/* generic (PERFORMER/LICENSE/ORGANIZATION/LOCATION/CONTACT/ISRC,
* undocumented tags and replay gain ) */
- audio_replay_gain_t *r = &p_sys->replay_gain;
char *p = strchr( psz, '=' );
*p++ = '\0';
vlc_meta_AddExtra( p_sys->p_meta, psz, p );
msg_Dbg( p_demux, "FLAC: Picture type=%d mime=%s description='%s' file length=%d",
i_type, psz_mime, psz_description, i_len );
- snprintf( psz_name, sizeof(psz_name), "picture%d", p_sys->i_attachment );
+ snprintf( psz_name, sizeof(psz_name), "picture%d", p_sys->i_attachments );
if( !strcasecmp( psz_mime, "image/jpeg" ) )
strcat( psz_name, ".jpg" );
else if( !strcasecmp( psz_mime, "image/png" ) )
p_attachment = vlc_input_attachment_New( psz_name, psz_mime, psz_description,
p_data, i_data );
- TAB_APPEND( p_sys->i_attachment, p_sys->attachment, p_attachment );
+ TAB_APPEND( p_sys->i_attachments, p_sys->attachments, p_attachment );
if( i_type >= 0 && i_type < sizeof(pi_cover_score)/sizeof(pi_cover_score[0]) &&
p_sys->i_cover_score < pi_cover_score[i_type] )
{
- p_sys->i_cover_idx = p_sys->i_attachment-1;
+ p_sys->i_cover_idx = p_sys->i_attachments-1;
p_sys->i_cover_score = pi_cover_score[i_type];
}
error:
- if( psz_mime )
- free( psz_mime );
- if( psz_description )
- free( psz_description );
+ free( psz_mime );
+ free( psz_description );
}
#undef RM
projects / vlc / blobdiff