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,