/*****************************************************************************
- * demux.c: demuxer using ffmpeg (libavformat).
+ * demux.c: demuxer using libavformat
*****************************************************************************
* Copyright (C) 2004-2009 the VideoLAN team
* $Id$
#include <vlc_charset.h>
#include <vlc_avcodec.h>
-/* ffmpeg header */
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-# include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-# include <ffmpeg/avformat.h>
-#endif
+#include <libavformat/avformat.h>
#include "../../codec/avcodec/avcodec.h"
+#include "../../codec/avcodec/chroma.h"
#include "avformat.h"
#include "../xiph.h"
#include "../vobsub.h"
+/* Support for deprecated APIs */
+
+#if LIBAVFORMAT_VERSION_MAJOR < 54
+# define AVDictionaryEntry AVMetadataTag
+# define av_dict_get av_metadata_get
+#endif
+
//#define AVFORMAT_DEBUG 1
/* Version checking */
#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(50<<8)+0) )
-# define HAVE_FFMPEG_CODEC_ATTACHMENT 1
-#endif
-
-#if (LIBAVFORMAT_VERSION_INT >= ((52<<16)+(15<<8)+0) )
-# define HAVE_FFMPEG_CHAPTERS 1
+# define HAVE_AVUTIL_CODEC_ATTACHMENT 1
#endif
/*****************************************************************************
AVInputFormat *fmt;
AVFormatContext *ic;
- URLContext url;
- URLProtocol prot;
int i_tk;
es_out_id_t **tk;
+ int64_t *tk_pcr;
+ int64_t i_pcr;
- int64_t i_pcr;
- int64_t i_pcr_inc;
- int i_pcr_tk;
+ unsigned i_ssa_order;
int i_attachments;
input_attachment_t **attachments;
static int IORead( void *opaque, uint8_t *buf, int buf_size );
static int64_t IOSeek( void *opaque, int64_t offset, int whence );
+static block_t *BuildSsaFrame( const AVPacket *p_pkt, unsigned i_order );
static void UpdateSeekPoint( demux_t *p_demux, int64_t i_time );
+static void ResetTime( demux_t *p_demux, int64_t i_time );
/*****************************************************************************
* Open
AVInputFormat *fmt;
unsigned int i;
int64_t i_start_time = -1;
+ bool b_can_seek;
+ char *psz_url;
+ if( p_demux->psz_file )
+ psz_url = strdup( p_demux->psz_file );
+ else
+ {
+ if( asprintf( &psz_url, "%s://%s", p_demux->psz_access, p_demux->psz_location ) == -1)
+ return VLC_ENOMEM;
+ }
+ msg_Dbg( p_demux, "trying url: %s", psz_url );
/* Init Probe data */
- pd.filename = p_demux->psz_path;
- if( ( pd.buf_size = stream_Peek( p_demux->s, &pd.buf, 2048 + 213 ) ) <= 0 )
+ pd.filename = psz_url;
+ if( ( pd.buf_size = stream_Peek( p_demux->s, (const uint8_t**)&pd.buf, 2048 + 213 ) ) <= 0 )
{
+ free( psz_url );
msg_Warn( p_demux, "cannot peek" );
return VLC_EGENERIC;
}
if( !( fmt = av_probe_input_format( &pd, 1 ) ) )
{
msg_Dbg( p_demux, "couldn't guess format" );
+ free( psz_url );
return VLC_EGENERIC;
}
- /* Don't try to handle MPEG unless forced */
- if( !p_demux->b_force &&
- ( !strcmp( fmt->name, "mpeg" ) ||
- !strcmp( fmt->name, "vcd" ) ||
- !strcmp( fmt->name, "vob" ) ||
- !strcmp( fmt->name, "mpegts" ) ||
- /* libavformat's redirector won't work */
- !strcmp( fmt->name, "redir" ) ||
- !strcmp( fmt->name, "sdp" ) ) )
+ if( !p_demux->b_force )
{
- return VLC_EGENERIC;
+ static const char ppsz_blacklist[][16] = {
+ /* Don't handle MPEG unless forced */
+ "mpeg", "vcd", "vob", "mpegts",
+ /* libavformat's redirector won't work */
+ "redir", "sdp",
+ /* Don't handle subtitles format */
+ "ass", "srt", "microdvd",
+ ""
+ };
+
+ for( int i = 0; *ppsz_blacklist[i]; i++ )
+ {
+ if( !strcmp( fmt->name, ppsz_blacklist[i] ) )
+ {
+ free( psz_url );
+ return VLC_EGENERIC;
+ }
+ }
}
/* Don't trigger false alarms on bin files */
{
int i_len;
- if( !p_demux->psz_path ) return VLC_EGENERIC;
+ if( !p_demux->psz_file )
+ {
+ free( psz_url );
+ return VLC_EGENERIC;
+ }
- i_len = strlen( p_demux->psz_path );
- if( i_len < 4 ) return VLC_EGENERIC;
+ i_len = strlen( p_demux->psz_file );
+ if( i_len < 4 )
+ {
+ free( psz_url );
+ return VLC_EGENERIC;
+ }
- if( strcasecmp( &p_demux->psz_path[i_len - 4], ".str" ) &&
- strcasecmp( &p_demux->psz_path[i_len - 4], ".xai" ) &&
- strcasecmp( &p_demux->psz_path[i_len - 3], ".xa" ) )
+ if( strcasecmp( &p_demux->psz_file[i_len - 4], ".str" ) &&
+ strcasecmp( &p_demux->psz_file[i_len - 4], ".xai" ) &&
+ strcasecmp( &p_demux->psz_file[i_len - 3], ".xa" ) )
{
+ free( psz_url );
return VLC_EGENERIC;
}
}
p_sys->fmt = fmt;
p_sys->i_tk = 0;
p_sys->tk = NULL;
- p_sys->i_pcr_tk = -1;
- p_sys->i_pcr = -1;
+ p_sys->tk_pcr = NULL;
+ p_sys->i_ssa_order = 0;
TAB_INIT( p_sys->i_attachments, p_sys->attachments);
p_sys->p_title = NULL;
/* Create I/O wrapper */
p_sys->io_buffer_size = 32768; /* FIXME */
p_sys->io_buffer = malloc( p_sys->io_buffer_size );
- p_sys->url.priv_data = p_demux;
- p_sys->url.prot = &p_sys->prot;
- p_sys->url.prot->name = "VLC I/O wrapper";
- p_sys->url.prot->url_open = 0;
- p_sys->url.prot->url_read =
- (int (*) (URLContext *, unsigned char *, int))IORead;
- p_sys->url.prot->url_write = 0;
- p_sys->url.prot->url_seek =
- (int64_t (*) (URLContext *, int64_t, int))IOSeek;
- p_sys->url.prot->url_close = 0;
- p_sys->url.prot->next = 0;
init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
- 0, &p_sys->url, IORead, NULL, IOSeek );
+ 0, p_demux, IORead, NULL, IOSeek );
+
+ stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_can_seek );
+ if( !b_can_seek )
+ {
+ /* Tell avformat that input is stream, so it doesn't get stuck
+ when trying av_find_stream_info() trying to seek all the wrong places
+ init_put_byte defaults io.is_streamed=0, so thats why we set them after it
+ */
+ p_sys->io.is_streamed = 1;
+#if defined(AVIO_SEEKABLE_NORMAL)
+ p_sys->io.seekable = 0;
+#endif
+ }
+
/* Open it */
- if( av_open_input_stream( &p_sys->ic, &p_sys->io, p_demux->psz_path,
+ if( av_open_input_stream( &p_sys->ic, &p_sys->io, psz_url,
p_sys->fmt, NULL ) )
{
msg_Err( p_demux, "av_open_input_stream failed" );
+ p_sys->ic = NULL;
+ free( psz_url );
CloseDemux( p_this );
return VLC_EGENERIC;
}
+ free( psz_url );
+ psz_url = NULL;
vlc_avcodec_lock(); /* avformat calls avcodec behind our back!!! */
if( av_find_stream_info( p_sys->ic ) < 0 )
{
- vlc_avcodec_unlock();
msg_Warn( p_demux, "av_find_stream_info failed" );
}
vlc_avcodec_unlock();
switch( cc->codec_type )
{
- case CODEC_TYPE_AUDIO:
+ case AVMEDIA_TYPE_AUDIO:
es_format_Init( &fmt, AUDIO_ES, fcc );
fmt.i_bitrate = cc->bit_rate;
fmt.audio.i_channels = cc->channels;
fmt.audio.i_rate = cc->sample_rate;
-#if LIBAVCODEC_VERSION_INT < ((52<<16)+(0<<8)+0)
- fmt.audio.i_bitspersample = cc->bits_per_sample;
-#else
fmt.audio.i_bitspersample = cc->bits_per_coded_sample;
-#endif
fmt.audio.i_blockalign = cc->block_align;
psz_type = "audio";
break;
- case CODEC_TYPE_VIDEO:
+ case AVMEDIA_TYPE_VIDEO:
es_format_Init( &fmt, VIDEO_ES, fcc );
/* Special case for raw video data */
else
fmt.i_codec = fmt.video.i_chroma;
}
+ /* We need this for the h264 packetizer */
+ else if( cc->codec_id == CODEC_ID_H264 && ( p_sys->fmt == av_find_input_format("flv") ||
+ p_sys->fmt == av_find_input_format("matroska") || p_sys->fmt == av_find_input_format("mp4") ) )
+ fmt.i_original_fourcc = VLC_FOURCC( 'a', 'v', 'c', '1' );
fmt.video.i_width = cc->width;
fmt.video.i_height = cc->height;
*fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
}
psz_type = "video";
+ fmt.video.i_frame_rate = cc->time_base.den;
+ fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 );
break;
- case CODEC_TYPE_SUBTITLE:
+ case AVMEDIA_TYPE_SUBTITLE:
es_format_Init( &fmt, SPU_ES, fcc );
if( strncmp( p_sys->ic->iformat->name, "matroska", 8 ) == 0 &&
cc->codec_id == CODEC_ID_DVD_SUBTITLE &&
default:
es_format_Init( &fmt, UNKNOWN_ES, 0 );
-#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
- if( cc->codec_type == CODEC_TYPE_ATTACHMENT )
+#ifdef HAVE_AVUTIL_CODEC_ATTACHMENT
+ if( cc->codec_type == AVMEDIA_TYPE_ATTACHMENT )
{
input_attachment_t *p_attachment;
+
psz_type = "attachment";
if( cc->codec_id == CODEC_ID_TTF )
{
- p_attachment = vlc_input_attachment_New( s->filename, "application/x-truetype-font", NULL,
- cc->extradata, (int)cc->extradata_size );
- TAB_APPEND( p_sys->i_attachments, p_sys->attachments, p_attachment );
+ AVDictionaryEntry *filename = av_dict_get( s->metadata, "filename", NULL, 0 );
+ if( filename && filename->value )
+ {
+ p_attachment = vlc_input_attachment_New(
+ filename->value, "application/x-truetype-font",
+ NULL, cc->extradata, (int)cc->extradata_size );
+ TAB_APPEND( p_sys->i_attachments, p_sys->attachments,
+ p_attachment );
+ }
}
- else msg_Warn( p_demux, "unsupported attachment type in ffmpeg demux" );
+ else msg_Warn( p_demux, "unsupported attachment type (%u) in avformat demux", cc->codec_id );
}
- break;
+ else
#endif
+ {
+ if( cc->codec_type == AVMEDIA_TYPE_DATA )
+ psz_type = "data";
- if( cc->codec_type == CODEC_TYPE_DATA )
- psz_type = "data";
-
- msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
+ msg_Warn( p_demux, "unsupported track type (%u:%u) in avformat demux", cc->codec_type, cc->codec_id );
+ }
break;
}
- fmt.psz_language = strdup( s->language );
+
+ AVDictionaryEntry *language = av_dict_get( s->metadata, "language", NULL, 0 );
+ if ( language && language->value )
+ fmt.psz_language = strdup( language->value );
+
if( s->disposition & AV_DISPOSITION_DEFAULT )
fmt.i_priority = 1000;
-#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
- if( cc->codec_type != CODEC_TYPE_ATTACHMENT )
+#ifdef HAVE_AVUTIL_CODEC_ATTACHMENT
+ if( cc->codec_type != AVMEDIA_TYPE_ATTACHMENT )
#endif
+ if( cc->codec_type != AVMEDIA_TYPE_DATA )
{
const bool b_ogg = !strcmp( p_sys->fmt->name, "ogg" );
const uint8_t *p_extra = cc->extradata;
if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
{
unsigned pi_size[3];
- void *pp_data[3];
+ const void *pp_data[3];
unsigned i_count;
for( i_count = 0; i_count < 3; i_count++ )
{
if( i_extra < 2 )
break;
pi_size[i_count] = GetWBE( p_extra );
- pp_data[i_count] = (uint8_t*)&p_extra[2];
+ pp_data[i_count] = &p_extra[2];
if( i_extra < pi_size[i_count] + 2 )
break;
}
else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
{
- uint8_t p_dummy_comment[] = {
+ const uint8_t p_dummy_comment[] = {
0, 0, 0, 0,
0, 0, 0, 0,
};
unsigned pi_size[2];
- void *pp_data[2];
+ const void *pp_data[2];
pi_size[0] = i_extra;
- pp_data[0] = (uint8_t*)p_extra;
+ pp_data[0] = p_extra;
pi_size[1] = sizeof(p_dummy_comment);
pp_data[1] = p_dummy_comment;
memcpy( fmt.p_extra, p_extra, i_extra );
}
}
+ es = es_out_Add( p_demux->out, &fmt );
+ if( s->disposition & AV_DISPOSITION_DEFAULT )
+ es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
+ es_format_Clean( &fmt );
+
+ msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
+ psz_type, (char*)&fcc );
+ TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
}
- es = es_out_Add( p_demux->out, &fmt );
- if( s->disposition & AV_DISPOSITION_DEFAULT )
- es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
- es_format_Clean( &fmt );
-
- msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
- psz_type, (char*)&fcc );
- TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
}
+ p_sys->tk_pcr = calloc( p_sys->i_tk, sizeof(*p_sys->tk_pcr) );
+
if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
i_start_time = p_sys->ic->start_time * 1000000 / AV_TIME_BASE;
( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE ) ?
p_sys->ic->duration * 1000000 / AV_TIME_BASE : -1 );
-#ifdef HAVE_FFMPEG_CHAPTERS
if( p_sys->ic->nb_chapters > 0 )
+ {
p_sys->p_title = vlc_input_title_New();
+ p_sys->p_title->i_length = p_sys->ic->duration * 1000000 / AV_TIME_BASE;
+ }
+
for( i = 0; i < p_sys->ic->nb_chapters; i++ )
{
seekpoint_t *s = vlc_seekpoint_New();
- if( p_sys->ic->chapters[i]->title )
+ AVDictionaryEntry *title = av_dict_get( p_sys->ic->metadata, "title", NULL, 0);
+ if( title && title->value )
{
- s->psz_name = strdup( p_sys->ic->chapters[i]->title );
+ s->psz_name = strdup( title->value );
EnsureUTF8( s->psz_name );
msg_Dbg( p_demux, " - chapter %d: %s", i, s->psz_name );
}
(i_start_time != -1 ? i_start_time : 0 );
TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s );
}
-#endif
+ ResetTime( p_demux, 0 );
return VLC_SUCCESS;
}
demux_sys_t *p_sys = p_demux->p_sys;
FREENULL( p_sys->tk );
+ free( p_sys->tk_pcr );
if( p_sys->ic ) av_close_input_stream( p_sys->ic );
return 1;
}
const AVStream *p_stream = p_sys->ic->streams[pkt.stream_index];
-
- if( ( p_frame = block_New( p_demux, pkt.size ) ) == NULL )
+ if( p_stream->time_base.den <= 0 )
{
- return 0;
+ msg_Warn( p_demux, "Invalid time base for the stream %d", pkt.stream_index );
+ av_free_packet( &pkt );
+ return 1;
+ }
+ if( p_stream->codec->codec_id == CODEC_ID_SSA )
+ {
+ p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ );
+ if( !p_frame )
+ {
+ av_free_packet( &pkt );
+ return 1;
+ }
+ }
+ else
+ {
+ if( ( p_frame = block_New( p_demux, pkt.size ) ) == NULL )
+ {
+ av_free_packet( &pkt );
+ return 0;
+ }
+ memcpy( p_frame->p_buffer, pkt.data, pkt.size );
}
- memcpy( p_frame->p_buffer, pkt.data, pkt.size );
-
- if( pkt.flags & PKT_FLAG_KEY )
+ if( pkt.flags & AV_PKT_FLAG_KEY )
p_frame->i_flags |= BLOCK_FLAG_TYPE_I;
i_start_time = ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
VLC_TS_INVALID : (pkt.pts) * 1000000 *
p_stream->time_base.num /
p_stream->time_base.den - i_start_time + VLC_TS_0;
- if( pkt.duration > 0 )
+ if( pkt.duration > 0 && p_frame->i_length <= 0 )
p_frame->i_length = pkt.duration * 1000000 *
p_stream->time_base.num /
- p_stream->time_base.den - i_start_time;
+ p_stream->time_base.den;
if( pkt.dts != AV_NOPTS_VALUE && pkt.dts == pkt.pts &&
- p_stream->codec->codec_type == CODEC_TYPE_VIDEO )
+ p_stream->codec->codec_type == AVMEDIA_TYPE_VIDEO )
{
/* Add here notoriously bugged file formats/samples regarding PTS */
if( !strcmp( p_sys->fmt->name, "flv" ) )
msg_Dbg( p_demux, "tk[%d] dts=%"PRId64" pts=%"PRId64,
pkt.stream_index, p_frame->i_dts, p_frame->i_pts );
#endif
+ if( p_frame->i_dts > VLC_TS_INVALID )
+ p_sys->tk_pcr[pkt.stream_index] = p_frame->i_dts;
- if( p_frame->i_dts > VLC_TS_INVALID &&
- ( pkt.stream_index == p_sys->i_pcr_tk || p_sys->i_pcr_tk < 0 ) )
- {
- p_sys->i_pcr_tk = pkt.stream_index;
- p_sys->i_pcr = p_frame->i_dts;
+ int64_t i_ts_max = INT64_MIN;
+ for( int i = 0; i < p_sys->i_tk; i++ )
+ i_ts_max = __MAX( i_ts_max, p_sys->tk_pcr[i] );
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_pcr );
+ int64_t i_ts_min = INT64_MAX;
+ for( int i = 0; i < p_sys->i_tk; i++ )
+ {
+ if( p_sys->tk_pcr[i] > VLC_TS_INVALID && p_sys->tk_pcr[i] + 10 * CLOCK_FREQ >= i_ts_max )
+ i_ts_min = __MIN( i_ts_min, p_sys->tk_pcr[i] );
+ }
+ if( i_ts_min >= p_sys->i_pcr )
+ {
+ p_sys->i_pcr = i_ts_min;
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
+ UpdateSeekPoint( p_demux, p_sys->i_pcr );
}
es_out_Send( p_demux->out, p_sys->tk[pkt.stream_index], p_frame );
- UpdateSeekPoint( p_demux, p_sys->i_pcr);
av_free_packet( &pkt );
return 1;
}
}
}
+static void ResetTime( demux_t *p_demux, int64_t i_time )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ if( p_sys->ic->start_time == (int64_t)AV_NOPTS_VALUE || i_time < 0 )
+ i_time = VLC_TS_INVALID;
+ else if( i_time == 0 )
+ i_time = 1;
+
+ p_sys->i_pcr = i_time;
+ for( int i = 0; i < p_sys->i_tk; i++ )
+ p_sys->tk_pcr[i] = i_time;
+
+ if( i_time > VLC_TS_INVALID )
+ {
+ es_out_Control( p_demux->out, ES_OUT_SET_NEXT_DISPLAY_TIME, i_time );
+ UpdateSeekPoint( p_demux, i_time );
+ }
+}
+
+static block_t *BuildSsaFrame( const AVPacket *p_pkt, unsigned i_order )
+{
+ if( p_pkt->size <= 0 )
+ return NULL;
+
+ char buffer[256];
+ const size_t i_buffer_size = __MIN( (int)sizeof(buffer) - 1, p_pkt->size );
+ memcpy( buffer, p_pkt->data, i_buffer_size );
+ buffer[i_buffer_size] = '\0';
+
+ /* */
+ int i_layer;
+ int h0, m0, s0, c0;
+ int h1, m1, s1, c1;
+ int i_position = 0;
+ if( sscanf( buffer, "Dialogue: %d,%d:%d:%d.%d,%d:%d:%d.%d,%n", &i_layer,
+ &h0, &m0, &s0, &c0, &h1, &m1, &s1, &c1, &i_position ) < 9 )
+ return NULL;
+ if( i_position <= 0 || (unsigned)i_position >= i_buffer_size )
+ return NULL;
+
+ char *p;
+ if( asprintf( &p, "%u,%d,%.*s", i_order, i_layer, p_pkt->size - i_position, p_pkt->data + i_position ) < 0 )
+ return NULL;
+
+ block_t *p_frame = block_heap_Alloc( p, p, strlen(p) + 1 );
+ if( p_frame )
+ p_frame->i_length = CLOCK_FREQ * ((h1-h0) * 3600 +
+ (m1-m0) * 60 +
+ (s1-s0) * 1) +
+ CLOCK_FREQ * (c1-c0) / 100;
+ return p_frame;
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
+ const int64_t i_start_time = p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ? p_sys->ic->start_time : 0;
double f, *pf;
int64_t i64, *pi64;
case DEMUX_SET_POSITION:
f = (double) va_arg( args, double );
- if( p_sys->i_pcr > 0 )
- {
- i64 = p_sys->ic->duration * f;
- if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
- i64 += p_sys->ic->start_time;
+ i64 = p_sys->ic->duration * f + i_start_time;
- msg_Warn( p_demux, "DEMUX_SET_POSITION: %"PRId64, i64 );
+ msg_Warn( p_demux, "DEMUX_SET_POSITION: %"PRId64, i64 );
- /* If we have a duration, we prefer to seek by time
- but if we don't, or if the seek fails, try BYTE seeking */
- if( p_sys->ic->duration == (int64_t)AV_NOPTS_VALUE ||
- (av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0) )
- {
- int64_t i_size = stream_Size( p_demux->s );
- i64 = (i_size * f);
+ /* If we have a duration, we prefer to seek by time
+ but if we don't, or if the seek fails, try BYTE seeking */
+ if( p_sys->ic->duration == (int64_t)AV_NOPTS_VALUE ||
+ (av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BACKWARD ) < 0) )
+ {
+ int64_t i_size = stream_Size( p_demux->s );
+ i64 = (i_size * f);
- msg_Warn( p_demux, "DEMUX_SET_BYTE_POSITION: %"PRId64, i64 );
- if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BYTE ) < 0 )
- return VLC_EGENERIC;
- }
- else
- {
- UpdateSeekPoint( p_demux, i64 );
- }
- p_sys->i_pcr = -1; /* Invalidate time display */
+ msg_Warn( p_demux, "DEMUX_SET_BYTE_POSITION: %"PRId64, i64 );
+ if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BYTE ) < 0 )
+ return VLC_EGENERIC;
+
+ ResetTime( p_demux, -1 );
+ }
+ else
+ {
+ ResetTime( p_demux, i64 - i_start_time );
}
return VLC_SUCCESS;
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE )
- {
- *pi64 = p_sys->ic->duration;
- }
- else *pi64 = 0;
+ *pi64 = p_sys->ic->duration * 1000000 / AV_TIME_BASE;
+ else
+ *pi64 = 0;
return VLC_SUCCESS;
case DEMUX_GET_TIME:
return VLC_SUCCESS;
case DEMUX_SET_TIME:
+ {
i64 = (int64_t)va_arg( args, int64_t );
- i64 = i64 *AV_TIME_BASE / 1000000;
- if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
- i64 += p_sys->ic->start_time;
+ i64 = i64 *AV_TIME_BASE / 1000000 + i_start_time;
msg_Warn( p_demux, "DEMUX_SET_TIME: %"PRId64, i64 );
- if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 )
+ if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BACKWARD ) < 0 )
{
return VLC_EGENERIC;
}
- p_sys->i_pcr = -1; /* Invalidate time display */
- UpdateSeekPoint( p_demux, i64 );
+ ResetTime( p_demux, i64 - i_start_time );
return VLC_SUCCESS;
+ }
case DEMUX_HAS_UNSUPPORTED_META:
{
{
vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
- if( !p_sys->ic->title[0] || !p_sys->ic->author[0] ||
- !p_sys->ic->copyright[0] || !p_sys->ic->comment[0] ||
- /*!p_sys->ic->album[0] ||*/ !p_sys->ic->genre[0] )
- {
- return VLC_EGENERIC;
- }
-
- if( p_sys->ic->title[0] )
- vlc_meta_SetTitle( p_meta, p_sys->ic->title );
- if( p_sys->ic->author[0] )
- vlc_meta_SetArtist( p_meta, p_sys->ic->author );
- if( p_sys->ic->copyright[0] )
- vlc_meta_SetCopyright( p_meta, p_sys->ic->copyright );
- if( p_sys->ic->comment[0] )
- vlc_meta_SetDescription( p_meta, p_sys->ic->comment );
- if( p_sys->ic->genre[0] )
- vlc_meta_SetGenre( p_meta, p_sys->ic->genre );
+ AVDictionaryEntry *title = av_dict_get( p_sys->ic->metadata, "language", NULL, 0 );
+ AVDictionaryEntry *artist = av_dict_get( p_sys->ic->metadata, "artist", NULL, 0 );
+ AVDictionaryEntry *copyright = av_dict_get( p_sys->ic->metadata, "copyright", NULL, 0 );
+ AVDictionaryEntry *comment = av_dict_get( p_sys->ic->metadata, "comment", NULL, 0 );
+ AVDictionaryEntry *genre = av_dict_get( p_sys->ic->metadata, "genre", NULL, 0 );
+
+ if( title && title->value )
+ vlc_meta_SetTitle( p_meta, title->value );
+ if( artist && artist->value )
+ vlc_meta_SetArtist( p_meta, artist->value );
+ if( copyright && copyright->value )
+ vlc_meta_SetCopyright( p_meta, copyright->value );
+ if( comment && comment->value )
+ vlc_meta_SetDescription( p_meta, comment->value );
+ if( genre && genre->value )
+ vlc_meta_SetGenre( p_meta, genre->value );
return VLC_SUCCESS;
}
if( !p_sys->p_title )
return VLC_EGENERIC;
- i64 = p_sys->p_title->seekpoint[i_seekpoint]->i_time_offset *AV_TIME_BASE / 1000000;
- if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
- i64 += p_sys->ic->start_time;
+ i64 = p_sys->p_title->seekpoint[i_seekpoint]->i_time_offset *
+ AV_TIME_BASE / 1000000 + i_start_time;
msg_Warn( p_demux, "DEMUX_SET_TIME: %"PRId64, i64 );
- if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 )
+ if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BACKWARD ) < 0 )
{
return VLC_EGENERIC;
}
- p_sys->i_pcr = -1; /* Invalidate time display */
- UpdateSeekPoint( p_demux, i64 );
+ ResetTime( p_demux, i64 - i_start_time );
return VLC_SUCCESS;
}
*****************************************************************************/
static int IORead( void *opaque, uint8_t *buf, int buf_size )
{
- URLContext *p_url = opaque;
- demux_t *p_demux = p_url->priv_data;
+ demux_t *p_demux = opaque;
if( buf_size < 0 ) return -1;
int i_ret = stream_Read( p_demux->s, buf, buf_size );
return i_ret ? i_ret : -1;
static int64_t IOSeek( void *opaque, int64_t offset, int whence )
{
- URLContext *p_url = opaque;
- demux_t *p_demux = p_url->priv_data;
+ demux_t *p_demux = opaque;
int64_t i_absolute;
int64_t i_size = stream_Size( p_demux->s );
projects / vlc / blobdiff