From patchwork Tue Nov 30 18:21:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31849 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8034810iob; Tue, 30 Nov 2021 10:22:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJxIztpDaY+ES9oa5hQZF4opS54qpyuwunBXk5H0FJ9G7ITbP3tqcIMr4CJerewmOcbkVEId X-Received: by 2002:a05:6402:5158:: with SMTP id n24mr954088edd.230.1638296540200; Tue, 30 Nov 2021 10:22:20 -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 gl1si37743968ejc.433.2021.11.30.10.22.19; Tue, 30 Nov 2021 10:22:20 -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=YFAPmTzq; 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 6376C68AA67; Tue, 30 Nov 2021 20:22:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-oln040092073079.outbound.protection.outlook.com [40.92.73.79]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0432968A0C5 for ; Tue, 30 Nov 2021 20:22:08 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KAnYbJI5u/qNP6ZfkbE4AlNQ8Ymhz0fz8MomPATf/jT0R0g/6r8mceEedJfBsUTJRLcqH4etzfr9xSVBSBq6kgtG16RsgFv6DXxJlp/t0GAZli0yk1GXLrBiIW0jDMmZaVDq5kXmEot8DtxvCZnQXXTRcW+wvzgpQxESQK6tmO5xRqBvPUqit2OurXYHJ2b1gVBU47Mqxr5vY52QKwbr+MG24hCDpd8XdU8s5OZcR104KddfsCdiLb4FRh/7fMSbDCVBHCB9mmhr5Jsw4Z30b2Dh7UjUde9HMaMmMsRvPnBy2cP+MZCk2DAlHaNph/Ha1s0wluGonoAHTURSYYEALA== 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=cLdiBCptjWnZLxBnwGXBg/h27liGUDNG5P4jhjfGF8g=; b=A6s8bYtpwwGYKK+ASOTFrrkONh++dcLVf8JQVCiuDhOunArKh8wXwafIHqVuyMohp56nwXQRT2/wPY53HpJE2xcBkCfn+gGRvAjV4McY7cOGf0lgEmaIKfmDmeb91NFYNXm5r0htIAP/mihNAT9Zz9TLh8bGXnDB5Gh9UBg8UvQ1/poVHuULDIVuw4gC1B7nIrnJlphbTq8Hq7CDbXx7Ks1UeopjwaYKvf+KLwXxMMY9qQ/EU8WwmzyjrHeJsdeM0UlhjBcP43jZd4y4Z3iinezw9N4F4AdscHcZnZHbw3VGzSJVMMYq1jIX+JDrHOk9EChisjrgrWmQrKIwyPdDTw== 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=cLdiBCptjWnZLxBnwGXBg/h27liGUDNG5P4jhjfGF8g=; b=YFAPmTzqZ7KaBBjot6bz+StGph54VcbMih3+Vj0vcbg2yZH+VC0u+pVvIGGpG6G4bGe5/H6sKuDU/fwS97vjtwLRl9xJXx3bGhF7d09ocCYz7TTKJk0zCTColgtw1uzBR6p/iBj864oHOu9re7IeIsLwFMPUITj2l2dgcGBmq38u6kpQtx2T+vXE3K28792BM0Rw8dKZlEZkrAdpPjB0q2IiwuKZTRYD+2eQzEOh+SiS+3sn9+HXcW5mCYVg4gZHCbny+OtSeRIeiBtm716RdEP28RYePs97E0UovMYf33UB1yoaGe9VcLzVXhnXpomvVw5xDTV8ZA3Uii2/08Z2pQ== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4887.eurprd03.prod.outlook.com (2603:10a6:20b:88::22) 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:22:07 +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:22:07 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 19:21:56 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 X-TMN: [vuXgIFOfiX9S+x0Wa32fchuA3KGo/3IS] X-ClientProxiedBy: AM6P191CA0026.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::39) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211130182159.79703-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM6P191CA0026.EURP191.PROD.OUTLOOK.COM (2603:10a6:209:8b::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20 via Frontend Transport; Tue, 30 Nov 2021 18:22:06 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 608f9111-b14c-4cd3-be44-08d9b42e50a9 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ7g5p8v69jsFHjfPXus47gsevjlW9ZLHCwrRR8oRvN+zYOILJmpMK04+6K9Pi5H9ndBnzqPiqvHHEedOMZBm+cyBAbaMpDggDDMU0cDbcvo8neFCnbvM32H7XQ6A2NEbLf4/39LHKJ9dk9NFuxdMnPoYUQut0FWyrVZRgBx5cmKteRKtBcSZrClXKXxpLC4ru+TIkwBh07fO8eNpJxzNQ+w59ZR0VnxkJltnEHa8PwrxeFsnw5iRhlvLp2uasahzkUdG0P6jvhNg6QyezhoAqJbJD47R37Qtef+vjytk2wPfEc4rPP+YJzTyUcw0WWaMKbASnhumn4eduoEo5nLoGdJWOHaWfDMlRbIHm8vLA5E3IETCSyMDVuo1q1Ci1JRrmhBc/wQQ7+Tw+8vByfTR6M2oOjLYFNPZKsGX7NC6uO+t/+b/5bCZoUyjxs0GoIgRP0cGNi1UKdpKXlGaMEF/7Cq4SM0VRD9hktwHBvQRIGWTepek+BkF8ARrIR0+Mf6PRbeWV8sT1iMGVfUTATM/kUhDAn+E/WXhG0zCkcWBIjv8pZN6vtR8sbq099hmqJnmQib2zwocq1BV2CxhUuDLDDfLdzqweJ0rbea4ZMwVy4KiDiyeFivIp3y/C7NNXkGDT9SpGubQbaL5LhfIWvqR8mQ9IH6oJIAV36L1Vn3bEuue/KXQ5n7aEU1qZToN3nyK4NGQHWO5UexW6YyGV1LRcLPipwKqlqgOS9Y1WIr5ZOJGbuuifb5LIGyG0L7hd+YUI= X-MS-TrafficTypeDiagnostic: AM6PR03MB4887: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xk8dXY/dUDddNJ9RdYxqx8d6VUsP1n8I3U09I5VK2KH+2aVM8DuziUH6noTQemoRTIWNiZWG907o0nkpo+iMi89wfJgB64t34P4JzsW2quQ0q9UeLRE2lFkTeEaKT4yu7369CkcDJggXxumAfpLbkyjS/mEOiKcZQx5sILmIicwSQiv/S/lFFpGtuU59XW16BsM+UKmeyT9IOaNJ3pn/B+mHIgzzSFmmGVEi+PwXRzE1WYb88R3h7LTOwcWBx1FoPpn9AOkTR8/wLLGYO48M90DCq6JzySq+XiX9n7y8mM3OgRJSp3HdV0cYQ6rZArTS1lj6Y9KqvRYbcuB9oEC5LiKEp8YlIimSO92Tob8d7oDMdu7c13/RV3Nv7vq0h7iV8MM5+O6j4GgSC9UlR73wLOd1hLB5FdJKbRQ4O7bB1NxLoUMRPDPlGT30y7vU+NMHfT1IwX8mmQlsUqmVCGxEW+64m5FbFt0ndJXqRDG3fuysT0Gebp4FLvc91DInVhr0+Lm2B8nfGZAWAmGtxEcul30ebFTXJ8EiebqufIidArN1n5RffwFire04rGy+enRdR14fxzAV/Mp8G8G6m27xyg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7WxoKD3druef6nQjOJ28its6XDUh8KJTW7YxKl5L952/7MKaJcgjSbopV5YqQ0Pna1XW2wUjprWFHUCUFd7mQJj78QJwiG2x7erFjnAh/aLPLgjBe/Eax4krwjF0T2NYd9wsXHQ4gZWzKZmTJgmnQwK8aQMjtwAyoJAXpHCFnTfPmILqVfzo0CKNShtXxyCnpm2kDJQZdVJTlLS1AGb09dcE3N8Xx40/rNAgqDFVGWeJRr96HClaW5PzyVpLcW3ow6ctFRa47F+hfX/TkeTn4vU6RwUqhoFiJf9X88wd4RvZW0WUkkJxEgn/01rRI5twhtf20QV4nKvCrMiIp7Utr0OpCHs8BNzMTuTspz1QBPeYL5Ooc+ujBczAtFW6JU0jlhCbaMc/K1cyFpLkVL2wQ6P/4/d2/VgqgIvL6ZKnz1OvaWMqOBpLFtzIhyGdhZtM/YY3BFiYTQjAxnSB2ju7rxGeRZNzZ4G31k2yLc4UELOsDJJ/wTyjU0YDJO0kFxuPp7LT7Gsl/o6fknRFMyqjE7TCrqlsiJQwTWahPgy/m8jag9Cg/S6DfeLYq0giREbOdAMekX+xxQj8cIoJpaavoXV8CVO3hqh2Ifvb2lsM/HN8PmeVDI+cXkxbHAmstkOKALB6vhG29ZgaHKuTLblu3l/pJpOFXv7US0D6zNTGJ3EPkpUNy3brs5xhw948irNqwKQXM7Dg/C7JO8azmpSt/WlgSZzBc2sN6o3KJ9f08A577scF+PTkygp3qTh7ec83qH19YCj70z/156qbwscgLCKgLR+6ja1qOam8z5fm39K+6IlJN5rMUrfZEjgjAzLnkPthMH6nz4csZ+T0hA078OpMDrSRtbgp8LlmHE7MtMmIf+MnHzIj5frFmVIxMQRoZ1FNklTqgfWkn0LIXxXJx0Q6hC7qDjmJcX5jzm9KcSz5t35rSnXszbtrvZ0Sdeial9TBtiyN736/cn5YQ+8Gww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 608f9111-b14c-4cd3-be44-08d9b42e50a9 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:22:07.0247 (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: AM6PR03MB4887 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/h264_redundant_pps_bsf: Remove flush callback 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: J7a5Qkia22qT extradata_pic_init_qp is unset since fa75e438756f159a667080dcba58ea2e3b190001 (and resetting current_pic_init_qp to the value it had in extradata never made much sense). Signed-off-by: Andreas Rheinhardt --- libavcodec/h264_redundant_pps_bsf.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index fb678beef3..4b2831fb04 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -33,7 +33,6 @@ typedef struct H264RedundantPPSContext { int global_pic_init_qp; int current_pic_init_qp; - int extradata_pic_init_qp; } H264RedundantPPSContext; @@ -111,12 +110,6 @@ static int h264_redundant_pps_update_fragment(AVBSFContext *bsf, return 0; } -static void h264_redundant_pps_flush(AVBSFContext *bsf) -{ - H264RedundantPPSContext *ctx = bsf->priv_data; - ctx->current_pic_init_qp = ctx->extradata_pic_init_qp; -} - static const CBSBSFType h264_redundant_pps_type = { .codec_id = AV_CODEC_ID_H264, .fragment_name = "access unit", @@ -141,7 +134,6 @@ const AVBitStreamFilter ff_h264_redundant_pps_bsf = { .name = "h264_redundant_pps", .priv_data_size = sizeof(H264RedundantPPSContext), .init = &h264_redundant_pps_init, - .flush = &h264_redundant_pps_flush, .close = &ff_cbs_bsf_generic_close, .filter = &ff_cbs_bsf_generic_filter, .codec_ids = h264_redundant_pps_codec_ids, From patchwork Tue Nov 30 18:29:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31850 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:d206:0:0:0:0:0 with SMTP id q6csp8044791iob; Tue, 30 Nov 2021 10:29:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJxaeGeGrOveYy5hMqDgZntcv5iqwcfxfiWnAagsHFK1Yp3MQZjW8bXaCIceLo5UMjEUufeo X-Received: by 2002:a50:ff10:: with SMTP id a16mr913205edu.275.1638296979246; Tue, 30 Nov 2021 10:29:39 -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 de8si24152858ejc.412.2021.11.30.10.29.38; Tue, 30 Nov 2021 10:29:39 -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="QWvfoL/+"; 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 1D86168AA67; Tue, 30 Nov 2021 20:29:36 +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 E44A9689738 for ; Tue, 30 Nov 2021 20:29:29 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DRb9M3OuLJ8+wb73/I9wVt4pR+XiKXMXZaN/Kp2LRFrba7Pb59RNrKJ4Paly3OvxUUbcMcvCY89tybSyApBJa6wKjnmR0Hlh/pMNrDNLbfydkhHM/bSq4nakuGan7Abi2z9PpYpnya5Sz1kDnwCNT7D6+rdKpZVfxlDeSjptsBXttLtt8lc0MMIjJGdVHvYE2VOtuOBXZ/sz3BwPgdt8dmMAlLFie0j4Vy4QmHbO+ORdHlKH8shhVDxrdD39TNO93Y5/MxffH4aHna1dyjruS4IqQMsO1QMPrGPgDW8gBbO2ZI97x+uJQMh7C/IfQCrL6gyeVfs2DNTc7AXrxrR0nw== 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=I64KaNechPjj3RXFEO2Ox3Ht9etNEtfw3NGnnBzHPcg=; b=EReA3alnmSrqiZhfHQN9rzEK50TtJ5x1eib1WGzOJgOhvx1MzYfihfJHXO52Hupn3ohn67f7mepHElg+s/DdV3Thz533fN7Crrv5FiDjYmR7Rv7Tnl2eGGZuAue22ZJhhXL62lE9jfBYlWvnMI+SrkDcy2myTK/z9Kg+8U75ZUgnCBary0KLx1SNjTNnnv7ugJ0qcf+PsUtn15OACezpOc8ml6H7uvrel7R4Jhau4bXOPetf1C/I+XJBo5CH4/3YKCtfTWyxZ/4fRhTnhfLDVtyGZhYG0Gqsw8wLZJL8qPbTW83O2porGfRd9/WScfAoLrvaSXiYRJRAcB8U3q2ytg== 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=I64KaNechPjj3RXFEO2Ox3Ht9etNEtfw3NGnnBzHPcg=; b=QWvfoL/+ODJqV8nfrVMvRI2TGRuscPKqSt+evSUhUWlTOIVD6SsuOOzVE8KeBwkSW2q0Dw6ovNr/93qGUDs5qHH+K92WLw0HvYw5lBnKz7irYpN2xQ5Vp8xnQ7iRW0tOiMeBWIcrfvZ6iK5QccZ1F7RqYRpN2c4tbaU6jTug8SR0HU++KEebxbx+UO7AlqGgRl4fIcBmRGuzADo6qZEB/aXnZ5NtIo0f2wA3N5DVVATHVH73hk7Gw5cRUaa3c4S7xJIhC3AIVaGIkX18Zv0/QnR2YNdjUdo4UdueGHj6OFRX/jCnEgfI/jSoEexs7hncnSaoRLjftWh14MuLjnG4iw== 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:25 +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:25 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 30 Nov 2021 19:29:17 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [GOCzntU1CAeuFp5DH8dIHn7Bn5BuwJUt] 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-1-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:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fa5f166d-5cc5-4ac0-535c-08d9b42f5636 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQ7g5p8v69jsFHjfPXus47gTsTcQ5FgnMxq11lozcJLW1Q8TnNOpyIhu+2AyN0UszhMq9mtSOtlr7gozAWai6lmlArAmTQFMOY/POjPr8yUobQAfTOeLOURfu1su71KI5+yGL7u4+MtvPKxyhQYF/qtnUx7z4czs2B30kCpZo8uBNPQjp+eFVG27gsP0a8vQOIEsRSItKdGtmu+tNW2wohVgA0Podaxz0G9YuaEUXkLekOOGnFCbelPCOXTF4Vz3fKc3kkB49mV+B90HVXR69Q9I7xWXvuchIp9PMBba5XwrFrQqxuwgNTMkOl9LzgQMaIAp9YRTGao0998UyV6Qg5CW86Om/82Xpj7TqaFbYthc4kSvmnYEEnyMFhR4a5BEgxHLgWY4dL/WwiwhCKVpLEEDaEuMeLtO+sPoTtA6kaMUJgA2xAM2n5E/wP54QxthNuXosnuVOhU9lVpUSptXJTRqYZuqNF1Rl0UO+9YdjDxi5voN0L+y+hpsttQ+2wk8FeHfUU3xnRGZp4wO8gQ6IEsCtutO6SxB3d/qemRVzn/+YD49VfFq+iB+9nIiOVzbK+Q2EjSGuAR+D4rgwvLjKs4BoAR7CDQuNR52UDMuz7cvXUsFcCpsJEF20O87I2vQUid5453N5CMjVOTt150iYW5jFJWIzak2qvyFiO8nQobvcT/+fcmlYnm5/f+YHAdQP5ISyBRAIA6FjjpBV2Ift61yd6TMV+5h6KStogBXsk/cDMdC5L3qMjRw+2JvsA0K10= X-MS-TrafficTypeDiagnostic: AM6PR0302MB3192: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4b79nkh5gQB3hxUVtp2Vz1FqhCmidDH+SjNr8IrWp6NaIe2y/cggYcwKpZFCgBBoSgKsPjHaszo6wfwWbOJEBzG5jAEn3wJ5fnJOIIDZQTKmGJAZTMOC3+hb2a1NiqBiSKxXGnJdzU9VUOhE2J+nyQbPm/bGB6DLHU28HvS7KEvj1dyWsEYbeseG9RJsWIPcu3gCZyVXot7yHGxe4JRS8n6KQDLjnZWv0EktzfRHI7pLGWN8h6bAEzJu3bQy7wWXhtIOL4zyOgHeZ09vfeFtxGQ0bulryZHxOyfMOuIXkxU0jggSAwT6MQLhRiPDASM7+dpHqbiNYBKGBCjcxUJAFKPAwOMwSNskPVIIsTBE5VGxclRbyuO7gxoGzro2pRnCGJHXi2BPmTePNSWDXDSut4tsIWYkghF5vieKKxTrB1xg0FLWmkfsTLTunQzp47oe/F6WPGAw8defqcLDJoTuj2RU+y7oDPMD5KacubydsQtekfpLqa8YanVpoCuX76Hx3RDdqavZoqRelIyaPVKtaEJna4EyHyx2F/gpNk7BH4g8c8j4/18+RC2BDN5YV1wk2/KpLlr2RWGtwsdz3te7Dw== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 7+586WlWuC8XGF0TYOcXaWWo3v6q9VQI3AMKONohShi+9hLauuMNhVt+6yQSDECQ/OyR/wvJzpE9TCBsU5Boy6xSrGtK9Y/rxxbYSQFar8eWmAmAaN/a2z6+gScU+yUJ8DjQ8eSrjYs0AUgFGNlHPHNy72w776Bf5/9IdTMGgFj2N62Hx47xILtPsRmzVzLEsCm9cI51KJB+iBEx2KAJUwq/J5bmy4/IM2yun75Ns89lE4xV8ATs1MhL3+I49GUagPRsTbsw/xFD7OB+s//C39IVIpcByF3Pr4YAQ3r1idQQFS84wx1muVUpQWp/Gz9DjSHtUoypp1ImIfwm5vic1Y+icIb9p/OSQJ7ZkKSJsYL5+p+gn4CZa8oPCDQ2lNLRAP8W24UT8iiYZUpr2AW+IrxhNHK4yMR2OZnIIWVrOf+mS+Mk59zBQrtO5du7ph10hZawVfxVIOh1Ym2hY86kxzev1ghZ8spB2t+NMeNjqhug8Ge6Aig0BLfN51KcfU0ocaWAA+HqTUFFCMmhVqiZxFWxPmURCjIkTML5RubYTndt4iK34oIatkINkqKzFfORv7w3h2bTErh2ixtbTu2bjFJEqi5ZkFr8PMLhjLQUyBzBJ00gXp/KhdGPzn9NF8Cl9Zp9uXjZLTPn6UWgZs5vzJ1TWqfgdUMRaDDulR9lVehcRQkwvugIg1uGnu6+eJI4aDyxVn8yet9eijjYihEfwiPB2SqCm3Bj/7AIdF5iQMJhkywsj4DKxRuhpCHhgTE6IDJmBWATtCMMjHpKLTKhxUXzYc0nqtBRjdc6G9BrOlsH3i5syPRZffzVrSZtlvE2GwaLUfxGfpPZgiRwac6LK+qiK43cNLblTKpvVa+fPOAo0q1yBlkgzu7ib8KMpMzF/Q+tH6bH3JnW3I1TZYyoICHNIUzuwk8giGG9jqiwVHusUYySan46XynV5nbFUBCBDrb7TFlv2oTVyyy+7SBThg== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fa5f166d-5cc5-4ac0-535c-08d9b42f5636 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:25.4799 (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 2/3] avcodec/h264_redundant_pps_bsf: Support multiple input PPS 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: Nre6P4jSo1jC Up until now, the h264_redundant_pps_bsf stored the initial value of pic_init_qp_minus26 of the most recently encountered PPS; it also modified the slices based upon to assumption that the most recent PPS is the PPS the slice belongs to. Yet this assumption is flawed, as there can be several PPS with different IDs that are visible at any given time. If these have different pic_init_qp_minus26 values, the output can be invalid. Fix this by directly using the pic_init_qp_minus26 value of the input PPS. Signed-off-by: Andreas Rheinhardt --- This BSF is of course still dangerous as long as it deletes certain PPS without checking whether it is really redundant. libavcodec/h264_redundant_pps_bsf.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 4b2831fb04..5efcf5ea5d 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -32,7 +32,6 @@ typedef struct H264RedundantPPSContext { CBSBSFContext common; int global_pic_init_qp; - int current_pic_init_qp; } H264RedundantPPSContext; @@ -50,9 +49,7 @@ static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx, return err; pps = unit->content; - // Record the current value of pic_init_qp in order to fix up - // following slices, then overwrite with the global value. - ctx->current_pic_init_qp = pps->pic_init_qp_minus26 + 26; + // Overwrite pic_init_qp with the global value. pps->pic_init_qp_minus26 = ctx->global_pic_init_qp - 26; // Some PPSs have this set, so it must be set in all of them. @@ -66,10 +63,13 @@ static int h264_redundant_pps_fixup_pps(H264RedundantPPSContext *ctx, static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx, H264RawSliceHeader *slice) { - int qp; + const CodedBitstreamH264Context *const in = ctx->common.input->priv_data; + const H264RawPPS *const pps = in->pps[slice->pic_parameter_set_id]; - qp = ctx->current_pic_init_qp + slice->slice_qp_delta; - slice->slice_qp_delta = qp - ctx->global_pic_init_qp; + // 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); return 0; } 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); }