# include "config.h"
#endif
-#include <vlc/vlc.h>
+#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 <assert.h>
#include <vlc_charset.h>
+#include "vorbis.h"
/*****************************************************************************
* Module descriptor
static int Open ( vlc_object_t * );
static void Close ( vlc_object_t * );
-vlc_module_begin();
- set_description( _("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
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;
}
/* 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 )
{
- free( p_sys->p_packetizer->fmt_in.p_extra );
- vlc_object_release( p_sys->p_packetizer );
-
- msg_Err( p_demux, "cannot find flac packetizer" );
+ free( p_sys );
return VLC_EGENERIC;
}
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 );
-
- free( p_sys->p_packetizer->fmt_in.p_extra );
-
/* Delete the decoder */
- vlc_object_release( 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_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 - 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;
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;
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;
}
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 (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 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 );
}
/* */
- ParseStreamInfo( p_demux, &i_sample_rate, &i_sample_count, *pp_streaminfo, *pi_streaminfo );
+ ParseStreamInfo( &i_sample_rate, &i_sample_count, *pp_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();
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, 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 */
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;
+ vorbis_ParseComment( &p_sys->p_meta, &p_data[4], i_data - 4 );
- 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)) ) \
- { \
- 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 ) */
- 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 )
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);
+ psz_mime = strndup( (const char*)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);
+ psz_description = strndup( (const char*)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",
p_data, i_data );
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]) &&
+ if( i_type >= 0 && (unsigned int)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_attachments-1;
projects / vlc / blobdiff