diff mbox series

[FFmpeg-devel,10/18] fftools/ffmpeg: move derivation of frame duration from filter framerate

Message ID 20230826151144.24858-10-anton@khirnov.net
State New
Headers show
Series [FFmpeg-devel,01/18] fftools/ffmpeg: stop explicitly closing output streams on input EOF | expand

Checks

Context Check Description
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished

Commit Message

Anton Khirnov Aug. 26, 2023, 3:11 p.m. UTC 
From ffmpeg_enc to ffmpeg_filter, which is a more appropriate
place for it.

fate-lavf-gxf* no longer spuriously duplicate the first video frame, due
to different rounding.
---
 fftools/ffmpeg_enc.c    | 9 +--------
 fftools/ffmpeg_filter.c | 8 +++++++-
 tests/ref/lavf/gxf      | 2 +-
 tests/ref/lavf/gxf_ntsc | 2 +-
 tests/ref/lavf/gxf_pal  | 2 +-
 5 files changed, 11 insertions(+), 12 deletions(-)

Comments

Anton Khirnov Aug. 29, 2023, 8:07 a.m. UTC | #1 
I'm dropping this patch for now due to it causing issues in some cases.
I'll probably resend a version of it later.
diff mbox series

Patch

diff --git a/fftools/ffmpeg_enc.c b/fftools/ffmpeg_enc.c
index f28884e50c..0586ba17c4 100644
--- a/fftools/ffmpeg_enc.c
+++ b/fftools/ffmpeg_enc.c
@@ -1112,16 +1112,9 @@  static int do_video_out(OutputFile *of, OutputStream *ost, AVFrame *frame)
     int64_t nb_frames, nb_frames_prev, i;
     double duration = 0;
 
-    if (frame) {
-        FrameData *fd = frame_data(frame);
-
+    if (frame)
         duration = lrintf(frame->duration * av_q2d(frame->time_base) / av_q2d(enc->time_base));
 
-        if (duration <= 0 &&
-            fd->frame_rate_filter.num > 0 && fd->frame_rate_filter.den > 0)
-            duration = 1 / (av_q2d(fd->frame_rate_filter) * av_q2d(enc->time_base));
-    }
-
     video_sync_process(of, ost, frame, duration,
                        &nb_frames, &nb_frames_prev);
 
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c
index 177a6f7e5c..74b57191d1 100644
--- a/fftools/ffmpeg_filter.c
+++ b/fftools/ffmpeg_filter.c
@@ -1807,8 +1807,14 @@  int reap_filters(FilterGraph *fg, int flush)
 
             if (ost->type == AVMEDIA_TYPE_VIDEO) {
                 AVRational fr = av_buffersink_get_frame_rate(filter);
-                if (fr.num > 0 && fr.den > 0)
+                if (fr.num > 0 && fr.den > 0) {
                     fd->frame_rate_filter = fr;
+
+                    if (!filtered_frame->duration) {
+                        filtered_frame->duration = av_rescale_q(1, av_inv_q(fr),
+                                                                filtered_frame->time_base);
+                    }
+                }
             }
 
             ret = enc_frame(ost, filtered_frame);
diff --git a/tests/ref/lavf/gxf b/tests/ref/lavf/gxf
index e8351fab86..d5fd40c8ab 100644
--- a/tests/ref/lavf/gxf
+++ b/tests/ref/lavf/gxf
@@ -1,3 +1,3 @@ 
 0638c4d073ac224608baaba16732b68f *tests/data/lavf/lavf.gxf
 795876 tests/data/lavf/lavf.gxf
-tests/data/lavf/lavf.gxf CRC=0x5ade0285
+tests/data/lavf/lavf.gxf CRC=0xe032707a
diff --git a/tests/ref/lavf/gxf_ntsc b/tests/ref/lavf/gxf_ntsc
index 60efd80462..d375420ee6 100644
--- a/tests/ref/lavf/gxf_ntsc
+++ b/tests/ref/lavf/gxf_ntsc
@@ -1,3 +1,3 @@ 
 9a27673c85f1671ba9ff7cd33e5735de *tests/data/lavf/lavf.gxf_ntsc
 794660 tests/data/lavf/lavf.gxf_ntsc
-tests/data/lavf/lavf.gxf_ntsc CRC=0xdcd39443
+tests/data/lavf/lavf.gxf_ntsc CRC=0xaf956c57
diff --git a/tests/ref/lavf/gxf_pal b/tests/ref/lavf/gxf_pal
index aefcd0ccab..83b0482431 100644
--- a/tests/ref/lavf/gxf_pal
+++ b/tests/ref/lavf/gxf_pal
@@ -1,3 +1,3 @@ 
 4d1bd16c6d52468c05711d8301e4e302 *tests/data/lavf/lavf.gxf_pal
 795880 tests/data/lavf/lavf.gxf_pal
-tests/data/lavf/lavf.gxf_pal CRC=0x1dbfef76
+tests/data/lavf/lavf.gxf_pal CRC=0x34fe5d7a