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

fftools/ffmpeg: rework -enc_time_base handling

Browse Source 
Read the timebase from FrameData rather than the input stream. This
should fix #10393 and generally be more reliable.

Replace the use of '-1' to indicate demuxing timebase with the string
'demux'. Also allow to request filter timebase with
'-enc_time_base filter'.
This commit is contained in:
Anton Khirnov
2023-07-07 11:31:53 +02:00
parent 4d06742b93
commit dff3a283cd
5 changed files with 44 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
fftools/ffmpeg_enc.c
View File

@@ -264,8 +264,20 @@ int enc_open(OutputStream *ost, AVFrame *frame)
fr.num, fr.den, 65535);
}
enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase :
av_inv_q(fr);
if (ost->enc_timebase.num == ENC_TIME_BASE_DEMUX) {
if (fd->dec.tb.num <= 0 || fd->dec.tb.den <= 0) {
av_log(ost, AV_LOG_ERROR,
"Demuxing timebase not available - cannot use it for encoding\n");
return AVERROR(EINVAL);
}
enc_ctx->time_base = fd->dec.tb;
} else if (ost->enc_timebase.num == ENC_TIME_BASE_FILTER) {
enc_ctx->time_base = frame->time_base;
} else {
enc_ctx->time_base = ost->enc_timebase.num > 0 ? ost->enc_timebase :
av_inv_q(fr);
}
if (!(enc_ctx->time_base.num && enc_ctx->time_base.den))
enc_ctx->time_base = frame->time_base;