RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mpegts: fix teletext pts of streams with standalone pcr pid 

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2014-03-02 15:20:43 +01:00
parent d83a5b5218
commit d2f60547c2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavformat/mpegts.c
View File

@ -1071,16 +1071,28 @@ skip:
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) {
MpegTSFilter *f = pes->ts->pids[p->pcr_pid]; MpegTSFilter *f = pes->ts->pids[p->pcr_pid];
if (f && f->type == MPEGTS_PES) { if (f) {
PESContext *pcrpes = f->u.pes_filter.opaque; AVStream *st = NULL;
if (f->last_pcr != -1 && pcrpes && pcrpes->st && pcrpes->st->discard != AVDISCARD_ALL) { if (f->type == MPEGTS_PES) {
PESContext *pcrpes = f->u.pes_filter.opaque;
if (pcrpes)
st = pcrpes->st;
} else if (f->type == MPEGTS_PCR) {
int i;
for (i = 0; i < p->nb_stream_indexes; i++) {
AVStream *pst = pes->stream->streams[p->stream_index[i]];
if (pst->codec->codec_type == AVMEDIA_TYPE_VIDEO)
st = pst;
}
}
if (f->last_pcr != -1 && st && st->discard != AVDISCARD_ALL) {
// teletext packets do not always have correct timestamps, // teletext packets do not always have correct timestamps,
// the standard says they should be handled after 40.6 ms at most, // the standard says they should be handled after 40.6 ms at most,
// and the pcr error to this packet should be no more than 100 ms. // and the pcr error to this packet should be no more than 100 ms.
// TODO: we should interpolate the PCR, not just use the last one // TODO: we should interpolate the PCR, not just use the last one
int64_t pcr = f->last_pcr / 300; int64_t pcr = f->last_pcr / 300;
pes->st->pts_wrap_reference = pcrpes->st->pts_wrap_reference; pes->st->pts_wrap_reference = st->pts_wrap_reference;
pes->st->pts_wrap_behavior = pcrpes->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->dts > pcr + 3654 + 9000) {