From patchwork Tue Sep 5 17:43:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43563 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2010016pzb; Tue, 5 Sep 2023 10:44:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG3I1ucSZSyo2OC3yQOeoxReF67f6jJ8J5Pv6zN52ow/TxOcvRpE+1zerqaU3ihT91IEDjs X-Received: by 2002:a17:906:74db:b0:9a1:da9a:f1c0 with SMTP id z27-20020a17090674db00b009a1da9af1c0mr375001ejl.48.1693935869337; Tue, 05 Sep 2023 10:44:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693935869; cv=none; d=google.com; s=arc-20160816; b=MIB4JFEXRi2coz8vXQIVMp0CP7J111ygtyF7U0lNWxgAnTaQxq8BCzl/0bsKTMfey5 +wQyWCHKUBXXnwHvCxOPGtNMoenRqKVufar5BYrGT3YKXSi2XioSz7CouDVCh3ftHNLn CL56IX6CKU7BfbrBxhNthuFuYcXLuzyd3mxBsHkL7MgUP6Onne2EdX6JnYSHO67FqhrS uJmPI4bmvKv2Rjm2FZJBQrsRxy2qD9ec2n7yWxFtYrVVayzVpyatdPa+wCIjil+AH297 DFHZ+mbqZBtyb6K3AfIURRinjKn0raqG9LeOfDbmKY+ywCuf9osBC6ntsdcNwB/s97oc bE+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=Oq+qZcavqhtm52MLbKTQPyUPm/EukPJ4O7CL4X1qdSE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=hHpc0CwRGwtu48zTkGCXPs3USr2gIeEVnyA29C0g/h9qZh5KFJ3uHwCGZOn3baL+T7 XAYSuEPo11YrlYJ+gU1WJ1lCVTUIvTo0alJFtw4yM8IcuOMBV87AmmffU/n0zfoR33gC dlA6wWGKgIiEHVeypKLUoCQx6AvxhgiZyPGW2sYrFoFoIIDOCMpwQqPiuxL67EN0OvCW DXVBJzW4eZssAkMJr7I5t+QLCXPn8avsmLTYRvlmrAT9JkH+fCu/36WODwKwWi2Gp3ur 2Xhymdrf1tk/BODKcO1s+1crQkCycvQ/tylAr/N9PsCKy1NcjsNmy/Wz7fZErc3i3cXV RSkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Vb++cYxK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y16-20020a1709064b1000b0099bcf4f5e79si7479964eju.674.2023.09.05.10.44.28; Tue, 05 Sep 2023 10:44:29 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Vb++cYxK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6443368C7F4; Tue, 5 Sep 2023 20:44:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CF39E68C60B for ; Tue, 5 Sep 2023 20:44:18 +0300 (EEST) Received: by mail-ot1-f54.google.com with SMTP id 46e09a7af769-6bca3311b4fso2075928a34.0 for ; Tue, 05 Sep 2023 10:44:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693935857; x=1694540657; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=ek6TqB9gGUO3TFikpKvdn9p5qbnV2iWPLnlWIT6Sp8c=; b=Vb++cYxK6DRIPSHe6EmIOaNpUh7bizOFGjwPbbEUiCv5Eiin1VcAx65jCAvmYvp3Zz tM/wqLvRttNSzrkW14KJwp9oO1L+CwWFRm0YTfU19VsJzzkdnrttp2dkyQse17mNACul KtXlh795el0OHroQd2iWlTKVvf06/0hGSEEae4D6MerX+jaklN+Gw55nBkr1flhj5lXC t6wpKG4XpoeM/M8PAT7X77nuy5v1kro6TGMIi2UPTZUJsHMnWG601wi5QnWjY2NSxXue Cr66jUbBKlvbEsDRpcVf4hHMYVe0i2OBvJXqg44cVsMyxfOg1yo08VHnAIO4nz14Cbrz hw2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693935857; x=1694540657; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ek6TqB9gGUO3TFikpKvdn9p5qbnV2iWPLnlWIT6Sp8c=; b=FIQn3Xn5gwftuQm62psqJ1l3GFjkR3ds4kZ9PRsicGp8DL5vqLSHgyzXtnHU8sGZE1 64yimUcmlBRtP+Dwdm323qrhfWZGJPkvv4v46zVhbAE9F91pN3J1NNIOmMZxlMorfmOU Q80/zRQp0pAXm333mEjTsrcAajJalQYzn/gGJ3lJebmuB1/1UkJTOPuM5kfwgCr5N8+w RW5AnLA3V8aNK4T1YcAJOXnIyGHGkJn2bsiXtn3p0YZOEqScADtwan73PxeWq3xVWD+X mANbTIO2bkVpZ/pkJXk6aqV36qenCT2RiCcTVHENPaCNl1fkUBCVu09Q1rKb+DcOve9d bVLg== X-Gm-Message-State: AOJu0YxxypyCSTd76dnKBoLd5IGdqLJbHQ4IHjytCeVB7gP0NZ0Mjdu7 sQrPQo2H0Ci6RSY4QDpTn1VpBeOiC34= X-Received: by 2002:a05:6830:1350:b0:6b9:14bf:7097 with SMTP id r16-20020a056830135000b006b914bf7097mr15232550otq.9.1693935856581; Tue, 05 Sep 2023 10:44:16 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y9-20020a9d6349000000b006bee51de9f6sm5673148otk.18.2023.09.05.10.44.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 10:44:16 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Sep 2023 14:43:33 -0300 Message-ID: <20230905174336.3585-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] Revert "avcodec/mpeg12dec: Do not alter avctx->rc_buffer_size" 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: nngCsemnpw+Z This reverts commit eb88ccb92e05018b1060cf8126b30eeeff551d3b. AVCodecContext fields are the proper place for a decoder to export such values. This change is in preparation for the following commits. --- libavcodec/avcodec.h | 2 +- libavcodec/mpeg12dec.c | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 649411ac79..714a3c78da 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1260,7 +1260,7 @@ typedef struct AVCodecContext { /** * decoder bitstream buffer size * - encoding: Set by user. - * - decoding: unused + * - decoding: May be set by libavcodec. */ int rc_buffer_size; diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 36461a9ae6..2290a90778 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -76,7 +76,6 @@ typedef struct Mpeg1Context { unsigned aspect_ratio_info; AVRational save_aspect; int save_width, save_height, save_progressive_seq; - int rc_buffer_size; AVRational frame_rate_ext; /* MPEG-2 specific framerate modificator */ unsigned frame_rate_index; int sync; /* Did we reach a sync point like a GOP/SEQ/KEYFrame? */ @@ -1392,7 +1391,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) bit_rate_ext = get_bits(&s->gb, 12); /* XXX: handle it */ s->bit_rate += (bit_rate_ext << 18) * 400LL; check_marker(s->avctx, &s->gb, "after bit rate extension"); - s1->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10; + s->avctx->rc_buffer_size += get_bits(&s->gb, 8) * 1024 * 16 << 10; s->low_delay = get_bits1(&s->gb); if (s->avctx->flags & AV_CODEC_FLAG_LOW_DELAY) @@ -1405,7 +1404,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; if (cpb_props = ff_add_cpb_side_data(s->avctx)) { - cpb_props->buffer_size = s1->rc_buffer_size; + cpb_props->buffer_size = s->avctx->rc_buffer_size; if (s->bit_rate != 0x3FFFF*400) cpb_props->max_bitrate = s->bit_rate; } @@ -1414,7 +1413,7 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n", s->avctx->profile, s->avctx->level, s->progressive_sequence, s->chroma_format, - s1->rc_buffer_size, s->bit_rate); + s->avctx->rc_buffer_size, s->bit_rate); } static void mpeg_decode_sequence_display_extension(Mpeg1Context *s1) @@ -2104,7 +2103,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } - s1->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16; + s->avctx->rc_buffer_size = get_bits(&s->gb, 10) * 1024 * 16; skip_bits(&s->gb, 1); /* get matrix */ @@ -2152,7 +2151,7 @@ static int mpeg1_decode_sequence(AVCodecContext *avctx, if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_DEBUG, "vbv buffer: %d, bitrate:%"PRId64", aspect_ratio_info: %d \n", - s1->rc_buffer_size, s->bit_rate, s1->aspect_ratio_info); + s->avctx->rc_buffer_size, s->bit_rate, s1->aspect_ratio_info); return 0; } From patchwork Tue Sep 5 17:43:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43564 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2010088pzb; Tue, 5 Sep 2023 10:44:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjYDHhoLaCdrkhnlnVxbPXLx2U6NkLC9xfsoDruQ72/gQCM5IRZIstMLdVUfCu4hNDBjCT X-Received: by 2002:ac2:545b:0:b0:500:bff5:54ec with SMTP id d27-20020ac2545b000000b00500bff554ecmr430284lfn.3.1693935878521; Tue, 05 Sep 2023 10:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693935878; cv=none; d=google.com; s=arc-20160816; b=wlVdEqF0zlMDREWyqT9J00FDwsbQG/3s6Q8g1WesmEIoB45WB6xVs5mSSla0V8kHso pqofnucdP9WWdYXWoOYzC+tl7U1TCpcMzoJjN8pxPKt6JIP3xyniIpjY2VWykQeH9Slr 8/CU84d0HxFNmOlegjYtuinZdsdAkVXc+Sw6DlEk+Exc9Y1eDgtBh5LNJvtIl/NtmI/A Tt/SBbxegWB/5AeU9oWekjvMWXR0JA2vXVVSxIJJQZ99R9tc/vG0rGtuw56h4/2YAsSH wqZXVmnsB7/5o27aqK6qP2FZrF8mGoZqn4ZHNRePaB6vOM6kXOUhx6/57AAGW5GpcRYW 52yg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=OLlbt1KmYjx9eYzboXiL839Kabd1EVFNYac1lEoVDpE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=z1Qnm+znMdW+zQVXE3aF9YLZk6IQHAb6oxuUJvNVHIMmiv9e3Qsrp3LbdFCB8rdZx/ zTddVlhsqEq4YaGXYte0UTe34JKuWeuUf9xDZDGHY61HhFx6f0SZMsN8rTDzcCJR5vNK U4LakwerslBGGDam1dspkH7U5c6Gs2IQQice2Zh5cDBL07o49ua1pnruX0lBqhJGcEsf lmvjnFnvcywIqxf+Xynaygh709bJpZp3nXU3+EJLpvPJdRkejpXsMnazw+F7CnWz6hF/ oXqqZnxehu0xCLRgEuuQG7M/OwfFQ+WZ7fUWKl1CzycOsh8wbypD6sG9Q/5zqCMj6ENS 3VsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ke6USn9H; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b23-20020aa7df97000000b0052369c1025bsi8072304edy.459.2023.09.05.10.44.38; Tue, 05 Sep 2023 10:44:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=ke6USn9H; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 62C6268C7FE; Tue, 5 Sep 2023 20:44:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f49.google.com (mail-ot1-f49.google.com [209.85.210.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC4D568C6A9 for ; Tue, 5 Sep 2023 20:44:19 +0300 (EEST) Received: by mail-ot1-f49.google.com with SMTP id 46e09a7af769-6bcb15aa074so53082a34.0 for ; Tue, 05 Sep 2023 10:44:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693935858; x=1694540658; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=FzKsDf3wlW/SMUtYp4hMsdOrOahe46cm2B3aGmFXGcw=; b=ke6USn9HYdKmdx22dtVTkK35W47w+DYbcMUlmS1KeJWHL8g/Qu8bY8hqeR6qZHqR/y N5/ABzp/7lMPnUjMAaGYng2eDSZi+3mbf2l1pMPyqq8VmGH4YnXA8sEjjc6Q/koc8cpl eGjMaJ9vrwzq6eU3f6kKhm2SafONv68bhij9oNULSYqru5pGnuTDZE5L7q8UsLQqbBcZ KIMRPYRSMX+7w3Q6r50LSBe57hZ3Bedz3c9ezxqgFNanRhyZOU3rcTSvBM06XMMXuxlr nT2NaakbcVbk0ubDn7Ny+rCipKe/C+x+VyocCdf9ea1cretYH9awkNondZDNj679ZOEx 5YyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693935858; x=1694540658; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=FzKsDf3wlW/SMUtYp4hMsdOrOahe46cm2B3aGmFXGcw=; b=WaKXB/jlU/sN+eYEUvTO+ZtotdQJu5Oc9Tz10f/spXHT0KqvM6HWyyXQYaKAH+R/Qh hkOUo/Wi7vqtO6tKjc40HuTVntlJcA7W+F+dRst9rtQ2MiaX05QIQHaA+y4QxdJkrE9f +Maef1e7o7qi600UKbz72aBh2m15s7yviMg5be5+VO32j5U6xbCsCj24BmsMx0GL93AD 85oVQdmUJvMDke0Q0qTMe14XtCGpWROkmCbs/55h6AT/xu+yNtp68I0HSUo4atdq8/yX NSSv9xNspm5oiDUgZ5Go1CY5rWJIjUcVXeyGXsOsxpNGXn2Yn+cuxlQh5OOb8ddEOygh 02lw== X-Gm-Message-State: AOJu0YxmW56s0Tld+f5oEvKJLONn20io10Y0Vr6a+X8JqBf0waY1MMHF m1BBT5bq1DcFU0QkMU5v+CCUURzEblw= X-Received: by 2002:a9d:4d93:0:b0:6be:ffa9:36ea with SMTP id u19-20020a9d4d93000000b006beffa936eamr7955752otk.7.1693935857885; Tue, 05 Sep 2023 10:44:17 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y9-20020a9d6349000000b006bee51de9f6sm5673148otk.18.2023.09.05.10.44.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 10:44:17 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Sep 2023 14:43:34 -0300 Message-ID: <20230905174336.3585-2-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230905174336.3585-1-jamrial@gmail.com> References: <20230905174336.3585-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/demux: propagate the internal decoder's bitrate properties 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OLvYzZiZHNhQ Muxers may access this information through cpb properties within the stream's side data. Signed-off-by: James Almer --- libavformat/demux.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/libavformat/demux.c b/libavformat/demux.c index b218f64574..fcd5daf699 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -2974,6 +2974,23 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) ret = add_coded_side_data(st, sti->avctx); if (ret < 0) goto find_stream_info_err; + + if (sti->avctx->rc_buffer_size > 0 || sti->avctx->rc_max_rate > 0 || + sti->avctx->rc_min_rate) { + size_t cpb_size; + AVCPBProperties *props = av_cpb_properties_alloc(&cpb_size); + if (props) { + if (sti->avctx->rc_buffer_size > 0) + props->buffer_size = sti->avctx->rc_buffer_size; + if (sti->avctx->rc_min_rate > 0) + props->min_bitrate = sti->avctx->rc_min_rate; + if (sti->avctx->rc_max_rate > 0) + props->max_bitrate = sti->avctx->rc_max_rate; + if (av_stream_add_side_data(st, AV_PKT_DATA_CPB_PROPERTIES, + (uint8_t *)props, cpb_size)) + av_free(props); + } + } } sti->avctx_inited = 0; From patchwork Tue Sep 5 17:43:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43565 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2010169pzb; Tue, 5 Sep 2023 10:44:47 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEdgwpW01V6wCukU6cQT2Hhky82p/NbhpmPW+vDTit+a0ztoakOtCgMkMdNZeWJL8cwK+qs X-Received: by 2002:a17:906:1d5:b0:9a1:649b:46f9 with SMTP id 21-20020a17090601d500b009a1649b46f9mr346569ejj.74.1693935887180; Tue, 05 Sep 2023 10:44:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693935887; cv=none; d=google.com; s=arc-20160816; b=IzOsy7yLI02NDlSCzU1lxzbe3eTpEC7FC2+5lqr5lNJpvWJ5mV89kQxRNkUrZ8Slzo K6e9XP0fj5R+ccKUY6krWWBW0N0PukrRRIwPJwziQjsoUCJBbXJQtkRAaGYZbRi6fs/G YALzkXNpmS4iZEio5j10YZA4Vg74m+S9qgFKuy4P4EzlG6yW85CtOG6+Qe/iVmAm7Csa nZacWI98D66AoyoYKkCSTFUQnZTAaaTeA4FaoOKcinGu5EFDvRxAllHWx42wl6teuyL4 krn6fXLWQp9mSxyIgFDKaT8aJ4T2H9iyqtRtq6WwPAKAqYFujrWPc/Nvml30S6NGgmZO aouQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=xbNQQ+keVIk2OxV4NDtZ2FdxYp2XakvYFLZIk9uQN8k=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=HtI83pJj0Fm6hZmt1pc5kpUWnIpVhwxrU7uG1u3W22HwaHNRX3MXBntOnW2cg9Ewuq /lhtuRTUVG3Qv/pCRhacMfgsKOkxEcLApyZpQan0tBveMC6V97nBSdnd8OVpSycADRFa Pa23l98L9ZW7suJqSNUu7U2wqsmKhnaV81kffpm2d7BWIjH7luz5Ej8sBYNWm4vbpDFm Hqmz7IIT6muH/uFMJNoWUCG/6Z98BR2YMNhYuN3qnOmv0m+kBU9nkvvgL+Tn0C2hlVHG C7PlYkcijMy5zg9TNHaUTxfw4d2pBrkOoskT/9zEy0Gefr9cYaq7BO6fRUTHLq7nUK1m mgUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=TEqts0c4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l8-20020a1709060e0800b0099bcc37923esi7902881eji.690.2023.09.05.10.44.46; Tue, 05 Sep 2023 10:44:47 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=TEqts0c4; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8D5AA68C7F7; Tue, 5 Sep 2023 20:44:30 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f43.google.com (mail-oa1-f43.google.com [209.85.160.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2C2BB68C7FD for ; Tue, 5 Sep 2023 20:44:22 +0300 (EEST) Received: by mail-oa1-f43.google.com with SMTP id 586e51a60fabf-1c50438636fso2162806fac.1 for ; Tue, 05 Sep 2023 10:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693935859; x=1694540659; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=K8puxiGfqXYslvzpdy+Iv3JpC7MCOEk8m2m0umVYJRs=; b=TEqts0c4Ho2rgh9SNFSVr42xWhclwGbP3vPDhgMpeykzatMES6svRtHbrZPGljPu/0 UaULYxistqYSg5WKFBOhUojfhwkMbmyAxm3UTp6w0wFN4XBeuX1R7oThxw4P+fqdxV6C dO5JYBKQojAEnNVjLsnRMPnLIa0Izj2k6UY3ZKkgy1rozvcp7lWlIiSf7XF2rtwoT0Dd hhbB834bwdfuXfcVONTMi0LnVqj8bqyYCMeS2IkG/idh04D9vazLISL0DDFCCdihifA8 LznS9b4eZqje/owz1tmpVWLbVmMJ9wBwrKbNbXAJLzFJ1dfjxY3gCAXf23bMfWSdZYtg COQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693935859; x=1694540659; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=K8puxiGfqXYslvzpdy+Iv3JpC7MCOEk8m2m0umVYJRs=; b=L63LTWrQA/eMviRL0U8qsr7Qkc8D/M3Su83ShVBPPhViODjXaZrDa/YLGadBL9+bXM p0e5NTJtwWCmsmdNYlSuCgs78rrJaPmV/xq8/lBFb5Gs7qeDeT0KR5EvwLiVL8dTmm8X yLA56T/Eng0WB7oXRvnmYufxVLFmzmpVrKgLGVVb6A5yp7M3F2/b1h2fqs91OxL3afBy 2rkD3VRNM2Ea5H/vG6/NjARjSDphcDNfAS/S17cs+z2iJ1lu6QeMaQzItTCmaJfD4WEc VDWQjHbid3GbktTLKOVg5EV9eofpiXg9Ebr50Huv6gTnK8/DMDzAeSXuLMPJPCS6zITU QyrQ== X-Gm-Message-State: AOJu0Yw6IA99h+1gIkXljC9kp3h8j0UpXG3L5WWe+JJiv/PSSoe4juAX +gfWYRMNLcnqktBNCjMRm4ClG/jvAM4= X-Received: by 2002:a05:6870:f60e:b0:1be:f8d9:7bdd with SMTP id ek14-20020a056870f60e00b001bef8d97bddmr16927718oab.6.1693935859153; Tue, 05 Sep 2023 10:44:19 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y9-20020a9d6349000000b006bee51de9f6sm5673148otk.18.2023.09.05.10.44.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 10:44:18 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Sep 2023 14:43:35 -0300 Message-ID: <20230905174336.3585-3-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230905174336.3585-1-jamrial@gmail.com> References: <20230905174336.3585-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avcodec/mpeg12dec: stop propagating AVCPBProperties side data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DMDs0GB1+9+r It's already exported using the relevant AVCodecContext fields. Signed-off-by: James Almer --- libavcodec/mpeg12dec.c | 10 ++-------- libavcodec/mpegvideo_parser.c | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 2290a90778..1accd07e9e 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1248,7 +1248,8 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (ret < 0) return ret; - if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate) { + if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate && + (s->bit_rate != 0x3FFFF*400)) { avctx->rc_max_rate = s->bit_rate; } else if (avctx->codec_id == AV_CODEC_ID_MPEG1VIDEO && s->bit_rate && (s->bit_rate != 0x3FFFF*400 || s->vbv_delay != 0xFFFF)) { @@ -1371,7 +1372,6 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) MpegEncContext *s = &s1->mpeg_enc_ctx; int horiz_size_ext, vert_size_ext; int bit_rate_ext; - AVCPBProperties *cpb_props; skip_bits(&s->gb, 1); /* profile and level esc*/ s->avctx->profile = get_bits(&s->gb, 3); @@ -1403,12 +1403,6 @@ static void mpeg_decode_sequence_extension(Mpeg1Context *s1) ff_dlog(s->avctx, "sequence extension\n"); s->codec_id = s->avctx->codec_id = AV_CODEC_ID_MPEG2VIDEO; - if (cpb_props = ff_add_cpb_side_data(s->avctx)) { - cpb_props->buffer_size = s->avctx->rc_buffer_size; - if (s->bit_rate != 0x3FFFF*400) - cpb_props->max_bitrate = s->bit_rate; - } - if (s->avctx->debug & FF_DEBUG_PICT_INFO) av_log(s->avctx, AV_LOG_DEBUG, "profile: %d, level: %d ps: %d cf:%d vbv buffer: %d, bitrate:%"PRId64"\n", diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 1204789c67..d0b22634bb 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -233,7 +233,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (set_dim_ret < 0) av_log(avctx, AV_LOG_ERROR, "Failed to set dimensions\n"); - if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate) { + if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && bit_rate && bit_rate != 0x3FFFF) { avctx->rc_max_rate = 400LL*bit_rate; } if (bit_rate && From patchwork Tue Sep 5 17:43:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43566 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp2010236pzb; Tue, 5 Sep 2023 10:44:56 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHjBrxntjqlIyX/3LPG8AFUMKv5wFCpHiHi5P7p9NOTmGoocSjyo8GaRbY6wGEIghgJPIKB X-Received: by 2002:a2e:9893:0:b0:2b9:ee3e:2412 with SMTP id b19-20020a2e9893000000b002b9ee3e2412mr389145ljj.22.1693935896137; Tue, 05 Sep 2023 10:44:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693935896; cv=none; d=google.com; s=arc-20160816; b=lX+rd4LyWqHhBxuE+yMTUZ874Sph+QC1oJPNA3OVpnXzGNuNjsWiAGluGJMMCP0ooz nKnaYKZQ2Nxt3ZLDD2Sap7n+StYxBRJariN4hCVJnsttYpOI5ko64JwYf5ptD87TganQ NkcQ1mZ1jinvyeOcCu5gTMpyDF9hgMs6aSYacGpGhqHC5//MwmuflHYchSGEKG2hewlI AC9wk5cJn/iPQHHJc2QN4/wESEKWl/6FyOMXM6qxMnpCta2lsCiVXV/EOtG2vigh8wH/ O8RXlssXbSOEQQ90F6+NlWwVXp7GL/cMafy6M0kTrV6b5Fz2xXaHK3mUwCzz79DKbC66 uqcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=LhiyLxMO0/HVDMW8MZNBN4C2kQjSq4mlNCwx556shtU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=mag3qYNeilU0r3+BwhwpSzHHIV6HWAeQlz3u7dBXJpOC25vx4ooimqTnl7v5d47OOC N7dE0pYyGpgxjxyS6sU1VtGaEiDhmvl0kox1hMwrXhwHqKolTM/0HFD7WTIO00OjEBRQ Sm8Prrg/JiZmvlk37NLk8Lp+9lYE1sXLmJduU9Ye0xf4l1ZGqvbFa8WUliqd0yvlCJHe C0EkgCeGbTuKzwcEN2Wjt4Tmlx78mzf97EWlg6UQiEHmnSrOwK5SzGbJmxA5r3WeVHYD IU7b7dUxgbj09makmnnvSJl055Ieo6pDJRhG3fyo+bj8YtihOU4siWuhR845+rFU1q2t ZdUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="Wt/xrCep"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ca3-20020a170906a3c300b0098f99532db0si7260679ejb.660.2023.09.05.10.44.55; Tue, 05 Sep 2023 10:44:56 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="Wt/xrCep"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A5BAC68C821; Tue, 5 Sep 2023 20:44:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43CF668C7FE for ; Tue, 5 Sep 2023 20:44:22 +0300 (EEST) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6c07e122a78so1680796a34.2 for ; Tue, 05 Sep 2023 10:44:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693935860; x=1694540660; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3nRp5KS5GMv0+u14t409qfQEqbz8NWc6hypH3/dQCTk=; b=Wt/xrCepgVwwc3mafZXXxmu/+yez8n4yIoeSxyhEP5ugZBUtQTuna9ARj87tktuX6F 8/5+MAMcYHzkyT4jpeU2QmV40pVh3e8K0fZ8+S4NLL4bLQMovqPz9XP+G0dXAduA3obK FuaIGJe/jnNovBc0GAo7UkAvTyN0m7GQ2Zb+lM/IObDDuPFTvsSOnP2PJnHu3NoE+gnW z6BqhZ9JyTF0d8lC1GIvvnGmIJAoNPXRj2m1kf5yzIBl9BB4TagDhvQgQnDG/hGh1tZz 40hDwdPEiL36Tp1pedIpAtA8LMuklW1WQeC23w6gv92Ks1pFQIwvcIa1Bfd4a2EO+sKL TUHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693935860; x=1694540660; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3nRp5KS5GMv0+u14t409qfQEqbz8NWc6hypH3/dQCTk=; b=EARedptPJSczVNks9zzOVn7dLJUxhSU5FgAVtRJ4g1MREDGQBQAhNEDIWg1C1lzewk CMMtTDL1SShNboZuFfqcFJjv/jVvHqTNYbza0JX3ugmI9hVZit2/18rwkDemtrQBSwNf u4bnje0OVh8RNvsHCEck6OZAGutucN4ITd8tTjKMg/OUhYZXU9gnae3Bs0VBs6VWeV/A ppbTZyjbfrXWxqZi5cgPDyLB5osAI3kdUi/wYeSe/o3BEUw5nNnjFq8iwxN84X4txGFQ n2/e3DGl8jlirCl2fQKqhNOoi1RIkILIj0VmtxG4uB8LMPLGGWRNgHBDF+uCpe2TSRFL r+Bg== X-Gm-Message-State: AOJu0YyEonGp0+2zC6ytKXUufjTvm99eicqBzxXNs1ze+z4I2UmsRWaC SxPkQpaHVGIP7QYvw5JyZ39m4ePSb1A= X-Received: by 2002:a05:6830:2088:b0:6b9:4155:7dbd with SMTP id y8-20020a056830208800b006b941557dbdmr14654148otq.0.1693935860430; Tue, 05 Sep 2023 10:44:20 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id y9-20020a9d6349000000b006bee51de9f6sm5673148otk.18.2023.09.05.10.44.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Sep 2023 10:44:20 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 Sep 2023 14:43:36 -0300 Message-ID: <20230905174336.3585-4-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230905174336.3585-1-jamrial@gmail.com> References: <20230905174336.3585-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/utils: move ff_add_cpb_side_data() to encoder code 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iKcwBgovoOeN It's only used by encoders, so move it to prevent wrong usage. Signed-off-by: James Almer --- libavcodec/encode.c | 31 +++++++++++++++++++++++++++++++ libavcodec/encode.h | 5 +++++ libavcodec/internal.h | 5 ----- libavcodec/libaomenc.c | 2 +- libavcodec/libopenh264enc.c | 2 +- libavcodec/libsvtav1.c | 2 +- libavcodec/libvpxenc.c | 2 +- libavcodec/libx264.c | 2 +- libavcodec/libx265.c | 2 +- libavcodec/mpegvideo_enc.c | 2 +- libavcodec/nvenc.c | 2 +- libavcodec/qsvenc.c | 2 +- libavcodec/utils.c | 31 ------------------------------- 13 files changed, 45 insertions(+), 45 deletions(-) diff --git a/libavcodec/encode.c b/libavcodec/encode.c index b92593770c..7cd3213b73 100644 --- a/libavcodec/encode.c +++ b/libavcodec/encode.c @@ -865,3 +865,34 @@ AVCodecInternal *ff_encode_internal_alloc(void) { return av_mallocz(sizeof(EncodeContext)); } + +AVCPBProperties *ff_encode_add_cpb_side_data(AVCodecContext *avctx) +{ + AVPacketSideData *tmp; + AVCPBProperties *props; + size_t size; + int i; + + for (i = 0; i < avctx->nb_coded_side_data; i++) + if (avctx->coded_side_data[i].type == AV_PKT_DATA_CPB_PROPERTIES) + return (AVCPBProperties *)avctx->coded_side_data[i].data; + + props = av_cpb_properties_alloc(&size); + if (!props) + return NULL; + + tmp = av_realloc_array(avctx->coded_side_data, avctx->nb_coded_side_data + 1, sizeof(*tmp)); + if (!tmp) { + av_freep(&props); + return NULL; + } + + avctx->coded_side_data = tmp; + avctx->nb_coded_side_data++; + + avctx->coded_side_data[avctx->nb_coded_side_data - 1].type = AV_PKT_DATA_CPB_PROPERTIES; + avctx->coded_side_data[avctx->nb_coded_side_data - 1].data = (uint8_t*)props; + avctx->coded_side_data[avctx->nb_coded_side_data - 1].size = size; + + return props; +} diff --git a/libavcodec/encode.h b/libavcodec/encode.h index dfaab7c976..e019cd7702 100644 --- a/libavcodec/encode.h +++ b/libavcodec/encode.h @@ -73,6 +73,11 @@ int ff_encode_reordered_opaque(AVCodecContext *avctx, int ff_encode_encode_cb(AVCodecContext *avctx, AVPacket *avpkt, AVFrame *frame, int *got_packet); +/** + * Add a CPB properties side data to an encoding context. + */ +AVCPBProperties *ff_encode_add_cpb_side_data(AVCodecContext *avctx); + /** * Rescale from sample rate to AVCodecContext.time_base. */ diff --git a/libavcodec/internal.h b/libavcodec/internal.h index a67cf713ca..83e0bc3fb2 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -180,11 +180,6 @@ int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx); int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec); -/** - * Add a CPB properties side data to an encoding context. - */ -AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx); - /** * Check AVFrame for S12M timecode side data and allocate and fill TC SEI message with timecode info * diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index f29cb0784a..53a1159b75 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -1018,7 +1018,7 @@ static av_cold int aom_init(AVCodecContext *avctx, if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) ctx->rawimg.bit_depth = enccfg.g_bit_depth; - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 5b59af6f94..433accba22 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -353,7 +353,7 @@ FF_ENABLE_DEPRECATION_WARNINGS memcpy(avctx->extradata, fbi.sLayerInfo[0].pBsBuf, size); } - props = ff_add_cpb_side_data(avctx); + props = ff_encode_add_cpb_side_data(avctx); if (!props) return AVERROR(ENOMEM); props->max_bitrate = param.iMaxBitrate; diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index f2b73361d8..a8b3b62b96 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -325,7 +325,7 @@ FF_ENABLE_DEPRECATION_WARNINGS FFMAX(avctx->bit_rate, avctx->rc_max_rate) / 1000LL; if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { - AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); + AVCPBProperties *cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 7a545527a9..0f6f4e785c 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1273,7 +1273,7 @@ static av_cold int vpx_init(AVCodecContext *avctx, ctx->rawimg.bit_depth = enccfg.g_bit_depth; #endif - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index ce849d6c9a..131d1c7fc9 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -1231,7 +1231,7 @@ FF_ENABLE_DEPRECATION_WARNINGS avctx->extradata_size = p - avctx->extradata; } - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); cpb_props->buffer_size = x4->params.rc.i_vbv_buffer_size * 1000; diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c index 873b3021ee..447e6da25f 100644 --- a/libavcodec/libx265.c +++ b/libavcodec/libx265.c @@ -395,7 +395,7 @@ FF_ENABLE_DEPRECATION_WARNINGS ctx->params->rc.vbvBufferSize = avctx->rc_buffer_size / 1000; ctx->params->rc.vbvMaxBitrate = avctx->rc_max_rate / 1000; - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); cpb_props->buffer_size = ctx->params->rc.vbvBufferSize * 1000; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 69e3152c82..5bf4b06a11 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -973,7 +973,7 @@ av_cold int ff_mpv_encode_init(AVCodecContext *avctx) } } - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); cpb_props->max_bitrate = avctx->rc_max_rate; diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 1e83ea9734..4249ff7188 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -1666,7 +1666,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (ctx->encode_config.rcParams.averageBitRate > 0) avctx->bit_rate = ctx->encode_config.rcParams.averageBitRate; - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); cpb_props->max_bitrate = ctx->encode_config.rcParams.maxBitRate; diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index b3b7475b0f..ac7364f61f 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -1504,7 +1504,7 @@ static int qsv_retrieve_enc_params(AVCodecContext *avctx, QSVEncContext *q) } memset(avctx->extradata + avctx->extradata_size, 0, AV_INPUT_BUFFER_PADDING_SIZE); - cpb_props = ff_add_cpb_side_data(avctx); + cpb_props = ff_encode_add_cpb_side_data(avctx); if (!cpb_props) return AVERROR(ENOMEM); cpb_props->max_bitrate = avctx->rc_max_rate; diff --git a/libavcodec/utils.c b/libavcodec/utils.c index bd4131db62..d54e050848 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1018,37 +1018,6 @@ AVCPBProperties *av_cpb_properties_alloc(size_t *size) return props; } -AVCPBProperties *ff_add_cpb_side_data(AVCodecContext *avctx) -{ - AVPacketSideData *tmp; - AVCPBProperties *props; - size_t size; - int i; - - for (i = 0; i < avctx->nb_coded_side_data; i++) - if (avctx->coded_side_data[i].type == AV_PKT_DATA_CPB_PROPERTIES) - return (AVCPBProperties *)avctx->coded_side_data[i].data; - - props = av_cpb_properties_alloc(&size); - if (!props) - return NULL; - - tmp = av_realloc_array(avctx->coded_side_data, avctx->nb_coded_side_data + 1, sizeof(*tmp)); - if (!tmp) { - av_freep(&props); - return NULL; - } - - avctx->coded_side_data = tmp; - avctx->nb_coded_side_data++; - - avctx->coded_side_data[avctx->nb_coded_side_data - 1].type = AV_PKT_DATA_CPB_PROPERTIES; - avctx->coded_side_data[avctx->nb_coded_side_data - 1].data = (uint8_t*)props; - avctx->coded_side_data[avctx->nb_coded_side_data - 1].size = size; - - return props; -} - static unsigned bcd2uint(uint8_t bcd) { unsigned low = bcd & 0xf;