From patchwork Tue Feb 1 13:06:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 34016 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp608625iov; Tue, 1 Feb 2022 05:17:27 -0800 (PST) X-Google-Smtp-Source: ABdhPJze9sLmWRKx0N1M3et2B63wbnqeyxngi+QLLWZpVWBw6U3wcrOHZix/gAwBVZeWCpx8cyp9 X-Received: by 2002:a17:907:2ce1:: with SMTP id hz1mr15125768ejc.681.1643721447150; Tue, 01 Feb 2022 05:17:27 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id gb30si9783299ejc.581.2022.02.01.05.17.26; Tue, 01 Feb 2022 05:17:27 -0800 (PST) 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=@outlook.com header.s=selector1 header.b=FGKRjSsP; arc=fail (body hash mismatch); 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=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20A7B68A43A; Tue, 1 Feb 2022 15:08:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-oln040092075035.outbound.protection.outlook.com [40.92.75.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 73F2068B39C for ; Tue, 1 Feb 2022 15:08:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fYUkOJkmd3ssRkerJ3NuYEmeTw5QBhPmP7ozNcF+/45EO+O5Eb05llVME9VzyguxD3astOPYHBC49fekslBg174TFH9VAvZ67UzV32flkuZJ6jeNO1B0SzOxi+Okdsy+oBHFavtcvAT0/QaNIulj6FZWyophFTfn9RMutQVf5h37FN3lZNQ+ZHXvwF6X8Aj2eT7UbSppxC0/4L/4H83rkBn0yQIScpaP0wvi9bHDFxpg1Nv5oAJEl9tTaJuCeHUCjVTy1Kviy4RXUR1rcq0Y5pRDkO+cAcLihlRSrBRXJvagsxINvs+Ds9bMMo3sh6/PVDrpLIftKtkj7aOwK90fRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BDOk2FdvQkLu9Ym0Kit7ww1me3Bq9lv02Ixz6l5TxcM=; b=QxMhW23fPEZfdXMb8LnSkOkhctnXZgoeWnSN1AdtK80B0KiZAT0SER5zfccIHOHzv5sGkYdC2oFWJZs6sp9U02VwvtFJwKMvPoBjWSXVshY1mIs1FnBD8k8GrFS01r0sHNHryUuxbidYLTZ0zgddi+7MoVirN5JL0hKsQWjAlo/qWGRuea+uRh1d3D3eY9FJoF9vl3xW3xQgVzT/n9Vj5D1VXDBAzfFYL38qTgf7/dvSYf5H0QixXXhNmkuM14r187J/EYTm6OZ8z6yuoN30bsWyNSaL/GRRFUXc1oPyhQ6Sk6/FGvgy2RY3sJPXyeeBIk0Lx2vqZcGxZ3JwCndryQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BDOk2FdvQkLu9Ym0Kit7ww1me3Bq9lv02Ixz6l5TxcM=; b=FGKRjSsPdzGpqInN2seWX2/8RTJPj3ZSQJAiQsxISEkQPmBxmCSNsEo0Q9c+K+pYKtFfEwC0hZKm/N1zZiS04X/xMrbqh+b0w+eGVkjLS+psOOO+9ZbmifhrDRfPMGg1AP9/m923q8I6/TzhCZQFbXT1ysr/GPVo4o5gs8srWsLcIYMH0wigm6SYKjKQgpPm8D3JB/IMKwa2m08JU2v0lXFsc6LFbkmpOvBz4VAL/AHJPEs+WQHrDaPfFWTgmdX2MpIl2Hn5sCFD7jhE6YwOqBcYNXa/V9BkT9IPpuUwEe8MhcP9MLnGKnN5tL84YUPx9XQtNjCwWNNjzjBFPTaGHg== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by HE1PR0301MB2330.eurprd03.prod.outlook.com (2603:10a6:3:73::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.22; Tue, 1 Feb 2022 13:08:36 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%6]) with mapi id 15.20.4951.011; Tue, 1 Feb 2022 13:08:36 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 Feb 2022 14:06:39 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [EzlKnynmEFFn9upcKXgvPnbazWAfL8kV] X-ClientProxiedBy: AM6P195CA0092.EURP195.PROD.OUTLOOK.COM (2603:10a6:209:86::33) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220201130706.1420875-41-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13a915c1-247e-4280-f112-08d9e583e6b4 X-MS-TrafficTypeDiagnostic: HE1PR0301MB2330:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0CDc2/80UCCA6NmXIZ+C56FPqZn7h2kUBcPFdOKwPHwrenPGqAkxTJKCkI1NFoG5BRNPb3gTP2dFBvRKKCamHjxqUGx5uHiNAUsxoOEiU4w7aDIfYjv8YOk2w81pr/4FtlTuoSja0ypRkn0mbsIDASGIhyghbau8nfOdKaiGxDzrx0omXTo8xuxF04HvTdPMmvcJuH49Nl6osUTo3ClzrSPHyQ9etusBq/5Irf1oQcoU/zVPT8xh8dSTJqvJrQN/IodA9cTRd5zt3baUxGzbgn8rqbiyug1bL3Dp3yEB5mVRMrDdUStKy49qIgfR8OzWkXuJexYTNZ6nBkZaA5LjmpYPJ7EsU1ZnIzGsO8YHb57XlfwOlFx0s+XFrXQyiCp4Eyg5gYfC0zFWviRKRMUS60cxdH8DYMWi/SJOX/nboYFz1vXW2x49KoS5utMq40PPTYEBgXDMB1AI97UKIl+QfPd74irlomPaYLcH5vS3zze6dY1mnByYtSanzGC0E7HqCBAWAT2VrxopPvsZvECy5WTIsG/djCzmU21luzMsdH8KcQxcVi52JQiOu6yFaRau X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: onTyWIFWvOVKaWUZtQL/KpdOhGFtmKwhFLizRwAZIfMN1umDbmtlQpaFrIjtXI8697e2ZCurG6xj6kT/5qlCoKfcWq0CQYNd62mNzMxxYlvdHxn9DQlohTBDIFDuOdWDrOsHJgukBTa+bkA0yUpWzwdcKVp0LZNJPL2G7oY4/TeltagEH5I7htoBgzKxG/r73/NMubwNR61jmII0qaxn8cfV3sCAeGd8lfZwOw6F7nAqOxJjb7D36cfWqJLNPyelMX4vBt5/e1+fKhZFT5o/iOlpA7g/DDqqoCkjFusnDJgp3T3MPEUNrroRmQqf4KL9X6hTa/PKbuE/97nODy1HMVHIKDeibBViqwec77xDEVLk07vP3YysFbjsuXjoiYdgjBx8Dg+h3QxJqFaxKEbP2eCqIosteW3Mhk50XHnF8tr5TgOuPyA4hohgT7H92qc+NaNFdIFSzu/++VkEvP995aw4uMjTlNF7E9Q/FpbVg6qjkjO+ebtUqxKwezVM6izJ3nsV8UTWtwbPdDDSRbC/Wg8BmtSKy61S8Jo1TR7/GFST0nD92aew70hA3OuIhtzTB/F74OtPsmfcnrg5cIVRvwhxxXnEVPiHm8ofnAn4h6b/cfyAQibj/lLgAgFUW3bWUuDgf7Iy17K2vaUUoOoWYDRMfIHZUex1MDYLYGik98izJ2Fuyqtftw3zLOZWILB5maHHtRyKjkRIVJlby8TT1YN6HiXfJDD3d5OA2NE8Rv5EEbpMWD4tC5y70Hd7W1slfJrUsNatwk9ncWXzA6wy7mp0rrF1s/T9gnNsvNXf6aghKTO57QRnj7PbCPJ2epI8rzJHdoM9PZ7+5FZ9VjiO7AygbGiONPVpdOxm/sH5NvfQXAORBohSYWPn1Y5tSLwWxefPilal83A3MOg3TNDIlMvJtY5tqJB2HRRkzM4/eCL07ZgO01w0mazbZf+JN4kH9c9u3SptQtiguA+iKVr9Lg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 13a915c1-247e-4280-f112-08d9e583e6b4 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Feb 2022 13:08:12.4667 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0301MB2330 Subject: [FFmpeg-devel] [PATCH v2 42/69] avcodec/mpegvideo: Move vbv_delay to Mpeg1Context 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: dONcDiIaLA0d Only used there and only by the main thread. Signed-off-by: Andreas Rheinhardt --- libavcodec/mpeg12dec.c | 5 +++-- libavcodec/mpegvideo.h | 1 - 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index 22e0ba5ed3..d3c32818cf 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -69,6 +69,7 @@ typedef struct Mpeg1Context { AVRational save_aspect; int save_width, save_height, save_progressive_seq; int rc_buffer_size; + int vbv_delay; 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? */ @@ -1285,7 +1286,7 @@ static int mpeg_decode_postinit(AVCodecContext *avctx) if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO && s->bit_rate) { 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)) { + (s->bit_rate != 0x3FFFF*400 || s1->vbv_delay != 0xFFFF)) { avctx->bit_rate = s->bit_rate; } s1->save_aspect = s->avctx->sample_aspect_ratio; @@ -1358,7 +1359,7 @@ static int mpeg1_decode_picture(AVCodecContext *avctx, const uint8_t *buf, return AVERROR_INVALIDDATA; vbv_delay = get_bits(&s->gb, 16); - s->vbv_delay = vbv_delay; + s1->vbv_delay = vbv_delay; if (s->pict_type == AV_PICTURE_TYPE_P || s->pict_type == AV_PICTURE_TYPE_B) { s->full_pel[0] = get_bits1(&s->gb); diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 20be21a834..0153abde3b 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -179,7 +179,6 @@ typedef struct MPVContext { int adaptive_quant; ///< use adaptive quantization int dquant; ///< qscale difference to prev qscale int pict_type; ///< AV_PICTURE_TYPE_I, AV_PICTURE_TYPE_P, AV_PICTURE_TYPE_B, ... - int vbv_delay; int droppable; int skipdct; ///< skip dct and code zero residual