Commit 480af3a3 authored by Michael Niedermayer's avatar Michael Niedermayer

avformat/utils: skip the MPEG-2 style dts/pts code for HEVC

This extends the exception from H264 to H264 + HEVC

Fixes Ticket3385
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 68a959cb
...@@ -1154,7 +1154,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, ...@@ -1154,7 +1154,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
/* Interpolate PTS and DTS if they are not present. We skip H264 /* Interpolate PTS and DTS if they are not present. We skip H264
* currently because delay and has_b_frames are not reliably set. */ * currently because delay and has_b_frames are not reliably set. */
if ((delay == 0 || (delay == 1 && pc)) && if ((delay == 0 || (delay == 1 && pc)) &&
st->codec->codec_id != AV_CODEC_ID_H264) { st->codec->codec_id != AV_CODEC_ID_H264 &&
st->codec->codec_id != AV_CODEC_ID_HEVC) {
if (presentation_delayed) { if (presentation_delayed) {
/* DTS = decompression timestamp */ /* DTS = decompression timestamp */
/* PTS = presentation timestamp */ /* PTS = presentation timestamp */
...@@ -1199,7 +1200,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st, ...@@ -1199,7 +1200,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
pkt->dts = st->pts_buffer[0]; pkt->dts = st->pts_buffer[0];
} }
// We skipped it above so we try here. // We skipped it above so we try here.
if (st->codec->codec_id == AV_CODEC_ID_H264) if (st->codec->codec_id == AV_CODEC_ID_H264 ||
st->codec->codec_id == AV_CODEC_ID_HEVC)
// This should happen on the first packet // This should happen on the first packet
update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt); update_initial_timestamps(s, pkt->stream_index, pkt->dts, pkt->pts, pkt);
if (pkt->dts > st->cur_dts) if (pkt->dts > st->cur_dts)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment