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 0D730472DF for ; Mon, 4 Sep 2023 15:06:33 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 154FA68C82A; Mon, 4 Sep 2023 18:04:43 +0300 (EEST) 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 A222268C7E1 for ; Mon, 4 Sep 2023 18:04:37 +0300 (EEST) Received: by mail-ot1-f43.google.com with SMTP id 46e09a7af769-6bdcbde9676so1349064a34.3 for ; Mon, 04 Sep 2023 08:04:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839875; x=1694444675; 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=WF92MTDwptR8SSBQL9A129lbynivIssMGtofpEn7NUY=; b=B/tO/e6pgrnTG5ccveOeA4QMGhcuhJ4xB8Ynjx2xYGtI3N5TRXCE4Y7sDZVMyBTF9Z Is7OpelA3GH70EBqWYPXGegc69EAutvRwr6lSSzSNx4fDqhv7rle5xMzNcAKb8Mui/A3 NHG9ixNKu+WKRVLzDompkhpIDg8yHKDNO/tBb+VMN1RNVzPSYy5W7QLf8ViCcLN9ryYJ HxA0lgn6Yqneed6oy2nDibmRG+FmPq3R3BIpCz/1q8CwdB+K+CYv4TNj66K6+NwzCXLT OIGsGUpvBL5x6HgzIEaAB3t91CVc0BtGNbDy/EiXa5yQiUhE4ds6pPNSCBEGbpfe2DqL W+oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839875; x=1694444675; 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=WF92MTDwptR8SSBQL9A129lbynivIssMGtofpEn7NUY=; b=IYm22uJhgnUwlgYmkxapEdwwdROm2GCQNKOwLL94ysxeaxNZp07V7R5hq1+Ta4npYO KoeWa8URqHnMmK4kC56qzlxsyHbnQCZEM9AjgG3haRUhOU+9AUyxVI+ODVRUv9G81/2G wdaRGny/ek/1uWbTksGEQLlpm6yVH9tdA70avUqsXPikQ/3HUb1hZFtI1xM30/cSXQEm od8n4pu0EpjDVPOYGpaS9SkFQCBfyatBmKmTskByOwfKglz1zgjUsMslK1znOLsz/TQX +n9U5SD4nxoydI1JZP+snZOGMMhYsztI9JRfn3LcAaWiYAN0I/Tv4wK0YWRXtsp2G7fM OGrA== X-Gm-Message-State: AOJu0YwPJVqM3G7p9BOYjQb2nauiyQHVhDt50OB2moHO4KxQzY14x6A/ YdpFTRn+OX0F7M+ztRZT7Wdq1AKZhIc= X-Google-Smtp-Source: AGHT+IE9AhsIDHB5wRYMjopHQj1oK3M+E+u0cMfwlaTlLQWV9JDL4qOrUuO4zc2rh/ls62bvMHeVUg== X-Received: by 2002:a05:6808:b0f:b0:3a7:5475:ed30 with SMTP id s15-20020a0568080b0f00b003a75475ed30mr10656297oij.57.1693839875504; Mon, 04 Sep 2023 08:04:35 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z14-20020a54458e000000b003a9cd23980esm4946286oib.8.2023.09.04.08.04.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:04:06 -0300 Message-ID: <20230904150411.56777-14-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230904150411.56777-1-jamrial@gmail.com> References: <20230904150411.56777-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/17] 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 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: 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 && -- 2.42.0 _______________________________________________ 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".