From patchwork Sun Jan 30 06:27:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33932 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2c4e:0:0:0:0 with SMTP id x14csp1771901iov; Sat, 29 Jan 2022 22:33:17 -0800 (PST) X-Google-Smtp-Source: ABdhPJwVs8GvWHkZcBOVXtmBnpOh/qYTvxxny6023Xr+JzRUpeT4SuT7KsYUU1IUz5knvi1kOxrJ X-Received: by 2002:a05:6402:254a:: with SMTP id l10mr15147221edb.318.1643524397375; Sat, 29 Jan 2022 22:33:17 -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 y3si5583910ejk.567.2022.01.29.22.33.17; Sat, 29 Jan 2022 22:33:17 -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=OaS98M1l; 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 5CA7068B2E1; Sun, 30 Jan 2022 08:29:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2070.outbound.protection.outlook.com [40.92.91.70]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0101868B22C for ; Sun, 30 Jan 2022 08:29:10 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=U/JF2PVg4CHBdrQU1xmkop7dNkKD7NpykugMNU0PMda1uj+AUQWC/ZgTEQOEWmiDW2HZ9BOBK602dDu2UrbOUB/g5QzWiJ1ajQ+zqSL8NzBqN2ek/uGbRIEnRfMjs11GNmcr7/m+/TsD0aU70Ktb9Fni6ZTgsDV/GZOaajqV3BiEuPqSv/uWwyi5Chv3k5jXjgXhvXezoNuZcZakoEshZB1UAVx99a8Lde4Td4EeLP7VwF1JCq7Jp425/FClYVDsjxJvaPezG9L9gMPBanXB699qeBlV3NNggKpiamIWFzXeYEglDn5iOergQGPzACxHo2n2ppP/J6nUnfFnsWY7yw== 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=fmp8t6mikpYnyUK1L89z8JscGBuDbsVE3Je2uH838uk=; b=cFV0eDOHZDCJGHzzDDzxGMn5PnAybbswSUP+CCRNyONza6pB50vCNgtAIzE/BZUDRdb0RglnIJE5kwMAGT8T4u1Y8VPP6ZAIoJY5V447xSC536z68aDL8INoc2yvbYQKkLGsD64NMeYLKFFMeaUDdgk9k3Wexj7EZLkiEzdB1QNpexK5wGziYuFKcF6v9wAlETwPcsYjUPMGvRYMGhLg4T2xBooDOB2BmwkTGQy4xJWs+HBnhFB8bExDpFvhAP2fUDjEe7QVSwkmjMxG4UUambdWncIdATKrIF+X0pEdkf6KAEcZnIohgvWOhH5EwOfxdvvv0zBfXKHm/dvCsafc7w== 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=fmp8t6mikpYnyUK1L89z8JscGBuDbsVE3Je2uH838uk=; b=OaS98M1lJI3mk57qqcfIBdFT2xGJ0E8SRPEOi0sJ06jIpCpd8jmDnbSWn3HlszFQZNuK2lLn1lJQz9Ta2R2AN/bYjE1CkELcbh2cQwc5eO3qe1ABcrcTKqUcuSbHaP8wHTQv5aGWVbRaufDxc800B1tJKB3WoVZQ7FnkmcweZ/iZxZDYVUoJfBToGlDzsGdIWAp7SkqQYFvdhpXObM3zPu3oW7Wk5Cfx+P1UVMQg6uSpN/gKTULDg3wyo0buMx5gDYGV5Itg0Xm8ZJytCOmy66rerXntaNZ8VP+f0ogsvbsiIE6QFxLn3dO0bwG44PaZ3pTN8kh0UwdGIQBRQ6WsMA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB6239.eurprd03.prod.outlook.com (2603:10a6:800:140::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.20; Sun, 30 Jan 2022 06:29:09 +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.4930.021; Sun, 30 Jan 2022 06:29:09 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Jan 2022 07:27:40 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [26asfCTy0v87ae7Wed1j88IkVDH9Rcbu] X-ClientProxiedBy: AM6PR10CA0044.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:209:80::21) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220130062749.936489-31-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60619da3-bee8-44d1-c441-08d9e3b9d2c0 X-MS-TrafficTypeDiagnostic: VI1PR03MB6239:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +/vh7oeGSvm/7aaoyPirej+R5tAwU9mpjmjOb+FD+j6H0p8TRs7un4U78D/d9vxezZzcOQLUCod9gINexdjL9+rL6c9LFA/gAw3Dj4wu4XhM41tsb5orDnDpmU4gqNgOSgGNEIrd3jDJK8S88Xrd4/F3nAyiC//L5R5+FaPD17OWEYhjdI0QaVFtMTn2FqqJvL0EwzIoBrDYE6rqz/DWBU/+lHNj1OqwRSPwR9V7wvKixKNgBLsJv9u0m0LBbjC5Nu0G+xgz/soL6QNY/uMtr/UL7TGFMA8qRmb+nU4v/9gCkM/os0LYfC0p1e+cqdMVHqUQJbw6yCIFtaLLdCu9b8tuWkfPc/c9xHBZSrBldIkXb1722zM0JOzR+DVMUw1jE2CL51ddnm4zh6ezoM9h48vo3GResZiyKdMqChy3/rMRmqPh616vd+ZoTtv547jnsRw5/37HGwJbdcJ0ZHB9Dq5eAJFcEQYvFXgGq853TfdKmXt8DRFWWaCCVbRzDMNU+OiJ7jyiCM8bwIkmLX/mqwGRd9Xaa/fIUYl4EmVP9SPx7iiUi0LDw1ZPUfQGJQd2 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: G77Hpkn6Prjp86Y2CVsOIpSouZrOOR2iiklkpEvBrgc7QV5mH5PiKIVhiGckCBnZgiMiJMbaIL1ReppPHB0JlDuOTWoycGImo1SdJIzC0W6Pu0J0in5WHVh6QAKqzqPSBD2JQGOF9qa9VOv1BlilDS3lPChiHJO6V06wtC8xfu4M4BzIlgebQ7QKcYviPKIEmZLZfjpWl8AR+RipT0bMciZlAY+rcudB0HJODSxTit92TW26FY6S1yvhcJhfRTAvbeFt2PMXD1nhaG+YG0i+vn3yNTlxdQwdEbrDIGxG+pTeEEaHxtMOre5SpjwqYJ7R5LMjt2bOqvZ9olkE/VF48ES+0Z6K5M/9ieHWQYV6qPnxJttLs9cgiCL22HpnBql88IDJeIULtLcUXj5zjURWLL81UGs/loeLFn+mEb7RLKXuaGvY6n8IZfBW2kSz88R7vRrdH5wtxPNLv/pyI6f0cTUmyooWQyHPOAnYTJck6X4YkzwnFLEcHnZyeuamKpSkIOvcqyLTbrhdk0fKsLSSs6moK+AmE3fa4+Lhp1NfgmJaR3O5QmK+7gdjGGdZVMI+AdAE6BpGNT42kUczcV1hLYWGzB51G7cjqpJEI2XKLfogKbI8TgQhPsjMycgihD8UVtgv3wbBSut2KUhSSWezdAWbufnXmRUwpeMBINCLvzbC+VT3txeK/80nf/bOaBJ7hEtVv8GSa7GbOLgwOkWYPL4hxUj6bEF/Bx649073yGAm15sC+Y8JF8KYFIWzYW4i/5eHGEzvV35iEUL/Y/ohgAFQWaq0E+3s2cCYWEUsKYjaQfu55mU+Kqrf7dGvqXI49VsMl/lWiaj5pp43OjkNZ3237Zl6tCnygn5jpHRJWOerhD1u0lFruLLx8GKphhRkzTNKRkf/LpCRqDGkOpAlTvSG/HstXKrKQ0C+JgCdnPNqvASqyE1oZN8Wg7b6q8es1KHtTBoXXZqF7LD4NHpuXQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 60619da3-bee8-44d1-c441-08d9e3b9d2c0 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jan 2022 06:29:09.5189 (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: VI1PR03MB6239 Subject: [FFmpeg-devel] [PATCH 32/41] 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: yVeF6MN+SRpk 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 4c53451d8c..631582fd61 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? */ @@ -1284,7 +1285,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; @@ -1357,7 +1358,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 ed1416fca6..0e8e11743e 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -182,7 +182,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