From patchwork Tue Nov 30 18:29:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31851 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8045013iob; Tue, 30 Nov 2021 10:29:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJxXhAfodekp481LMgXXcZDhYlHHnWLZwFFcdh/EYgo8U0N48LyPz/CsUHqI731nzohiLR57 X-Received: by 2002:a05:6402:1e90:: with SMTP id f16mr936586edf.91.1638296988197; Tue, 30 Nov 2021 10:29:48 -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 hr6si4505603ejc.547.2021.11.30.10.29.47; Tue, 30 Nov 2021 10:29:48 -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=kugqww0x; 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 682F368ACE7; Tue, 30 Nov 2021 20:29:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-HE1-obe.outbound.protection.outlook.com (mail-oln040092065038.outbound.protection.outlook.com [40.92.65.38]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1932B68A2D2 for ; Tue, 30 Nov 2021 20:29:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DLqSFkWOWxLGcvfRLS8l1RmywmTluJLj+rsI3t+RilOlq7cewgYacV0mNEnJekwsbs3jC03mIxQ9oQRZ+/IxbUosoawT6aFh5DBCCSuid20oiL7ZmLI6bfU4fqC0rmRKxSd8NHz8otc0wSZxIfxBY+1KbeRhFUTcbrjPU+gizCAOMbLVFHlcX3N57rVDjWEbQpbJwYRspQEkL3VtyG5T1SNAjkhdSG0foOEAPg/yWjMKHUiaDny4KenWqTJmLcOaicSsSX5fG3x8eWaJCDZqneLqE4UQyFM/4zUJLXNm03kci9EvctUWeeUAeA1Z39g7nYw+6n6ubNcLMkRW9zZFZw== 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=VTUHXbC/JpmmxHMa5OmDmxuJVUDTbY8ywTx5+NkH9Ww=; b=CZb1VRdOgLHv1lZ4q2Ke76ShQl5AsfPb7/HazeB7gETnmbq4QAFjdaWNv9+ukqxQfScBZPMrZbBBuuLuSuPtaYW6t9l11JrkG8tD9UuhTvLpGLJQ8yFOK9twpJbo2DJeN0syGZkM/ZGB7+E6xybG2W6UDL5B7cex2eG/XrRnL54nbnloqzfMkbtP2Ei53KtvKv0oZkSojIVGcVV2qB2mfyZ1RUnV5OHfvoEMkero80LcJhMCIVciJ2bEKwP5hdIrJzzLNqaliWHZ2xw2uXbjEqoJAa1/PocqITHPYmlteWlI52tERynLUMLymCLJp6RJbIYfj3oyeaE6xZqJjkiWpA== 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=VTUHXbC/JpmmxHMa5OmDmxuJVUDTbY8ywTx5+NkH9Ww=; b=kugqww0xB8ARvEjXIB0Jxae3dD791JLQ3uYFReAsr0fV9Z0YI8gEUYGC/YSq9NpKuruz/mrhcYHXsMBDWIubcRw+tz/Mz2VKJVHWlyCJCvskL7sZYOad/KfCzGwTa5h2mV1Y9s7Bn9ml0ERXBYnXWg7R5z6TXf3u+aOLInzeL0LHNAEtcrCIVeTQe20pIxomHpPZ4PyOi4boVMAze4bjvWEg9WTkdXhiz7tRuk2KvpGMKEptiHOe38n4l9AoN20PKJbzeS++CJyTonPfq3M5feFq8ehKHhoyZqF5vDNhjWv2L71hnB9SF+YjYbvSb9mnyQ2Hznuc5nicgF4e9Lu3pQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR0302MB3192.eurprd03.prod.outlook.com (2603:10a6:209:16::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Tue, 30 Nov 2021 18:29:26 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::700f:d70b:3bb8:4d51%9]) with mapi id 15.20.4734.024; Tue, 30 Nov 2021 18:29:26 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 19:29:18 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [qrh28NjV9RHhT268IG5/2wbFbACTz393] X-ClientProxiedBy: AM0PR05CA0090.eurprd05.prod.outlook.com (2603:10a6:208:136::30) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130182918.79840-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM0PR05CA0090.eurprd05.prod.outlook.com (2603:10a6:208:136::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4755.11 via Frontend Transport; Tue, 30 Nov 2021 18:29:26 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a820721-215b-4038-d1ee-08d9b42f56d7 X-MS-Exchange-SLBlob-MailProps: gjx25WM8ZNUVf4505pHrBAkbMiSRoE6wwYVW3+KjOcM1f3wSo5KFSnDJzr/YieMgomwvObiMJV8RdYQUG0YCd6jYTw10s524GoysNfv6PKgAoi9wN8SV/4A1SgSZUxeBH7DLyLpFZm+sQ6xt6GZhlRxQwWnR/mnlMh83nNe19OqqvAwCxVmMJFBbRtqGK1P4ki8NoLTwJlt0COThBwjNcDJJSwM5XF0LZUWzxLSoYOVAfK4tPncFTsTIbysPRFRTDEdVgFo/VIgqo9DjOqWUIEZvPoEGdCx0PBHddXiATgYjj13aJSxtnSJtZvWERXYXsP68CpsXrHlahrAp7Byng8vqW98x5sjrJIf58rEeCm0ocQmOKZaGorddJPrFmtSBfnmPeJJTnaiL2aqJ1sKUla95wiY9QVaeskAeBsuGocWg9FKt1ibHHNry1EygDxnxWHh+4AQno9qa2v451DGbxd30yh13qaL5d+Sy/79aSdvZOG1Byej/pHVH03SbyCbz247iyMD6AKtKxGBoLauxneemSR+kNOcBapHO5s4FPO97+jj3psuTkPgIkN0U4wG6R2Qr4mdIdobmkxfH74M9tzx8LBlvI2GZYP7rSD2M8RUBQ8YVCydH85oCaOv3C/KVHBM/FMmU2qd7nR3MJjCxFRQ01kqnqCgivR3DneI+uc0ZrcIqQFTwzvyXjEAa9Ifux97ScG93ZJm4DVe5SJmjhWWFsVDpjaG7EtX3WRuRIuU= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3192: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SIQYki9syHTuG87G6YDOjq5YYgk9sflyC9d9jW9PuODtw5gPhUHBdbHBfftqzEg1rBtfCdQ1Vr6EHsOz7SbBomd+g+Y6CA9K0/DweifXQKrLVRT1VkMVVKSgfmvx/py8xMfjbErvYREbR/sJOikqxHpwdBADiBt1P+/nl/AJBuMlxgKRYhiS0cUnaCJK9ipkUA0q+w97Ua4SQVwM2d9/1m5Rh88kMz7L+5OoETG7WAGurVxcrx3BmcgktEbDU8NPEauIbQpH1WjwSMtzyQG0L8zTydtbi3qIlBrqYF7wDltTzzTRdfo0E92Q2f9xiVZhiZNx9DwDBqVaGB5Qg9dLf1srqX4Fi1GyWOGivukVa/WdZ8EK/2l6BoPlgVGqZLqNRTeNVM7V4q7mCwKQcMi0B5INHQtL4xzwXsV9HtMBySvDFC70LhtUCV1AwIQmBKIr18HMMS7IoGTr+ylhChvuzH8A1kHFlMq61jO8gpejtITjVn0nyX+E80AzkfKoie+q/ZCsY+CfvTu0U6B2bv2KMKRpULH5nCWJM62DZ12QkCclLC28fRUQ96WhknJAXxOiaDD+DH1ZJRLFR7b0CsbDqg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8fr8o1fyoISKyF0wXz35aUTKWw7GxB8X16Aakitvo5nYG3MnO0gQOJWotDmXQCZTNK4wFYH/8jkNC7/5imDd2A0/XjS2rnpWaZVTuH4JKJve1ieMLIa4hZSnJqyKVlRk6H3XrvYkk1RnWAJTRRbiUmBr2BA/oAmFeouFfdlU3R0v3rrf9TIPBwo5+5Ij9lgrha0WSlzPbuBG2GzID/aYwtMth7w1MerE6kVysEOIp0o30DkbyYRKxrZSXq2T9FnyCkgesuxrGxp9rh4zzUaUNb65ZlaULWplC2Qbz0LVhQrhTb0rQfglvLK7zHAmY0YZjxx8lHv1gW6pjUWGCfJ3QBKlnWNB+zpp6YbU0b8Y83CXV81X+AvG2multK/kOC3rvU5lstvmf9Gt1U8y9eWN9TLLsQ7/0ivpY1zHGTqqY41ngNzg3F3gOWBobO0XtH4c8SaGYO22pq77l5VYXr5CnNP4GTnRJRBJpeSEAxkZ8CSwC3T7S+x7C7Q0bj+65aIY+5CIOZLzAfQvBwOdZ1w1DjrC08UGCsI00Rbuv59aBhUXLFlWVrS7LrQCzmrzxdec1iHCLGE1SXtoiN3u5fR/zRhJHJcML4wR4tZTOt8ClY6QCwu/ekcgGopHtQnA1ksUYxvwbjmSb6IrhQH/DOYy6aT5u4LLI/DHB2mk2+UedbocHQRqVGqL8fwtX+4+jLDDAjsqnhCru9rwSW/nEEav248x60YpYA16MSfBPSZy0nLapj6PEp1CQP/Td+s0qxJq1NgJWLYEPoosRhIIjmADZw+5rnTUYFY5k5fZ0OiCT/sqdvCEnFsh1vedtR59q/+DKxy5sE6gKbTXM+40Emj6qN8h+07Fs+uGaTLZSqzv9+q69MTUxqBzBUm9+NMDknG1Fry9icqwkzy5OhrMXbDHpROPlIdX/V2NpaBeM2QxU+pODBOCUlexvqLn3lexPM7ovAwRCrZpk+T2lQO9GqPPRg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8a820721-215b-4038-d1ee-08d9b42f56d7 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2021 18:29:26.5621 (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: AM6PR0302MB3192 Subject: [FFmpeg-devel] [PATCH 3/3] avcodec/h264_redundant_pps_bsf: Inline constant 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: c2q8M2g4Lbhj Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_redundant_pps_bsf.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 5efcf5ea5d..769946abfd 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -27,11 +27,10 @@ #include "cbs_h264.h" #include "h264.h" +#define NEW_GLOBAL_PIC_INIT_QP 26 typedef struct H264RedundantPPSContext { CBSBSFContext common; - - int global_pic_init_qp; } H264RedundantPPSContext; @@ -50,7 +49,7 @@ static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx, pps = unit->content; // Overwrite pic_init_qp with the global value. - pps->pic_init_qp_minus26 = ctx->global_pic_init_qp - 26; + pps->pic_init_qp_minus26 = NEW_GLOBAL_PIC_INIT_QP - 26; // Some PPSs have this set, so it must be set in all of them. // (Slices which do not use such a PPS on input will still have @@ -69,7 +68,7 @@ static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx, // We modified the PPS's qp value, now offset this by applying // the negative offset to the slices. slice->slice_qp_delta += pps->pic_init_qp_minus26 - - (ctx->global_pic_init_qp - 26); + - (NEW_GLOBAL_PIC_INIT_QP - 26); return 0; } @@ -119,10 +118,6 @@ static const CBSBSFType h264_redundant_pps_type = { static int h264_redundant_pps_init(AVBSFContext *bsf) { - H264RedundantPPSContext *ctx = bsf->priv_data; - - ctx->global_pic_init_qp = 26; - return ff_cbs_bsf_generic_init(bsf, &h264_redundant_pps_type); }