highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fftools/ffmpeg: rework applying input -r

Browse Source 
Do not use a separate counter for CFR timestamps forced with -r used as
an input option. Set durations properly and let estimation code do the
rest.
This commit is contained in:
Anton Khirnov
2023-05-10 12:21:48 +02:00
parent 1132507327
commit 30a3fee24f
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fftools/ffmpeg.c
View File

@ -985,7 +985,7 @@ static int64_t video_duration_estimate(const InputStream *ist, const AVFrame *fr
// durations, then this should be simplified. // durations, then this should be simplified.
// prefer frame duration for containers with timestamps // prefer frame duration for containers with timestamps
if (frame->duration > 0 && !ifile->format_nots) if (frame->duration > 0 && (!ifile->format_nots || ist->framerate.num))
return frame->duration; return frame->duration;
if (ist->dec_ctx->framerate.den && ist->dec_ctx->framerate.num) { if (ist->dec_ctx->framerate.den && ist->dec_ctx->framerate.num) {
@ -1090,8 +1090,12 @@ static int decode_video(InputStream *ist, const AVPacket *pkt, int *got_output,
frame->pts = frame->best_effort_timestamp; frame->pts = frame->best_effort_timestamp;
if (ist->framerate.num) // forced fixed framerate
frame->pts = ist->cfr_next_pts++; if (ist->framerate.num) {
frame->pts = AV_NOPTS_VALUE;
frame->duration = 1;
frame->time_base = av_inv_q(ist->framerate);
}
// no timestamp available - extrapolate from previous frame duration // no timestamp available - extrapolate from previous frame duration
if (frame->pts == AV_NOPTS_VALUE) if (frame->pts == AV_NOPTS_VALUE)

4
fftools/ffmpeg.h
View File

@ -372,10 +372,6 @@ typedef struct InputStream {
int64_t filter_in_rescale_delta_last; int64_t filter_in_rescale_delta_last;
// when forcing constant input framerate through -r,
// this contains the pts that will be given to the next decoded frame
int64_t cfr_next_pts;
int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */ int64_t nb_samples; /* number of samples in the last decoded audio frame before looping */
AVDictionary *decoder_opts; AVDictionary *decoder_opts;