generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mpegts: Use DVB_TELETEXT timestamp heuristic also for DVB subtitles

Browse Source 
Fixes Ticket4200

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-27 15:13:50 +02:00
parent d06ea6e5ce
commit 42aa02418e
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/mpegts.c
View File

@ -1140,7 +1140,10 @@ skip:
p += 5; p += 5;
buf_size -= 5; buf_size -= 5;
} }
if (pes->ts->fix_teletext_pts && pes->st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT) { if ( pes->ts->fix_teletext_pts
&& ( pes->st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT
|| pes->st->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE)
) {
AVProgram *p = NULL; AVProgram *p = NULL;
while ((p = av_find_program_from_stream(pes->stream, p, pes->st->index))) { while ((p = av_find_program_from_stream(pes->stream, p, pes->st->index))) {
if (p->pcr_pid != -1 && p->discard != AVDISCARD_ALL) { if (p->pcr_pid != -1 && p->discard != AVDISCARD_ALL) {
@ -1169,7 +1172,11 @@ skip:
pes->st->pts_wrap_behavior = st->pts_wrap_behavior; pes->st->pts_wrap_behavior = st->pts_wrap_behavior;
if (pes->dts == AV_NOPTS_VALUE || pes->dts < pcr) { if (pes->dts == AV_NOPTS_VALUE || pes->dts < pcr) {
pes->pts = pes->dts = pcr; pes->pts = pes->dts = pcr;
} else if (pes->dts > pcr + 3654 + 9000) { } else if (pes->st->codec->codec_id == AV_CODEC_ID_DVB_TELETEXT &&
pes->dts > pcr + 3654 + 9000) {
pes->pts = pes->dts = pcr + 3654 + 9000;
} else if (pes->st->codec->codec_id == AV_CODEC_ID_DVB_SUBTITLE &&
pes->dts > pcr + 10*90000) { //10sec
pes->pts = pes->dts = pcr + 3654 + 9000; pes->pts = pes->dts = pcr + 3654 + 9000;
} }
break; break;