RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-22 23:33:07 +00:00
Code Issues Projects Releases Wiki Activity

avformat/mxfenc: Fix guess frame_rate

Browse Source 
The time_base was a bad guess.

Currently, fate-time_base test data assumed that overriding the input
time_base would affect the frame_rate, but this behaviour is not
documented, so just fix the fate data now that this is fixed.

Fix regression since 10185e2d4c:
previously, when streamcopying, the time_base was guessed from the
frame_rate considering it is often constant, so guessing the frame_rate
back from the time_base was often not a problem.

To reproduce:
ffmpeg -i fate-suite/mpeg2/dvd_still_frame.vob -an -c copy out.mxf

Signed-off-by: Nicolas Gaullier <nicolas.gaullier@cji.paris>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Nicolas Gaullier 2024-09-03 10:02:28 +02:00 committed by Anton Khirnov
parent 0b6d7cd9d9
commit 59d2900df7
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/mxfenc.c
View File

@ -2894,8 +2894,12 @@ static int mxf_init(AVFormatContext *s)
if (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
const AVPixFmtDescriptor *pix_desc = av_pix_fmt_desc_get(st->codecpar->format);
// TODO: should be avg_frame_rate
AVRational tbc = st->time_base;
AVRational tbc = (AVRational){ 0, 0 };
if (st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0)
tbc = av_inv_q(st->avg_frame_rate);
else if (st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0)
tbc = av_inv_q(st->r_frame_rate);
// Default component depth to 8
sc->component_depth = 8;
sc->h_chroma_sub_sample = 2;

2
tests/ref/fate/time_base
View File

@ -1 +1 @@
d408aba82d62a90ed7f46a1999b014f1
b28d4ca13029fdc80a114b56467be9d7