From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 54AE240C42 for ; Tue, 4 Jul 2023 17:26:18 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 559DE68C5F6; Tue, 4 Jul 2023 20:26:16 +0300 (EEST) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2B45F68C39F for ; Tue, 4 Jul 2023 20:26:10 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BEDD22404EE for ; Tue, 4 Jul 2023 19:26:09 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id AEZXPlVkzsE7 for ; Tue, 4 Jul 2023 19:26:07 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 3294A2404EC for ; Tue, 4 Jul 2023 19:26:07 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id DC4333A0F6C for ; Tue, 4 Jul 2023 19:26:06 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 4 Jul 2023 19:26:03 +0200 Message-Id: <20230704172604.15781-1-anton@khirnov.net> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] lavc/dvdec: export bitrate X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Changes the result of fate-mxf-probe-dv25, where the bitrate is now exported. Also changes the result of fate-bsf-dv-error-marker, where the exported bitrate is now different. Note that the codec layer bitrate does not match the container bitrate, because container timing is 25fps, while the DV profile is 50. --- libavcodec/dvdec.c | 3 +++ tests/fate/dvvideo.mak | 2 +- tests/ref/fate/mxf-probe-dv25 | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libavcodec/dvdec.c b/libavcodec/dvdec.c index 750e25a4af..c57578a208 100644 --- a/libavcodec/dvdec.c +++ b/libavcodec/dvdec.c @@ -650,6 +650,9 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame, frame->pict_type = AV_PICTURE_TYPE_I; avctx->pix_fmt = s->sys->pix_fmt; avctx->framerate = av_inv_q(s->sys->time_base); + avctx->bit_rate = av_rescale_q(s->sys->frame_size, + (AVRational) { 8, 1 }, + s->sys->time_base); ret = ff_set_dimensions(avctx, s->sys->width, s->sys->height); if (ret < 0) diff --git a/tests/fate/dvvideo.mak b/tests/fate/dvvideo.mak index 24e50ca357..33686d7762 100644 --- a/tests/fate/dvvideo.mak +++ b/tests/fate/dvvideo.mak @@ -1,7 +1,7 @@ fate-bsf-dv-error-marker: CMD = md5 -i $(TARGET_SAMPLES)/dv/dvcprohd_720p50.mov -flags +bitexact -fflags +bitexact -c:v copy -bsf noise=100,dv_error_marker=color=blue -f avi fate-bsf-dv-error-marker: CMP = oneline -fate-bsf-dv-error-marker: REF = 4e884d3e8045299d0d45ec920fa58a44 +fate-bsf-dv-error-marker: REF = 3190a334b1ceef2d9fd050a1590da7c6 FATE_DVVIDEO-$(call ALLYES, MOV_DEMUXER DV_ERROR_MARKER_BSF NOISE_BSF AVI_MUXER) += fate-bsf-dv-error-marker FATE_SAMPLES_FFMPEG += $(FATE_DVVIDEO-yes) diff --git a/tests/ref/fate/mxf-probe-dv25 b/tests/ref/fate/mxf-probe-dv25 index 8b12a17838..f89357e191 100644 --- a/tests/ref/fate/mxf-probe-dv25 +++ b/tests/ref/fate/mxf-probe-dv25 @@ -31,7 +31,7 @@ start_pts=0 start_time=0.000000 duration_ts=25 duration=1.000000 -bit_rate=N/A +bit_rate=28800000 max_bit_rate=N/A bits_per_raw_sample=N/A nb_frames=N/A -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".