diff mbox series

[FFmpeg-devel] ffmpeg: print proper statistics for video output when using wrapped avframe encoder

Message ID 20220314133253.1191-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel] ffmpeg: print proper statistics for video output when using wrapped avframe encoder | expand

Checks

Context Check Description
yinshiyou/commit_msg_loongarch64 warning Please wrap lines in the body of the commit message between 60 and 72 characters.
yinshiyou/make_loongarch64 success Make finished
yinshiyou/make_fate_loongarch64 success Make fate finished
andriy/commit_msg_armv7_RPi4 warning Please wrap lines in the body of the commit message between 60 and 72 characters.
andriy/commit_msg_x86 warning Please wrap lines in the body of the commit message between 60 and 72 characters.
andriy/commit_msg_aarch64_jetson warning Please wrap lines in the body of the commit message between 60 and 72 characters.
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_aarch64_jetson success Make finished
andriy/make_fate_aarch64_jetson success Make fate finished
andriy/make_armv7_RPi4 success Make finished
andriy/make_fate_armv7_RPi4 success Make fate finished

Commit Message

James Almer March 14, 2022, 1:32 p.m. UTC 
pkt->size contains the size of an AVFrame struct plus some padding, which is meaningless.
Use instead the size of a raw video frame, as if it was the rawvideo encoder.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/ffmpeg.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 9a3fdc636d..a878554627 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -722,6 +722,7 @@  static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
 {
     AVFormatContext *s = of->ctx;
     AVStream *st = ost->st;
+    int data_size = pkt->size;
     int ret;
 
     /*
@@ -796,6 +797,12 @@  static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
             pkt->duration = av_rescale_q(1, av_inv_q(ost->frame_rate),
                                          ost->mux_timebase);
         }
+
+        if (st->codecpar->codec_id == AV_CODEC_ID_WRAPPED_AVFRAME) {
+            ret = av_image_get_buffer_size(st->codecpar->format, st->codecpar->width, st->codecpar->height, 1);
+            if (ret >= 0)
+                data_size = ret;
+        }
     }
 
     av_packet_rescale_ts(pkt, ost->mux_timebase, ost->st->time_base);
@@ -838,7 +845,7 @@  static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
     }
     ost->last_mux_dts = pkt->dts;
 
-    ost->data_size += pkt->size;
+    ost->data_size += data_size;
     ost->packets_written++;
 
     pkt->stream_index = ost->index;
@@ -849,7 +856,7 @@  static void write_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost, int u
                 av_get_media_type_string(ost->enc_ctx->codec_type),
                 av_ts2str(pkt->pts), av_ts2timestr(pkt->pts, &ost->st->time_base),
                 av_ts2str(pkt->dts), av_ts2timestr(pkt->dts, &ost->st->time_base),
-                pkt->size
+                data_size
               );
     }