diff options
| author | Vishwanath Dixit <vdixit@akamai.com> | 2018-05-06 22:38:59 +0530 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-04 22:26:55 +0200 |
| commit | 146cdf7e4bb029c9e457742d82d00d3b396b9ff4 (patch) | |
| tree | f5712781b0ddfe22e8c1d39c252166416d110fbe | |
| parent | f56a0b02cdbf8d5820de400e584a72b002cd461a (diff) | |
| download | ffmpeg-146cdf7e4bb029c9e457742d82d00d3b396b9ff4.tar.gz | |
fftools/ffmpeg: fix for all forced key frames when 'copyts' is enabled
Forced key frames generation functionality was assuming the first PTS
value as zero, but, when 'copyts' is enabled, the first PTS can be any
big number. This was eventually forcing all the frames as key frames.
To resolve this issue, update has been made to use first input pts as
reference pts.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | fftools/ffmpeg.c | 6 | ||||
| -rw-r--r-- | fftools/ffmpeg.h | 1 | ||||
| -rw-r--r-- | fftools/ffmpeg_opt.c | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 5a19a09d9a..10f3012cdc 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -1236,8 +1236,12 @@ static void do_video_out(OutputFile *of, in_picture->quality = enc->global_quality; in_picture->pict_type = 0; + if (ost->forced_kf_ref_pts == AV_NOPTS_VALUE && + in_picture->pts != AV_NOPTS_VALUE) + ost->forced_kf_ref_pts = in_picture->pts; + pts_time = in_picture->pts != AV_NOPTS_VALUE ? - in_picture->pts * av_q2d(enc->time_base) : NAN; + (in_picture->pts - ost->forced_kf_ref_pts) * av_q2d(enc->time_base) : NAN; if (ost->forced_kf_index < ost->forced_kf_count && in_picture->pts >= ost->forced_kf_pts[ost->forced_kf_index]) { ost->forced_kf_index++; diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index d44b7a5c72..eb1eaf6363 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -484,6 +484,7 @@ typedef struct OutputStream { AVRational frame_aspect_ratio; /* forced key frames */ + int64_t forced_kf_ref_pts; int64_t *forced_kf_pts; int forced_kf_count; int forced_kf_index; diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 8ae68aec0e..36bce4465a 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1324,6 +1324,7 @@ static OutputStream *new_output_stream(OptionsContext *o, AVFormatContext *oc, e ost->file_index = nb_output_files - 1; ost->index = idx; ost->st = st; + ost->forced_kf_ref_pts = AV_NOPTS_VALUE; st->codecpar->codec_type = type; ret = choose_encoder(o, oc, ost); |