/*****************************************************************************
* flac.c : FLAC demux module for vlc
*****************************************************************************
- * Copyright (C) 2001-2003 the VideoLAN team
+ * Copyright (C) 2001-2008 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Laurent Aimar <fenrir@via.ecp.fr>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* 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_meta.h>
-#include <vlc_input.h>
-#include <vlc_codec.h>
+#include <vlc_meta.h> /* vlc_meta_* */
+#include <vlc_input.h> /* vlc_input_attachment, vlc_seekpoint */
+#include <vlc_codec.h> /* decoder_t */
+#include <vlc_charset.h> /* EnsureUTF8 */
+
#include <assert.h>
+#include "xiph_metadata.h" /* vorbis comments */
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- set_description( _("FLAC demuxer") );
- set_capability( "demux2", 155 );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_DEMUX );
- set_callbacks( Open, Close );
- add_shortcut( "flac" );
-vlc_module_end();
+vlc_module_begin ()
+ set_description( N_("FLAC demuxer") )
+ set_capability( "demux", 155 )
+ set_category( CAT_INPUT )
+ set_subcategory( SUBCAT_INPUT_DEMUX )
+ set_callbacks( Open, Close )
+ add_shortcut( "flac" )
+vlc_module_end ()
/*****************************************************************************
* Local prototypes
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;
int64_t i_time_offset;
int64_t i_pts;
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;
- byte_t *p_peek;
+ const uint8_t *p_peek;
uint8_t *p_streaminfo;
int i_streaminfo;
+ es_format_t fmt;
/* Have a peep at the show. */
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
"continuing anyway" );
}
+ p_sys = malloc( sizeof( demux_sys_t ) );
+ if( unlikely(p_sys == NULL) )
+ return VLC_ENOMEM;
+
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_demux->p_sys = p_sys;
+ 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_time_offset = 0;
p_sys->i_pts = 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;
}
/* Load the FLAC packetizer */
- INIT_APACKETIZER( p_sys->p_packetizer, 'f', 'l', 'a', 'c' );
-
/* Store STREAMINFO for the decoder and packetizer */
p_streaminfo[4] |= 0x80; /* Fake this as the last metadata block */
- p_sys->p_packetizer->fmt_in.i_extra = i_streaminfo;
- p_sys->p_packetizer->fmt_in.p_extra = p_streaminfo;
+ es_format_Init( &fmt, AUDIO_ES, VLC_CODEC_FLAC );
+ fmt.i_extra = i_streaminfo;
+ fmt.p_extra = p_streaminfo;
- p_sys->p_packetizer->p_module =
- module_Need( p_sys->p_packetizer, "packetizer", NULL, 0 );
- if( !p_sys->p_packetizer->p_module )
+ p_sys->p_packetizer = demux_PacketizerNew( p_demux, &fmt, "flac" );
+ if( !p_sys->p_packetizer )
{
- 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 );
-
- msg_Err( p_demux, "cannot find flac packetizer" );
+ free( p_sys );
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;
- /* Unneed module */
- module_Unneed( p_sys->p_packetizer, p_sys->p_packetizer->p_module );
+ for( int i = 0; i < p_sys->i_seekpoint; i++ )
+ vlc_seekpoint_Delete(p_sys->seekpoint[i]);
+ TAB_CLEAN( p_sys->i_seekpoint, p_sys->seekpoint );
- if( p_sys->p_packetizer->fmt_in.p_extra )
- free( p_sys->p_packetizer->fmt_in.p_extra );
+ for( int i = 0; i < p_sys->i_attachments; i++ )
+ vlc_input_attachment_Delete( p_sys->attachments[i] );
+ TAB_CLEAN( p_sys->i_attachments, p_sys->attachments);
/* Delete the decoder */
- vlc_object_destroy( p_sys->p_packetizer );
+ demux_PacketizerDestroy( p_sys->p_packetizer );
+
if( p_sys->p_meta )
vlc_meta_Delete( p_sys->p_meta );
free( p_sys );
if( !( p_block_in = stream_Block( p_demux->s, FLAC_PACKET_SIZE ) ) )
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_block_in->i_pts = p_block_in->i_dts = p_sys->b_start ? VLC_TS_0 : VLC_TS_INVALID;
+ 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.audio_replay_gain = p_sys->replay_gain;
+ 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);
}
+ p_sys->i_pts = p_block_out->i_dts - VLC_TS_0;
+
+ /* Correct timestamp */
+ p_block_out->i_pts += p_sys->i_time_offset;
+ p_block_out->i_dts += p_sys->i_time_offset;
+
/* set PCR */
- if( p_block_out->i_dts >= p_sys->i_pts_start )
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
- else
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_block_out->i_dts );
- p_sys->i_pts = p_block_out->i_dts;
es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
p_block_out = p_next;
}
return i_length;
}
+
static int64_t ControlGetTime( demux_t *p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
return __MAX(p_sys->i_pts, p_sys->i_pts_start) + p_sys->i_time_offset;
}
+
static int ControlSetTime( demux_t *p_demux, int64_t i_time )
{
demux_sys_t *p_sys = p_demux->p_sys;
- int64_t i_next_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;
/* */
if( p_sys->seekpoint[i]->i_time_offset <= i_time )
break;
}
- if( i+1 < p_sys->i_seekpoint )
- {
- i_next_time = p_sys->seekpoint[i+1]->i_time_offset;
- i_next_offset = p_sys->seekpoint[i+1]->i_byte_offset;
- }
- else
- {
- i_next_time = p_sys->i_length;
- 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 /
- (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;
+
p_sys->i_time_offset = p_sys->seekpoint[i]->i_time_offset - p_sys->i_pts;
p_sys->i_pts_start = p_sys->i_pts+i_delta_time;
- es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_sys->p_es, p_sys->i_pts_start );
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_sys->i_pts_start + p_sys->i_time_offset );
}
else
{
+ int64_t i_delta_offset;
+ int64_t i_next_time;
+ int64_t i_next_offset;
+
+ if( i+1 < p_sys->i_seekpoint )
+ {
+ i_next_time = p_sys->seekpoint[i+1]->i_time_offset;
+ i_next_offset = p_sys->seekpoint[i+1]->i_byte_offset;
+ }
+ else
+ {
+ i_next_time = p_sys->i_length;
+ i_next_offset = stream_Size(p_demux->s)-p_sys->i_data_pos;
+ }
+
+ i_delta_offset = 0;
+ if( i_next_time-p_sys->seekpoint[i]->i_time_offset > 0 )
+ i_delta_offset = (i_next_offset - p_sys->seekpoint[i]->i_byte_offset) * i_delta_time /
+ (i_next_time-p_sys->seekpoint[i]->i_time_offset);
+
if( stream_Seek( p_demux->s, p_sys->seekpoint[i]->i_byte_offset+p_sys->i_data_pos + i_delta_offset ) )
return VLC_EGENERIC;
+
p_sys->i_pts_start = p_sys->i_pts;
p_sys->i_time_offset = (p_sys->seekpoint[i]->i_time_offset+i_delta_time) - p_sys->i_pts;
}
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 * );
double *pf = (double*)va_arg( args, double * );
const int64_t i_length = ControlGetLength(p_demux);
if( i_length > 0 )
- *pf = (double)ControlGetTime(p_demux) / (double)i_length;
+ {
+ double current = ControlGetTime(p_demux);
+ *pf = current / (double)i_length;
+ }
else
*pf= 0.0;
return VLC_SUCCESS;
input_attachment_t ***ppp_attach =
(input_attachment_t***)va_arg( args, input_attachment_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 = xmalloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
+ for( int 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 );
}
META_PICTURE = 6,
};
-static inline int Get24bBE( uint8_t *p )
+static inline int Get24bBE( const uint8_t *p )
{
return (p[0] << 16)|(p[1] << 8)|(p[2]);
}
-static void ParseStreamInfo( demux_t *p_demux, int *pi_rate, int64_t *pi_count, uint8_t *p_data, int i_data );
-static void ParseSeekTable( demux_t *p_demux, uint8_t *p_data, int i_data, int i_sample_rate );
-static void ParseComment( demux_t *, uint8_t *p_data, int i_data );
-static void ParsePicture( demux_t *, uint8_t *p_data, int i_data );
+static void ParseStreamInfo( int *pi_rate, int64_t *pi_count, uint8_t *p_data );
+static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
+ int i_sample_rate );
+static void ParseComment( demux_t *, const uint8_t *p_data, int i_data );
+static void ParsePicture( demux_t *, const uint8_t *p_data, int i_data );
static int ReadMeta( demux_t *p_demux, uint8_t **pp_streaminfo, int *pi_streaminfo )
{
demux_sys_t *p_sys = p_demux->p_sys;
int i_peek;
- uint8_t *p_peek;
- vlc_bool_t b_last;
- int i_sample_rate;
+ const uint8_t *p_peek;
+ bool b_last;
+ int i_sample_rate = 0;
int64_t i_sample_count;
- seekpoint_t *s;
-
- /* Read STREAMINFO */
- i_peek = stream_Peek( p_demux->s, &p_peek, 8 );
- if( (p_peek[4] & 0x7F) != META_STREAMINFO )
- {
- msg_Err( p_demux, "this isn't a STREAMINFO metadata block" );
- return VLC_EGENERIC;
- }
- if( Get24bBE(&p_peek[5]) != (STREAMINFO_SIZE - 4) )
- {
- msg_Err( p_demux, "invalid size for a STREAMINFO metadata block" );
- return VLC_EGENERIC;
- }
-
- *pi_streaminfo = 4 + STREAMINFO_SIZE;
- *pp_streaminfo = malloc( 4 + STREAMINFO_SIZE );
- if( *pp_streaminfo == NULL )
- return VLC_EGENERIC;
-
- if( stream_Read( p_demux->s, *pp_streaminfo, 4+STREAMINFO_SIZE ) != 4+STREAMINFO_SIZE )
- {
- msg_Err( p_demux, "failed to read STREAMINFO metadata block" );
- free( *pp_streaminfo );
- return VLC_EGENERIC;
- }
- /* */
- 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;
+ *pp_streaminfo = NULL;
/* Be sure we have seekpoint 0 */
- s = vlc_seekpoint_New();
+ seekpoint_t *s = vlc_seekpoint_New();
s->i_time_offset = 0;
s->i_byte_offset = 0;
TAB_APPEND( p_sys->i_seekpoint, p_sys->seekpoint, s );
+ static const uint8_t marker[4] = { 'f', 'L', 'a', 'C' };
+ uint8_t header[4];
+ if( stream_Read( p_demux->s, header, 4) < 4)
+ return VLC_EGENERIC;
+ if (memcmp(header, marker, 4))
+ return VLC_EGENERIC;
- b_last = (*pp_streaminfo)[4]&0x80;
+ b_last = 0;
while( !b_last )
{
int i_len;
i_type = p_peek[0]&0x7f;
i_len = Get24bBE( &p_peek[1] );
- if( i_type == META_SEEKTABLE )
+ if( i_type == META_STREAMINFO && !*pp_streaminfo )
+ {
+ if( i_len != (STREAMINFO_SIZE - 4) ) {
+ msg_Err( p_demux, "invalid size %d for a STREAMINFO metadata block", i_len );
+ return VLC_EGENERIC;
+ }
+ i_peek = stream_Peek( p_demux->s, &p_peek, STREAMINFO_SIZE);
+ if( i_peek == STREAMINFO_SIZE)
+
+ *pi_streaminfo = STREAMINFO_SIZE + 4;
+ *pp_streaminfo = malloc( STREAMINFO_SIZE + 4 );
+ if( *pp_streaminfo == NULL )
+ return VLC_EGENERIC;
+
+ if( stream_Read( p_demux->s, &(*pp_streaminfo)[4], STREAMINFO_SIZE ) != STREAMINFO_SIZE )
+ {
+ msg_Err( p_demux, "failed to read STREAMINFO metadata block" );
+ free( *pp_streaminfo );
+ return VLC_EGENERIC;
+ }
+
+ memcpy(*pp_streaminfo, marker, 4);
+
+ /* */
+ ParseStreamInfo( &i_sample_rate, &i_sample_count, *pp_streaminfo );
+ if( i_sample_rate > 0 )
+ p_sys->i_length = i_sample_count * INT64_C(1000000)/i_sample_rate;
+ continue;
+ }
+ else if( i_type == META_SEEKTABLE )
{
i_peek = stream_Peek( p_demux->s, &p_peek, 4+i_len );
if( i_peek == 4+i_len )
/* */
p_sys->i_data_pos = stream_Tell( p_demux->s );
+ if (!*pp_streaminfo)
+ return VLC_EGENERIC;
+
return VLC_SUCCESS;
}
-static void ParseStreamInfo( demux_t *p_demux, int *pi_rate, int64_t *pi_count, uint8_t *p_data, int i_data )
+static void ParseStreamInfo( int *pi_rate, int64_t *pi_count, uint8_t *p_data )
{
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, uint8_t *p_data, int i_data, int i_sample_rate )
+
+static void ParseSeekTable( demux_t *p_demux, const uint8_t *p_data, int i_data,
+ int i_sample_rate )
{
demux_sys_t *p_sys = p_demux->p_sys;
seekpoint_t *s;
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 */
}
/* 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 )
- {
- asprintf( ppsz_dst, "%s,%s", psz_old, psz_src );
- 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, uint8_t *p_data, int i_data )
+static void ParseComment( demux_t *p_demux, const uint8_t *p_data, int i_data )
{
demux_sys_t *p_sys = p_demux->p_sys;
- int n;
- int i_comment;
-
- if( i_data < 8 )
- return;
-
- RM(4);
-
- n = GetDWLE(p_data); RM(4);
- if( n < 0 || n > i_data )
- return;
-#if 0
- if( n > 0 )
- {
- /* TODO report vendor string ? */
- char *psz_vendor = psz_vendor = strndup( p_data, n );
- msg_Dbg( p_demux, "FLAC: COMMENT vendor length=%d vendor=%s\n", n, psz_vendor );
- free( psz_vendor );
- }
-#endif
- RM(n);
if( i_data < 4 )
return;
- i_comment = GetDWLE(p_data); RM(4);
- if( i_comment <= 0 )
- return;
-
- p_sys->p_meta = vlc_meta_New();
-
- for( ; i_comment > 0; i_comment-- )
- {
- char *psz;
- if( i_data < 4 )
- break;
- n = GetDWLE(p_data); RM(4);
- if( n > i_data )
- break;
- if( n <= 0 )
- continue;
-
- psz = strndup( p_data, n );
- RM(n);
-
- 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 )
- 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 );
- }
-#undef IF_EXTRACT
- free( psz );
- }
-#undef RM
+ vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4,
+ &p_sys->i_attachments, &p_sys->attachments,
+ &p_sys->i_cover_score, &p_sys->i_cover_idx, NULL, NULL );
}
-static void ParsePicture( demux_t *p_demux, uint8_t *p_data, int i_data )
+static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int i_data )
{
- static const int pi_cover_score[] = {
- 0, /* other */
- 2, 1, /* icons */
- 10, /* front cover */
- 9, /* back cover */
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 6, /* movie/video screen capture */
- 0,
- 7, /* Illustration */
- 8, /* Band/Artist logotype */
- 0, /* Publisher/Studio */
- };
demux_sys_t *p_sys = p_demux->p_sys;
- int i_type;
- int i_len;
- char *psz_mime = NULL;
- char *psz_description = NULL;
- input_attachment_t *p_attachment;
- char psz_name[128];
-
- if( i_data < 4 + 3*4 )
+
+ i_data -= 4; p_data += 4;
+
+ input_attachment_t *p_attachment = ParseFlacPicture( p_data, i_data,
+ p_sys->i_attachments, &p_sys->i_cover_score, &p_sys->i_cover_idx );
+ if( p_attachment == NULL )
return;
-#define RM(x) do { i_data -= (x); p_data += (x); } while(0)
- RM(4);
-
- i_type = GetDWBE( p_data ); RM(4);
- i_len = GetDWBE( p_data ); RM(4);
- if( 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)
- 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 )
- 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 );
- if( !strcasecmp( psz_mime, "image/jpeg" ) )
- strcat( psz_name, ".jpg" );
- else if( !strcasecmp( psz_mime, "image/png" ) )
- strcat( psz_name, ".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 );
-
- 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_score = pi_cover_score[i_type];
- }
-error:
- if( psz_mime )
- free( psz_mime );
- if( psz_description )
- free( psz_description );
+
+ TAB_APPEND( p_sys->i_attachments, p_sys->attachments, p_attachment );
}
-#undef RM
projects / vlc / blobdiff