From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 9187B499F8 for ; Wed, 27 Mar 2024 01:36:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9AE868D6B5; Wed, 27 Mar 2024 03:36:46 +0200 (EET) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-he1eur04olkn2081.outbound.protection.outlook.com [40.92.73.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7A80C68D668 for ; Wed, 27 Mar 2024 03:36:40 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nbLGXe3Kc+QqLuHacXQ7geiXHNI8VfMwye6jkaE/s9ZmCmzqP3C9kWrDeWV7SeEM8a5/C7liYAIua1EO9S5zn0w1Wwyj0zreqWETuLLEvjLsFhatFYeEUY+S/oak89rXcyMASSPVTyjA0MqbjgTOZZAJhI6RPIg7C02fRPA4Q6ikJzs8e2l1Or1URwFj5lBBlGah7WUpyjY1tpighDpAB/Qfn9F5Em2/SNJDSYdE2r2Ara5WG7jhgGoC9XI3rfbd4QJjeA4OmjDem/3Ix7xlcUqMrozs8T/LKLHun3+bS+mdKoeNCS50zKjRdojQLRKjAKrgvzEd/ump3OsgOiRcew== 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=GgryiXim0AF92e1JDQW+geNvJiTzJ11xGkWiPxjj+kk=; b=AY4VAjN7JMNB9bODExdYQF/37UxP8lBBenXVfHVsacIZuuXQ4QO/DfR9wpM413tOQ3o0u4XaPpugNlJZQhz0p0qbewWIUTJIb+HgRy7HjiOUnjsqksno9eyPb1BhZ48vmh9Dy2qiiIiSuT/dBF0tqZlI3oAwhC18EnWaUpEo7iwO0K9IBTAMf3QWGKA6yBMdi+HqZCJXDsNY3q9KPTxLOy8sq4zmi0cqNwKWE+OK0hXCiviByGj53heKazYSHZv+Z77WurHIApkUxckjTq258SQr6ZN5N4pDGIMtggbL3fBKuP6zTCDIe6r63ItXOzjTOSDAzDwKlbEHEmrf702OzA== 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=GgryiXim0AF92e1JDQW+geNvJiTzJ11xGkWiPxjj+kk=; b=L3JBh183gNlfRrCxOTFiyONexNb0WQ1+te330rUMPodc2WwM/iiRF2f6nu6FunqxijToTY5JIJC2YAfFzjcLenPZhZUa/PrG1FiaA8NDQuhUssLqCXSrrfYYmojgmUaX66iUzGZ2AR2o+t0pcwYYrhoJRfbTSidLF8gyZxnHRVcNi7WEGrZfQW5GMUYv212RNfhmbCNXZziAb5DYUpiouC0A02xityJZFdoMF/KFoeqk47x+yMMjGAaiWKl1GzACW5+MlY5dJWe0O8sIL1M8285KX9QHmYa84uoC9nZSlfzqWviMII1FdPk0d4qLvdJ0+7SacONZqP4Yb46E04uyFA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0344.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:32b::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.31; Wed, 27 Mar 2024 01:36:38 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.028; Wed, 27 Mar 2024 01:36:38 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Mar 2024 02:36:23 +0100 Message-ID: X-Mailer: git-send-email 2.40.1 X-TMN: [SJJENBarhj+Otx/xdEuLuRtL/r4zQVslaLWT+lIYZYc=] X-ClientProxiedBy: ZR0P278CA0012.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <20240327013628.265152-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0344:EE_ X-MS-Office365-Filtering-Correlation-Id: b77a61ba-eea3-43ea-b3ef-08dc4dfe58ba X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9KjWGH2SvjoSMR5Ae/EAi7nB3DR7adpEv7mzhqsn3ydK7uPTqoCI2aDzCKo+1JcEcuE5u5PHcgWcq5rMihxd6TrnAYmfMc4o/PrHy5qpeseujsfFdbNB1OpUNxvqD/7bXHN7Q9cjLmt6W4gFh2cKCKsQbil/ujRpcPjmMwmLVCk8uDM9xcK+Pj0UkOo8yAa81nOaN2P4WshX4AAl6NY1d3N/ESPiKbljIkwl2NzeXEk9x845dgxIMj84PLB1F7QcohVJ0uyhFq5z0NY3RSLUSTuvw+SLrKXcaAveErW2qs+pAOHNf9bxcQJsujG7ta2V/8DJZCSi6Idj9yP4R8OxXMYEXHoZ2zEVgT3bAWAIMdpO2LHEEIHiPmx2hgZ9NkWXyOR4JNSIPbLg3akI0xK54vpDIvTbYC1OdMlAkeC4zGt4GhBLKBP1YF6ZF/QEo5uG2OMfa4MjKL4yjIMkgYIQu+hJQnbT1x3NL20WjJXRCdfalvfs8Ad7U+j1CrmKhIRf5ZFccRsGv04MyD/hezKTvrxkGzTdrZ2WuUM26Aytra8X1TOxyk/ZH1s6kdU3AyuZ/hrJOPlVDykTOX/mmsVjV0HHsdg+1njM3LLV3WB37NviNyclzY5B6Qjn1rkvaOFJ X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Z8/A/HxQlWDo/qX4G4sIvx44y3/3J5Hbo2ID5YoRvf/4xhg5JqOCc4oCttCU?= =?us-ascii?Q?Eetp21kJxm6yK+CFS3GXQqjJSLvHe7bPP8ug640F4x+Gee3YSXs1miTgz7/f?= =?us-ascii?Q?Aqaq5nxraYv8/16Fj/wFr8QmWOlxN2xYdmZWOJ3Waa0+IJgY1qUzvM7/kUQr?= =?us-ascii?Q?E/MPvb0K+rP9UtN1taMIo2U/IFJRCEx65/PRt53vLNrMm2x+mWCbNp+w/WwO?= =?us-ascii?Q?UrPIbh6pjNL9MGfvj5w8MmYkStryivCn7a+kvZCuGYueYTBoCmXt4YmbSvzT?= =?us-ascii?Q?2qQ0e5J5eovye4g7jaR/8NHCG9PJpMDcDXzZk+tKSP8/e28WIffAhbpBoHmf?= =?us-ascii?Q?0cScbe8VpUvxigdJWgHzu4UjeVl7g/vcU0uIrXgiBj1bGJefaFcg6CrH0Dsi?= =?us-ascii?Q?PJldHe2Z5S35i0yemE6ZQyIUX7HjzJy/2J0OfscWx8z/T3Zjn1ml6yShBKXt?= =?us-ascii?Q?1wCWR46jT4thxbdUysKH1cRP7ZOfTNShM3WMcWpnR22kSSQFFtGFGaYmxMDP?= =?us-ascii?Q?gKfE39Uy/LUi4V5JrFQxNKlOmwtRaKM5dttmRoMo8L+24ctSDrUdpBAyQImu?= =?us-ascii?Q?f3iJ4Qav3in/DN+Kx+yCg4JYb588hVshFj6vWCELMvhzy8FndFzJlWvcwlpS?= =?us-ascii?Q?4ngPZwkC3E7m74kRy8Wh8eGCEiTbK8DEFjljpJKh0tvJvLAc/X2cBZSHJgZi?= =?us-ascii?Q?YCiVMULm1q7/EG3SzPHPSs2DTI85Z1d6gKKEcdGi+qEnNGcLlt8+fjLTCXbL?= =?us-ascii?Q?Z5cjPT5hWDSLzh/G3TnSEjA5URPN4m0d268kkgI96aK7h13I11V8bMjwin7r?= =?us-ascii?Q?O8MOZFwMDz3rzPJu5fF9L7VskR4arAOuscSyb+CgDFWf5DcOkuC+yP4QELNf?= =?us-ascii?Q?+olgktyfNSaaetouOzN9f6zed7htWni0BV0AmKvONDmctGY1/rHOzbM/H47u?= =?us-ascii?Q?x2l/rLiIiT/CQ8K3ENQi/fsTUEQLgqHZYG0B7k0tTkaT3/KCcbFdtH005Imx?= =?us-ascii?Q?rv0me0bCG0gDsWf+2OXuAf032hmI0o5xBEl0gUlg8UAY5tuD/2cmsYWVx/LJ?= =?us-ascii?Q?py4OPRWUgr+ncWM3/SYNlgMALIhfcITLsYJyw/C+zaOXayuaPOf5u2TrnY3F?= =?us-ascii?Q?wOt0QWqn2FaPHCacJvPOt9y5F8uPmI3kBlzt6aUWLURaDjsYr3oH/AE2BW6/?= =?us-ascii?Q?KPB81UrbiviO5pij7ifn9Px5rxWaErcFrItjq6+OA2R9Z3SLbQ3ITt7bzjfb?= =?us-ascii?Q?tvSgN4akNQnby67ahe9MHjICQlQxBJCkPXdMOkyUHQ=3D=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b77a61ba-eea3-43ea-b3ef-08dc4dfe58ba X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 01:36:38.7211 (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: AM8P250MB0344 Subject: [FFmpeg-devel] [PATCH 1/6] avcodec/libvpxenc: Only search for side data when intending to use it 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Also rewrite the code so that a variable that is only used depending upon CONFIG_LIBVPX_VP9_ENCODER is not declared outside of the #if block. (The variable was declared with av_uninit, but it should have been av_unused, as the former does not work for all compilers.) Signed-off-by: Andreas Rheinhardt --- libavcodec/libvpxenc.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 4b89e47e83..ee903a4e5c 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -357,19 +357,20 @@ static int frame_data_submit(AVCodecContext *avctx, AVFifo *fifo, const struct vpx_codec_enc_cfg *enccfg = ctx->encoder.config.enc; FrameData fd = { .pts = frame->pts }; - - AVFrameSideData *av_uninit(sd); int ret; #if CONFIG_LIBVPX_VP9_ENCODER - // Keep HDR10+ if it has bit depth higher than 8 and - // it has PQ trc (SMPTE2084). - sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); - if (avctx->codec_id == AV_CODEC_ID_VP9 && sd && + if (avctx->codec_id == AV_CODEC_ID_VP9 && + // Keep HDR10+ if it has bit depth higher than 8 and + // it has PQ trc (SMPTE2084). enccfg->g_bit_depth > 8 && avctx->color_trc == AVCOL_TRC_SMPTE2084) { - fd.hdr10_plus = av_buffer_ref(sd->buf); - if (!fd.hdr10_plus) - return AVERROR(ENOMEM); + const AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_DYNAMIC_HDR_PLUS); + + if (sd) { + fd.hdr10_plus = av_buffer_ref(sd->buf); + if (!fd.hdr10_plus) + return AVERROR(ENOMEM); + } } #endif -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".