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 );
/*****************************************************************************
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;
+ pd.filename = psz_url;
if( ( pd.buf_size = stream_Peek( p_demux->s, &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;
}
!strcmp( fmt->name, "redir" ) ||
!strcmp( fmt->name, "sdp" ) ) )
{
+ free( psz_url );
return VLC_EGENERIC;
}
{
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->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;
init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
0, &p_sys->url, 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->url.is_streamed = 1;
+ p_sys->io.is_streamed = 1;
+ }
+
+
/* 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" );
+ 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_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;
else
fmt.i_codec = fmt.video.i_chroma;
}
+ /* We need this for the h264 packetizer */
+ else if( cc->codec_id == CODEC_ID_H264 && ( !strcmp( p_sys->fmt->name, "flv" ) ||
+ !strcmp( p_sys->fmt->name, "matroska" ) || !strcmp( p_sys->fmt->name, "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;
break;
case CODEC_TYPE_SUBTITLE:
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 = strdup( 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
{
+ 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 )
+ if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
{
unsigned pi_size[3];
void *pp_data[3];
fmt.p_extra = NULL;
}
}
- else if( cc->codec_id == CODEC_ID_SPEEX )
+ else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
{
uint8_t p_dummy_comment[] = {
0, 0, 0, 0,
}
}
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",
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 )
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:
{
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] )
projects / vlc / blobdiff