From patchwork Mon Jan 24 14:45:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 33762 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:e71a:0:0:0:0:0 with SMTP id b26csp387093ioh; Mon, 24 Jan 2022 06:48:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJxL8nxvU4CxuOHOdBJFpG/mzcjiAYCpgvkHygQjPiGsHgdrFsv17LcfARuqX1uM9I7H0ldY X-Received: by 2002:aa7:d4cd:: with SMTP id t13mr16256222edr.248.1643035713494; Mon, 24 Jan 2022 06:48:33 -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 sh10si9412742ejc.725.2022.01.24.06.48.32; Mon, 24 Jan 2022 06:48:33 -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=DRgXy78d; 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 6A71068B0D5; Mon, 24 Jan 2022 16:47:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2061.outbound.protection.outlook.com [40.92.89.61]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 078FD68B0D5 for ; Mon, 24 Jan 2022 16:47:11 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WVoiYfFzZLu8fTdx6iZX1Oa/GQ++QKPtWVxqwG/GE+rvmRj0Kcp5bJFAxSxkiOYPFc2UMJf19yNJanJZzGtJ0QX+TWXthfviebE1jADgiHXMwx3bHdw/SOuSiletGzL+VQluQ1yrf8izNdxkmXcyR49lHyq0VYqwXh9hnqq3JUe46B8KFKiqJi80BCQ79+l/Paeoy0bxHZS+d/kAzVB+6dmiAR8ONY3GnGO0tA03kJ4bEgPeDlAoxi4fxrKgi7GcWu+eJu5Hj+MS9WuDJiRQqzE4sz7wwa2ynLPTrPxyLrdwinVxcyXpn+5celKfn4kIwYb6hce61NnHWLXexCmQkw== 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=aj5BQSXTuh6/qssOM/Y/ExBRhRF5YayX6mn9Meo2PF8=; b=SAyNm980xE2NxceQavtpIjmmzqC6/CfYZE1H0rbTkhCNXtFV7C9Fr6TcKxfYPJLD/qdANHcGuxRBFbBFjR8Yyv2O0fs6Epy+xPiNVXhGt07EVY5OmC6Qm4nYITLS/E588coQ/j/3OEhHFvAklQT+vn4kVU133p+P6QJMxTdeFDN9BcuNj1JGz0YZsYFW/d4hBzdEIPR8+3thcRRL5mSK2yGDvC0++fdUr5lOJhGXG5ztJWHCWLnx+mWc0xDW3MqMBJ/DYSGNCFjvxC1EMnA0tDk7aQHtbsSloL52TZK82OFVZQmTIVe5ozF7aq389VGXp6PnGHvFacO8kEaacQcRcw== 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=aj5BQSXTuh6/qssOM/Y/ExBRhRF5YayX6mn9Meo2PF8=; b=DRgXy78dWaqUj4LyP2AU8YajHOVVvtI3RzQvn/0y7FUjbEY76XActhU3QBqGNCVv260iZLgDBUpyeXFik7gv480d67s5sln6t5mwTEYMiiZafkv1V6PTUS9sI8XqjiO/G50WOw+UM6jq2v7XRQY7V3iX9/JqEXeIZ0SWDYXk5ZeI25HBiL9XZKRD+I6dgUEsqAwAJns8HNtbsF0gQ07bfJfb1Qnye6B03ph14AzgZFBhwQ0bx5vgAd8mYuJicLllbD6D/9yA6czRr9x+Mg0oHTycoOAfSAKCkYXSbP3zQZrGnWLnhf0hUAcsz+RAEzs5gff5TmoVRUBiJyxqTXZkOA== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by VI1PR03MB3088.eurprd03.prod.outlook.com (2603:10a6:802:2f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4909.17; Mon, 24 Jan 2022 14:47:10 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::ac56:2ff4:d304:ab22%4]) with mapi id 15.20.4909.017; Mon, 24 Jan 2022 14:47:10 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 24 Jan 2022 15:45:57 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [tue6K+rUhXAXXlUF4V63+uUk6HThNnzn] X-ClientProxiedBy: AM5PR0201CA0016.eurprd02.prod.outlook.com (2603:10a6:203:3d::26) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20220124144616.559446-12-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1dab4303-9295-4c71-f0c9-08d9df4866ac X-MS-TrafficTypeDiagnostic: VI1PR03MB3088:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: gRCg0I/xUz1uG14yIXLWJYDqVfEizWUsWYEd/bI1+Kz9Emi/0vowRvdM/hzkegmOreX+KqHWpC7nkCv1Ar1/6LtaJA9Y6kymKpSlnfJ0mRZ+z7ElpKSNzGlYIKwcBarNG3vE2jgETtTBQzEPnkEH4vgOZ25HpoiZsUbaWI6bDkwkW1g0ml0wkC2tHvv+gGEWa1onCOT5IYVCgpSgH6x83jcMb8TspdfkeqjxakY0wWi6Bu5Tfkk0/ZQVhmuC2D9Bqfmx0F1WjLSpZZSpZg1C3KWyfvNqozcQQg1xXxqVxXr+lLuRS1+mAPKzAhTuD1TRM4NrbGk19XoN2REIPW5bWrvIVgkQTnA/Sg4PXkD5VL7idqK8w0617QPY9nKfK2dOsAFqUUGO2AvmBnpZCnfA5PktArIYdUsVy5xrwjwcSIIEHsbsi1N4KNg+m/Lfhmg+GJoJ2f9K9ZZrWgKPC9+0bm+sAnRt/+6goTH1gwmRGBJZyuBqa7dQXbTPZpubp+OaMpm+8gCIrKgsxVy4KcOlv/0AviWh7FnCSS7qZ9ybqLdRbduD+iIYd8pFIg0YrMpDGs7Mrw9pUuZh9bW957WewA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: BIvA7PLLKPOTS9oSZKg1Eo7GEJfInTSiUyHrYKs9z5VJc3DuytCX5YGgQ9AfjpEW2XS/VehwdX90+wWLkhNiPvVi7z1jj5yIKyldYkknVsDf3vWcovkZU6jdJ5p/EoV1ZeUFjcoMnpdGDhIsIRd51PYZcGP7wwQonLGVfRLm93nwrSdhkWesBhF8gr6nUSHRhsEUH5keVRd6sebouNlTkh5QbudNhOHteFeTA1NbXXGO8Ow+omAfWMdK5FyiWpJ7/GcTs2MG10HpTToT8hryzjUUFe+1mVvhr1o/UWur7XJ1DsaWcfMNZSJlzSwnKlDjO9E8TO609MDixi8qULOKMZizUmxHrnzB0e9iTrkRg3iOmQ4Hm0UJGHeVjTWyRYCyg5Xjk80AwZrorfjDvrXeIS34TfCaj06gThaEp81MMGtfKxtjzZFnpJUne02TwPljnTxbFYlGvtUrESv7zHlYWjiwL56NnH1snbOc1BFnKhXd3/tpitSesJGKBKKyb/KATeCQqnxzUUiX2p3F7iKwM2EUdJ4St35WZE3BcUzkd330JXEs1ZSs6g5UoFMnkOvZtlh27MvROR06+UPaCh9PMCka0k8cP3jla5u+md/gxYxruGRu1YBF6TsvFBd4nhj8LtGL9WJ0kRFNUCSLkM9RGXa5oO5EqfARroym0OUBdYSeyK+C9cF7h9toIqqozFwQbKqUfJgiI8ADowZGM1iUiHQu508jq9UIR4mEVvklf3favfg8VmvZPUBz7/F4lNxPL0wx7W17GHSqCVL0j4kw6aJy6nmf5TjjphQbImDPLoTn1zYLPY3RAvyd5OXAATdW8gXLSBFyxRDr7OGmhxoB7kO9urXGs6qhQtWgKk+uNIS+CdsaICWjMHDUBONeNgJE29ieA+YEHv7XDEyDheLKu2qYjQ6jMwib+S05JlrWIxScDW4Qz0Uk0vuxeU70nKdGFJEzjmHd4LZuTjZFqGKSjw== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1dab4303-9295-4c71-f0c9-08d9df4866ac X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jan 2022 14:47:10.5085 (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: VI1PR03MB3088 Subject: [FFmpeg-devel] [PATCH v2 12/31] lavc/libvpxenc: remove unneeded context variable 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: Anton Khirnov Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: eCPNFI+MzNS0 From: Anton Khirnov discard_hdr10_plus is 0 IFF hdr10_plus_fifo is non-NULL, so we can test for the latter and avoid an extra variable. --- libavcodec/libvpxenc.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index ab5d31e4c4..8f94ba15dc 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -127,7 +127,6 @@ typedef struct VPxEncoderContext { int tune_content; int corpus_complexity; int tpl_model; - int discard_hdr10_plus; AVFifo *hdr10_plus_fifo; /** * If the driver does not support ROI then warn the first time we @@ -896,7 +895,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, #endif AVDictionaryEntry* en = NULL; - ctx->discard_hdr10_plus = 1; av_log(avctx, AV_LOG_INFO, "%s\n", vpx_codec_version_str()); av_log(avctx, AV_LOG_VERBOSE, "%s\n", vpx_codec_build_config()); @@ -916,7 +914,6 @@ static av_cold int vpx_init(AVCodecContext *avctx, // Keep HDR10+ if it has bit depth higher than 8 and // it has PQ trc (SMPTE2084). if (enccfg.g_bit_depth > 8 && avctx->color_trc == AVCOL_TRC_SMPTE2084) { - ctx->discard_hdr10_plus = 0; ctx->hdr10_plus_fifo = av_fifo_alloc2(1, sizeof(FrameHDR10Plus), AV_FIFO_FLAG_AUTO_GROW); if (!ctx->hdr10_plus_fifo) @@ -1286,7 +1283,7 @@ static int storeframe(AVCodecContext *avctx, struct FrameListData *cx_frame, } if (cx_frame->frame_number != -1) { VPxContext *ctx = avctx->priv_data; - if (!ctx->discard_hdr10_plus) { + if (ctx->hdr10_plus_fifo) { int err = copy_hdr10_plus_to_pkt(ctx->hdr10_plus_fifo, pkt); if (err < 0) return err; @@ -1701,7 +1698,7 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, } } - if (!ctx->discard_hdr10_plus) { + if (ctx->hdr10_plus_fifo) { AVFrameSideData *hdr10_plus_metadata; // Add HDR10+ metadata to queue. hdr10_plus_metadata = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS);