From patchwork Mon Sep 4 22:10:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 43552 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp1475111pzb; Mon, 4 Sep 2023 15:10:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEvQzTfXMduPOo0osu+hm5osk0OvpBkS4kuzZUYspb91vcrKDgEggsqgyxtX6MWBwmBE8Sx X-Received: by 2002:a17:907:3e1f:b0:9a5:9b93:d60d with SMTP id hp31-20020a1709073e1f00b009a59b93d60dmr14223968ejc.36.1693865450732; Mon, 04 Sep 2023 15:10:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693865450; cv=none; d=google.com; s=arc-20160816; b=wCFIO9SvA1jTQdr6hDcvEKRqelnhJhZxBlggYMnUAOoyUuWIHXi7+s2ea4XnZc9Xbv MJWekbgdVbkH5a68UQ+/qYLzOOWIfcehUkT1oIQgwzVfs8ILvukXHJzLF34u5DQFFDIX LgQ/veFYxDCoJb2mOwkvDj45FXx5Y7+FTrdcbConBbtiQDeeeEossFhDA8f7vGae5DxR YwG9K9ilNQbdwCDbbGh2ZbmXGKoT+n1uSmWQUTIoVMJVcynm2cR/sbCex19wySc+qhhj 5G6HNWiiWWhTBqujYiZQTiNdQCguoFAO9aXnCt0LUQi7SoizWosP1LdZo4KvkVJSB0R1 7RAg== 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=RV7qFn8ghRIX//br/dC7vHxaD2IZimezjj2LlhBYJEU=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Oj2NIlb1FgJmJviuI9dhx9/GMNcNwwL/+gPlKM/HwSzO9o3t74v8gJ1+z/rLVd0eob 9BxMx4dJEtQzS6XklTENkNr5hO+KIoAX/bUBfMHO/DzxdECLF9l7+zkDovxOaZvbT2Dk LZYTIB4aJ/8oguY/uVvpaf4aqw71yz+3PZqW6qS/TVyw435gkJ+33cU/BQeltYroaAnP iSwGVRbYYQWTJVJ3JxpPY3oKGEkRPzB6YmZmD6aMvAHGDHHUecwDzz+m4XWGuyue2Lq+ nnNwZ/9yGIOunQIXUMKEQafLw+oGIEB0jV5QQSnjw14ZK1lUuDfrza1bBDcneATeD1f9 1IBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=hdt+CydY; 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 k23-20020a170906a39700b0099d74066201si6540773ejz.415.2023.09.04.15.10.50; Mon, 04 Sep 2023 15:10:50 -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=hdt+CydY; 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 B03AF68C7BC; Tue, 5 Sep 2023 01:10:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f177.google.com (mail-oi1-f177.google.com [209.85.167.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2802568BD32 for ; Tue, 5 Sep 2023 01:10:42 +0300 (EEST) Received: by mail-oi1-f177.google.com with SMTP id 5614622812f47-3ab244f2c89so1374836b6e.3 for ; Mon, 04 Sep 2023 15:10:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693865440; x=1694470240; 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=IGFeD91iHvAd1DqzZE+R5ZRohlQuRCneF4sfbnT28kU=; b=hdt+CydY81Hs888oMlOzXtpDEXgdK9W4AdtKLLF3heC4fbMvsMgf1RMV2swcjG+gb3 G9oHOltzHAkW5ylYc61dzWyG7iWiIF5vCtTWTrzKGfxIKtsKoPGfxBYymQsDvfkjvzI8 qLcGAFlyqhCxc0Upeq4Zar05+nkk6y9XWdRv0zJpzxbTeKxNGLWdx/LvlwqRPqXjB/0u UUmQKxnVpIFBvqgdEkGZqj+f7V+qh8LEg1xpk7AxuMNsE9lJMcmQwUkidUr9JAbbfQzO z2RmtpRR2w/R6kY5LgFHEGZJbXgon/NuTT6BVnvk5HUcZgK1axDgqffbFqRQ8eH3HdNi H+Ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693865440; x=1694470240; 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=IGFeD91iHvAd1DqzZE+R5ZRohlQuRCneF4sfbnT28kU=; b=MKEEbspauQOkB6YHKIQyzdRWBMxkb/n59FuopNRwaidDAofc510KLlIFbfUQ0Jl6MG wJvjnKGx+nc7MZpfWS1zqy6fPCL3q2BxY5f6J2J/P7ppguZsZtzqR3RgFc4O0KJ0LWcJ FIF/K20hPMhPH08SEXYPU2QrFY7qYejuWU2CU2MlXPr8SEBiPeOsZQ0wh+XvmJ4QAv/s Hnsy6lufK7PQFS5mPynJ2H7wvnkEL5k+oLlDOlT9fqNVsJxL8q2fi80lXVzYiPhNScxU z8BquVJn7vItEYV5BBbPm22mVddOAf+0EBcARwIZzs2VVntszc+Wi/LFQh5CKTJ9L5wE L+jg== X-Gm-Message-State: AOJu0Yyr8lSYw/WTbmemwEfvwOtdznlR39nBfoRp7L19YYF1v+BLdivp 78855jwqASH6s/sYbxjqHzzrOk15GDI= X-Received: by 2002:a05:6808:1406:b0:3a8:f3e7:d691 with SMTP id w6-20020a056808140600b003a8f3e7d691mr17122341oiv.37.1693865440238; Mon, 04 Sep 2023 15:10:40 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h19-20020a056808015300b003a1ec14d8c6sm5314057oie.23.2023.09.04.15.10.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Sep 2023 15:10:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Sep 2023 19:10:25 -0300 Message-ID: <20230904221025.21922-1-jamrial@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: References: 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: 4P8Ps8XS7Wyj 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. 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; }