X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Fflac.c;h=d2fc0395b826fd234f87ab91451ab7274132f147;hb=132030acbbe9d9d69bed8e1382515a0060e9bf45;hp=173fb8103c10bea46b2db7f3632441edd32a9b8d;hpb=6ee1e193fd896ab9a4729fde14f009d9ce629815;p=vlc diff --git a/modules/demux/flac.c b/modules/demux/flac.c index 173fb8103c..d2fc0395b8 100644 --- a/modules/demux/flac.c +++ b/modules/demux/flac.c @@ -25,7 +25,12 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include #include #include #include @@ -40,8 +45,8 @@ static int Open ( vlc_object_t * ); static void Close ( vlc_object_t * ); vlc_module_begin(); - set_description( _("FLAC demuxer") ); - set_capability( "demux2", 155 ); + set_description( N_("FLAC demuxer") ); + set_capability( "demux", 155 ); set_category( CAT_INPUT ); set_subcategory( SUBCAT_INPUT_DEMUX ); set_callbacks( Open, Close ); @@ -58,11 +63,12 @@ static int ReadMeta( demux_t *, uint8_t **pp_streaminfo, int *pi_streaminfo ); 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; @@ -78,8 +84,8 @@ struct demux_sys_t 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; }; @@ -93,9 +99,8 @@ struct demux_sys_t 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; + const uint8_t *p_peek; uint8_t *p_streaminfo; int i_streaminfo; @@ -114,7 +119,7 @@ static int Open( vlc_object_t * p_this ) 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; @@ -123,7 +128,7 @@ static int Open( vlc_object_t * p_this ) 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; @@ -146,39 +151,20 @@ static int Open( vlc_object_t * p_this ) 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 ); + 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 ); @@ -193,14 +179,20 @@ static void Close( vlc_object_t * p_this ) 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 ); @@ -220,7 +212,7 @@ static int Demux( demux_t *p_demux ) 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 )) ) @@ -233,7 +225,7 @@ static int Demux( demux_t *p_demux ) 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); } @@ -295,7 +287,7 @@ static int ControlSetTime( demux_t *p_demux, int64_t i_time ) 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; /* */ @@ -325,7 +317,7 @@ static int ControlSetTime( demux_t *p_demux, int64_t i_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) */ - if( i_delta_time < 45*I64C(1000000) ) + if( i_delta_time < 45*INT64_C(1000000) ) { if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos ) ) return VLC_EGENERIC; @@ -354,6 +346,12 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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 * ); @@ -394,17 +392,17 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) 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 ); } @@ -432,7 +430,7 @@ static int ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streami 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; @@ -465,7 +463,7 @@ static int ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streami /* */ ParseStreamInfo( p_demux, &i_sample_rate, &i_sample_count, *pp_streaminfo, *pi_streaminfo ); if( i_sample_rate > 0 ) - p_sys->i_length = i_sample_count * I64C(1000000)/i_sample_rate; + p_sys->i_length = i_sample_count * INT64_C(1000000)/i_sample_rate; /* Be sure we have seekpoint 0 */ s = vlc_seekpoint_New(); @@ -473,8 +471,6 @@ static int ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streami s->i_byte_offset = 0; TAB_APPEND( p_sys->i_seekpoint, p_sys->seekpoint, s ); - - b_last = (*pp_streaminfo)[4]&0x80; while( !b_last ) { @@ -521,7 +517,7 @@ static void ParseStreamInfo( demux_t *p_demux, int *pi_rate, int64_t *pi_count, const int i_skip = 4+4; *pi_rate = GetDWBE(&p_data[i_skip+4+6]) >> 12; - *pi_count = GetQWBE(&p_data[i_skip+4+6]) & ((I64C(1)<<36)-1); + *pi_count = GetQWBE(&p_data[i_skip+4+6]) & ((INT64_C(1)<<36)-1); } static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data, @@ -544,7 +540,7 @@ static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data, continue; s = vlc_seekpoint_New(); - s->i_time_offset = i_sample * I64C(1000000)/i_sample_rate; + s->i_time_offset = i_sample * INT64_C(1000000)/i_sample_rate; s->i_byte_offset = GetQWBE( &p_data[4+18*i+8] ); /* Check for duplicate entry */ @@ -620,17 +616,17 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data ) #define IF_EXTRACT(txt,var) \ if( !strncasecmp(psz, txt, strlen(txt)) ) \ { \ - char * oldval = vlc_meta_Get( p_sys->p_meta, vlc_meta_ ## var ); \ + 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)] ); \ + if( asprintf( &newval, "%s,%s", oldval, &psz[strlen(txt)] ) == -1 ) \ + newval = NULL; \ 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)] ); \ - free( oldval ); \ } IF_EXTRACT("TITLE=", Title ) else IF_EXTRACT("ALBUM=", Album ) @@ -644,7 +640,6 @@ static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data ) { /* 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 ); @@ -684,23 +679,23 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data ) i_type = GetDWBE( p_data ); RM(4); i_len = GetDWBE( p_data ); RM(4); - if( i_data < i_len + 4 ) + if( i_len < 0 || i_data < i_len + 4 ) goto error; psz_mime = strndup( p_data, i_len ); RM(i_len); i_len = GetDWBE( p_data ); RM(4); - if( i_data < i_len + 4*4 + 4) + if( i_len < 0 || i_data < i_len + 4*4 + 4) goto error; psz_description = strndup( p_data, i_len ); RM(i_len); EnsureUTF8( psz_description ); RM(4*4); i_len = GetDWBE( p_data ); RM(4); - if( i_len > i_data ) + if( i_len < 0 || i_len > i_data ) goto error; 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" ) ) @@ -708,19 +703,17 @@ static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data ) 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