ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-20 21:36:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/utils: factorize h264/hevc checks out in compute_pkt_fields()

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-02-22 12:21:28 +01:00
parent 8bcacd9f42
commit f288e1b67c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/utils.c
View File

@ -1072,6 +1072,8 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
int num, den, presentation_delayed, delay, i; int num, den, presentation_delayed, delay, i;
int64_t offset; int64_t offset;
AVRational duration; AVRational duration;
int onein_oneout = st->codec->codec_id != AV_CODEC_ID_H264 &&
st->codec->codec_id != AV_CODEC_ID_HEVC;
if (s->flags & AVFMT_FLAG_NOFILLIN) if (s->flags & AVFMT_FLAG_NOFILLIN)
return; return;
@ -1154,8 +1156,7 @@ 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 && onein_oneout) {
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 */
@ -1200,8 +1201,7 @@ 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 (!onein_oneout)
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)