From 7b49d6763ae88059da80c89cdd05cd3ba07cbba3 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 6 Feb 2011 13:52:05 +0000 Subject: demux_ts: DVB and PGS subtitle fixes Fix r32587: the previous approach to return subtitles in time broke DVB subtitles due to returning incomplete packets and even for PGS subtitles resulted in incorrect pts values for the sub packets. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32864 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpdemux/demux_ts.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'libmpdemux/demux_ts.c') diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c index 8a9de61390..d57f312f26 100644 --- a/libmpdemux/demux_ts.c +++ b/libmpdemux/demux_ts.c @@ -2987,11 +2987,6 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, //IS IT TIME TO QUEUE DATA to the dp_packet? if(is_start && (dp != NULL)) { - // subtitle packets _have_ to be submitted before video, otherwise - // they might get stuck "forever" and subtitles will be completely - // out of sync. - if (is_video) - fill_packet(demuxer, demuxer->sub, &priv->fifo[2].pack, &priv->fifo[2].offset, NULL); retv = fill_packet(demuxer, ds, dp, dp_offset, si); } @@ -3132,6 +3127,9 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, (*dp)->flags = 0; (*dp)->pos = stream_tell(demuxer->stream); (*dp)->pts = es->pts; + // subtitle packets must be returned immediately if possible + if (is_sub && !tss->payload_size) + retv = fill_packet(demuxer, ds, dp, dp_offset, si); if(retv > 0) return retv; @@ -3173,7 +3171,8 @@ static int ts_parse(demuxer_t *demuxer , ES_stream_t *es, unsigned char *packet, { *dp_offset += sz; - if(*dp_offset >= MAX_PACK_BYTES) + // subtitle packets must be returned immediately if possible + if(*dp_offset >= MAX_PACK_BYTES || (is_sub && !tss->payload_size)) { (*dp)->pts = tss->last_pts; retv = fill_packet(demuxer, ds, dp, dp_offset, si); -- cgit v1.2.3