#include "../../codec/avcodec/avcodec.h"
#include "avformat.h"
+#include "../xiph.h"
#include "../vobsub.h"
//#define AVFORMAT_DEBUG 1
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 );
/*****************************************************************************
p_sys->tk = NULL;
p_sys->i_pcr_tk = -1;
p_sys->i_pcr = -1;
+ p_sys->i_ssa_order = 0;
TAB_INIT( p_sys->i_attachments, p_sys->attachments);
p_sys->p_title = NULL;
if( av_find_stream_info( p_sys->ic ) < 0 )
{
vlc_avcodec_unlock();
- msg_Err( p_demux, "av_find_stream_info failed" );
- CloseDemux( p_this );
- return VLC_EGENERIC;
+ msg_Warn( p_demux, "av_find_stream_info failed" );
}
vlc_avcodec_unlock();
for( i = 0; i < p_sys->ic->nb_streams; i++ )
{
- AVCodecContext *cc = p_sys->ic->streams[i]->codec;
+ AVStream *s = p_sys->ic->streams[i];
+ AVCodecContext *cc = s->codec;
+
es_out_id_t *es;
es_format_t fmt;
vlc_fourcc_t fcc;
psz_type = "attachment";
if( cc->codec_id == CODEC_ID_TTF )
{
- p_attachment = vlc_input_attachment_New( p_sys->ic->streams[i]->filename, "application/x-truetype-font", NULL,
+ 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 );
}
msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
break;
}
- fmt.psz_language = p_sys->ic->streams[i]->language;
+ fmt.psz_language = strdup( s->language );
+ if( s->disposition & AV_DISPOSITION_DEFAULT )
+ fmt.i_priority = 1000;
#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
if( cc->codec_type != CODEC_TYPE_ATTACHMENT )
#endif
{
- fmt.i_extra = cc->extradata_size;
- fmt.p_extra = cc->extradata;
+ const bool b_ogg = !strcmp( p_sys->fmt->name, "ogg" );
+ const uint8_t *p_extra = cc->extradata;
+ unsigned i_extra = cc->extradata_size;
+
+ if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
+ {
+ unsigned pi_size[3];
+ 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];
+ if( i_extra < pi_size[i_count] + 2 )
+ break;
+
+ p_extra += 2 + pi_size[i_count];
+ i_extra -= 2 + pi_size[i_count];
+ }
+ if( i_count > 0 && xiph_PackHeaders( &fmt.i_extra, &fmt.p_extra,
+ pi_size, pp_data, i_count ) )
+ {
+ fmt.i_extra = 0;
+ fmt.p_extra = NULL;
+ }
+ }
+ else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
+ {
+ uint8_t p_dummy_comment[] = {
+ 0, 0, 0, 0,
+ 0, 0, 0, 0,
+ };
+ unsigned pi_size[2];
+ void *pp_data[2];
+
+ pi_size[0] = i_extra;
+ pp_data[0] = (uint8_t*)p_extra;
+
+ pi_size[1] = sizeof(p_dummy_comment);
+ pp_data[1] = p_dummy_comment;
+
+ if( pi_size[0] > 0 && xiph_PackHeaders( &fmt.i_extra, &fmt.p_extra,
+ pi_size, pp_data, 2 ) )
+ {
+ fmt.i_extra = 0;
+ fmt.p_extra = NULL;
+ }
+ }
+ else if( cc->extradata_size > 0 )
+ {
+ fmt.p_extra = malloc( i_extra );
+ if( fmt.p_extra )
+ {
+ fmt.i_extra = i_extra;
+ 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 );
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->codec->codec_id == CODEC_ID_SSA )
{
- return 0;
+ p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ );
+ if( !p_frame )
+ return 1;
+ }
+ else
+ {
+ if( ( p_frame = block_New( p_demux, pkt.size ) ) == NULL )
+ 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 )
p_frame->i_flags |= BLOCK_FLAG_TYPE_I;
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 )
}
}
+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( 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 || 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 - h1) * 3600 +
+ (m1-m0) * 60 +
+ (s1-s0) * 1) +
+ CLOCK_FREQ * (c1-c0) / 100;
+ return p_frame;
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
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:
projects / vlc / blobdiff