From patchwork Mon Sep 4 15:04:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43539 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1274012pzb; Mon, 4 Sep 2023 08:06:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEynQS+mcdvRwdZJhDC1DX//nuIOV5WYUqjzTx3WD9WDzMCyOh/LkxB+/ELVvsKDOPFtJKK X-Received: by 2002:a05:6512:69:b0:500:95f6:ba3d with SMTP id i9-20020a056512006900b0050095f6ba3dmr6056980lfo.21.1693839971689; Mon, 04 Sep 2023 08:06:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693839971; cv=none; d=google.com; s=arc-20160816; b=qGptXLLEvYXIMrmKMFI9oJjLoNQiJZrwaNp6W8M9y8+26mUvIWT/Xku0BNAM3agp7f 7v2cQiNuMG7hXA/rDzgeRR6AUS9PZ76Z9xMnOr82BMk7ALjuTpQvQozdt6fh8m9xW37z x/Cy/YheftWiwePAdyOBVu1g1/RHa8T/OeQFvtNZnMn+4DrQ7WT+Imh0pixojY4o/TAk YI8SxaR7NUzpo1lzxudzo2CT0+sILnt3Njuo3WNp2a1o/SoJRvfQwqBvCK7DX5VPYyDO waD2VBuG3XY00rk88FDgnSwlLgZZaopathfbX9F7AKDnqov7OBYTzJJKjwVEw3VIaGtF +Z7w== 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=npJBEmxsWMmSuO2axwwYtqM3xO0cyKUPL8PoeU4cbfo=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=R/LYrvBa8wE7UvNJ93sgYbHM6nojh5Z1Q/GryCHdFDx4HckcByrvFkspRMSXJJjYam Tr0pZzGdnlI1jPQLI0y1vQzXp9YOnqNOn6b2nO/iP07NQLLtQL+Wg4bGplPCI7VSMMiX ih49yaoM0rFeOT31piH7IpQpKWR+cDIKZljjd6zU1PLCGN8Ku3ccHIN/P/j5gqMITLEZ Iqxs5F2sNFWtdcy8FybCLx+V7VWyLUKtXUwboRp0YxZip6Z4KWncFxAmePyDSbqaDbmI rDgEH8YE/SYRS7x5WdXkAjo1k3+uslo1A8uQUuMRRHxc/gWfuB0CBPu9nuElFOUbYFA8 tPXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=cPOzBmx3; 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 h14-20020a17090634ce00b0096fe1a56de3si6164666ejb.1048.2023.09.04.08.06.08; Mon, 04 Sep 2023 08:06:11 -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=cPOzBmx3; 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 618FF68C801; Mon, 4 Sep 2023 18:04:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f182.google.com (mail-oi1-f182.google.com [209.85.167.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C0BEF68C7D4 for ; Mon, 4 Sep 2023 18:04:34 +0300 (EEST) Received: by mail-oi1-f182.google.com with SMTP id 5614622812f47-3a7ca8720a0so1149108b6e.2 for ; Mon, 04 Sep 2023 08:04:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693839873; x=1694444673; 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=UEniTnfAQlzI86rc+DCvbN9hv8crEDVofJZGPSsAxUI=; b=cPOzBmx3W1Y/96I0xVgnZg6y9Y7svGyvBUT0/ZwYNWKpC3Az3ZEWrKzzgWznh3npUQ arkviX2L/XmLr5D9KGu9EL2O4ahRlvrPJRO6v3IgROzjMh9jd+if0LJCaiFnoXATAcPR zXqlr8dixI+bMVbWWea2kSDw8Y1FIQsk+P1xFUqO7I9Yki7PFIpCW6RdSSko6U4mSSAW Q2Q0DbTv7ScIocdgvQEBTLRgBP0Yf/nVuNuwBU8IqtWYdze3EAMfqIDFzJ49/3ZmZCJx sBbZ5d5dY+vxEGYwJ2bd2gyf7g7uXPjSZGzvUDo/ORdLqxwTBRJ/5NMpSP7N1pNYlvUJ eG/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693839873; x=1694444673; 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=UEniTnfAQlzI86rc+DCvbN9hv8crEDVofJZGPSsAxUI=; b=I5m/b4ge5yWsSPhQtMo4yEVQXrAqAwLAw2lrnM1Gc8AE36oupPXusXprikvQBjCnAI FX4JE703IwdOA0x40dW0H1g+P81ENtALQtX0Z6FnkymfFac0g8jrRW7qPj0w/X1iGUEZ 8814ut+u/0eK/2a9th+errg0JeQbZ+xFt+CsH2ikbpOWBE0c2MgMeB7CHeE+xAWvLDVN WAzgv2uJaXOyVBi04OkbVdy2H6NE19cqFLlYhzYfIo3PAbCbYImapjfxhpefxZabNTuP JSoIVEtdQPVrw+DceoRuCi5lKZ9IWbHFObjcX/boUfK7M/mTayxp8XUoARQTXyuQHL3/ +/+w== X-Gm-Message-State: AOJu0YyF4dnOnbFh7SeMXL6aJuj6VqvymPEySKKv1/5Brbg+Qybfycmi qwVCdM1jNEXO0IL1Nea319duqvGH2tA= X-Received: by 2002:a05:6808:bc3:b0:3a7:3100:f8b9 with SMTP id o3-20020a0568080bc300b003a73100f8b9mr14943869oik.31.1693839872969; Mon, 04 Sep 2023 08:04:32 -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.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 08:04:32 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 12:04:04 -0300 Message-ID: <20230904150411.56777-12-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 11/17] 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: uomcl9cZ5ipc This reverts commit eb88ccb92e05018b1060cf8126b30eeeff551d3b. Signed-off-by: James Almer --- libavcodec/mpeg12dec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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; }