/*****************************************************************************
* flac.c : FLAC demux module for vlc
*****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2008 the VideoLAN team
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
#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 <vlc_charset.h>
+#include "vorbis.h" /* vorbis comments */
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-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();
+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
"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_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) );
/* Load the FLAC packetizer */
/* Store STREAMINFO for the decoder and packetizer */
p_streaminfo[4] |= 0x80; /* Fake this as the last metadata block */
- es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
+ es_format_Init( &fmt, AUDIO_ES, VLC_CODEC_FLAC );
fmt.i_extra = i_streaminfo;
fmt.p_extra = p_streaminfo;
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_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_es = es_out_Add( p_demux->out, &p_sys->p_packetizer->fmt_out);
}
- p_sys->i_pts = p_block_out->i_dts;
+ 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 + p_sys->i_time_offset )
- 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 );
es_out_Send( p_demux->out, p_sys->p_es, p_block_out );
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 + p_sys->i_time_offset );
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, p_sys->i_pts_start + p_sys->i_time_offset );
}
else
{
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;
return VLC_EGENERIC;
*pi_int = p_sys->i_attachments;;
- *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
+ *ppp_attach = xmalloc( 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;
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;
+ vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4 );
- psz = strndup( (const char*)p_data, n );
- RM(n);
-
- EnsureUTF8( psz );
-
-#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; \
- 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)] ); \
- }
- 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 ) */
- char *p = strchr( psz, '=' );
- *p++ = '\0';
- vlc_meta_AddExtra( p_sys->p_meta, psz, p );
- }
-#undef IF_EXTRACT
- free( psz );
- }
-#undef RM
}
static void ParsePicture( demux_t *p_demux, const uint8_t *p_data, int 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",
+ msg_Dbg( p_demux, "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_attachments );
projects / vlc / blobdiff