From patchwork Sun Sep 10 12:31:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43675 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4e27:b0:149:dfde:5c0a with SMTP id gk39csp1565143pzb; Sun, 10 Sep 2023 05:30:14 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGP+7p/I9fxKHkbZwTdOqPBifPLvV0LmfoOOjLcfLJvNGXtqQ+1GWtaLqXMDvuauGG765AI X-Received: by 2002:a2e:968e:0:b0:2bc:e2fb:4c8b with SMTP id q14-20020a2e968e000000b002bce2fb4c8bmr5940972lji.38.1694349014493; Sun, 10 Sep 2023 05:30:14 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id qu15-20020a170907110f00b00992d6e88081si5067411ejb.956.2023.09.10.05.30.13; Sun, 10 Sep 2023 05:30:14 -0700 (PDT) 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="hWUksg+/"; 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 8FA2D68C8CE; Sun, 10 Sep 2023 15:30:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2035.outbound.protection.outlook.com [40.92.89.35]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 127C968C196 for ; Sun, 10 Sep 2023 15:30:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AlhonxQODNvPAPuN1RCXb8p8C+lEjffWHi6K4rnbXqUnENUV46p5cb4myi4LN2FSeUCzgCdbOtHrYpohK95n/7KJANkarUnz19YE3MRqkY+L0qFIs1q7F/JHe4+Up75o+6v2TPcmfTWfjIwx66nAnQoJv/sGggAttYMcquHrM7C4ln9h0pwRIjclV39PMhTcnJ0L9GB/k1P21Cl35yiaG7MA0iwTPCis7QLos3ChOkiwg3vEk8UJXHV9d+VxXmmwp5ahhzr3m7HWA7tUkhEMyrV4vuJwzgcEg7nHMfGa+64eqlLIXVZ6F8lSlvvSUfSaKgF32KiXwIg67Ivu1FIpVQ== 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=EmRAuW+g0nfE1uwkkyYmvYcSgHJQScWlEKExlEWSvnE=; b=CvTlF5ch2/+FghewM8ZtWqn/jy1kO75uiY0FfaS/2YDHBLDcrys+z0dSGSmUqUU63jN9gNnrvaPa0TAfvra4dFCDnZSttJrfzRA6r3rFllPyFcCjXOskKGxIO3Ze0zA341YQdsMOIbMH7y6sWMTlVduXTpuNcXB1pqRaHydSnkYu297MGz4j5BRHgXBmXiXBxWjlRRM/M9f0JCvnVO1YlMjYntbbYd11na0rViY9RKMOuq4zIdNsRumVD2expOR7quWQoVC2lq5M+9y+p2ct0GaVpzOgxMnnBZAR0uIc2h+mM/tNtlxoWSPsXFzihscE7PwLqe9ZhA6kaOQ0QrQafQ== 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=EmRAuW+g0nfE1uwkkyYmvYcSgHJQScWlEKExlEWSvnE=; b=hWUksg+/Et+k1bl7ZdW3PDTVkoDLzvXoAxoB2WYuJqwPy9jzCHbqIrj3XPtx+taVveWSIs8mE9hbxT4gWJhQqF1NaeE2VyqaFBunbDO/VTcaBUklBgzqp+98cvROUsxTcc9cYH72XHFscBDaJ7kfiSL6AuuRA/Jn7eLd1/5myOBmq9944xvU8hCislDWyxLKIyF0Syt/7/q9KIoBVxTX0La8iTPUWEBOzq0vjFoFLRMNAzIEYymiqk/B5fZZQDFdT9q3zlsD5V0hFXjvbSNQG0FcqJQT9Ldwc1rNTZ8sjJujoKyYJZwl2dgE0zcysp809AIuuyyTy+mdX1FWRVSaQw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0002.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6768.34; Sun, 10 Sep 2023 12:30:02 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6768.029; Sun, 10 Sep 2023 12:30:01 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Sep 2023 14:31:11 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [UGYGdwKwAyw5WPyvTtZpY5g1OehuhPEN] X-ClientProxiedBy: FR0P281CA0117.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a8::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230910123113.2862655-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0002:EE_ X-MS-Office365-Filtering-Correlation-Id: 6acd8fdd-91b6-4830-e806-08dbb1f9a76e X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8aW8iOjrl6p1fKZuJ6qdEUz8JGZOkrWTxLLqEwxfQnZ3MkCGBPUzYi+oQDORAZXwoj/CYM5pM5v3d8gw7JvDIUk8CtzPTwAxampIMchJ6/GlH0X/uGR7WfTpQplrAvA0nIpiye8oQxmPr81zU4b50/TiulLV/x9bn1VtfiISRi6CFwleJca1ZFHwiCFkHna3CeCLEGMSs+0+2VsNE0ncW1dXgYwKeQIA9AVZMdDm1zooFypww2dth5OT+Vt/fc45P1/w47YHgIM1NdHJkXefA+BWLMcM43Q2/2Sru734fTpAqe/CuFsOkus/SIuQkrQ4j0v3qYG96i4j1xJfE5Gb34XUtWctIuhIe+jZdIUC0CI0tBYq9XxqGh3LJ9Nbr+sLZQ1gA+shbPhaYofUda1cblv0/blBUquGSSqsf/EiKaCsI05/TjjZUMWc0/VP0wAt4ENwlx7ytw4NrQLm4qULdGomspUwIdhYUrijB/3PiL7DyEWx72cGsi58H/0t7+RcbTx+QYzziAo1CoamBeLgug3pnG1jUEsTjkrtWBpUDbCrKV0GSm7dUWR9PU5pVrT9hpVBBzH5vHq1KCOtsjfTtAvDyiAmdP5yRKPtDeS/PcMKad8xcFaLn5DsFiqGweeh X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: yVzWGWmIV/3sdXFNmbKM/F5W/ARgdYS3iaCFEG8Qbwncayw7JT8J+I1xG1OoTuFLY++lrgJSrW/kfBtOOGlkulLs/LxIJtK2nNaKRk5vETM/6bJRcLWlr5WFm90PKjDR55QJR1Mrm5C2imxH0dblqtHcL199Mdu8dMjNfok4nrmJZHClE5U7h7qA+xc3QOyl6k53fb2KTbz+y5vqUQXjbT+9TDR5URpkktE9z4EWbvm1w88dLS8Fai2s1K9RGsj0cOZkMvm7n4fOBlO4LWuPCAirS0ITFkcnhdNShmiDKuziwdF3zC6YPPKg9X2FC3su0unqrmQ7Q/JddwGxq0m2ZVdF7UZrWumXFVivhAxpvrkPO+slfsnpMXf2qMG+L8w3b9pS2oGbH6EuP5KgYu98IlU+sYbbJGOSMuCTcHLz4iVNupmZFeLoNBZIhk2Z4rxpcELskYEvPmLApU2jYfjNziUfmN6tgJXjkzUROytLv4+qqGu/o8wOm9SwOgMoFvrv2n8Mz5e/D5rwsJsosUxOV3U5c1CSuMqk3lss3VqkBJKPilW5C/vi2/zGpahi6SmIpQajWvDM0BWrGDwBeVFNRA9eduTgg8ucWNVZN20F0L+t8yXCXA4VRv6DVqAwpATMZkscKq7wLsgL4ZYf0Rew2xb9pJlRNnBHBammfdO5pI1IPxrP+Mp54fz5IKRt9dycsQ9PTrHBcL+cZ3qC7DA7iAuMAHKH3/OB/Osj36RyoojCQeQtdHwZ/zH/bOc3eF7jIoXYoqFdjtZHMPojRUoUqlEqWAgp1XGz3D757lai8SLxMYTPOD/NbrxUJXzUmFel6ltB5XDFyQjmyTSmM62lOV5F/4I2T9iqS/mb65FvJTp683DUq/hJhLvvqV1doEMnatvrb4r+OQDVN9HYMzj3F+j9Sl3JZp9xGlZI2D6RNI3en3pjecRRCytkKOQ0iBHvWB6oB4f06TdJ6563xItagQpvewKuB0VUFObWx3VhPc9jG4Qmt64EJ3R1VVi5//bBOSKcu84BFhoDJMxuv4n46+yTfGlZTVDfC0s1GC7kWI51yTjC10KjhGNhvPd1lse0WZdN9X2tIt7qeHLsL73x7Bf6ldyYdEfohT2E1HXQWolMcbgNFIJp5OHTvEgImorgGvF0zlxOKZ+1Xr/4G/TnPfwwMOvMompQHlLZKVtt/yqsR2PBZQtH/lF9jRKeWibwtBbE42gEZBcHS3+FurdGPU4Nzq/cdO/+NgRu1AcEgTKiQjhRtmxZqZzcwyBFr+kO X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6acd8fdd-91b6-4830-e806-08dbb1f9a76e X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Sep 2023 12:30:01.9292 (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: PR3P250MB0002 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/av1dec: Pass AVCodecContext* as logctx in get_sw_pixel_format() 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: iVt4NTmtDD1I It indicates to the reader that said function does not modify any state. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1dec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 8f9c2dfefb..8f6c4f732e 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -440,7 +440,7 @@ static int get_tiles_info(AVCodecContext *avctx, const AV1RawTileGroup *tile_gro } -static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, +static enum AVPixelFormat get_sw_pixel_format(void *logctx, const AV1RawSequenceHeader *seq) { uint8_t bit_depth; @@ -451,7 +451,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (seq->seq_profile <= 2) bit_depth = seq->color_config.high_bitdepth ? 10 : 8; else { - av_log(avctx, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Unknown AV1 profile %d.\n", seq->seq_profile); return -1; } @@ -467,7 +467,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV444P12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } else if (seq->color_config.subsampling_x == 1 && seq->color_config.subsampling_y == 0) { if (bit_depth == 8) @@ -477,7 +477,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV422P12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } else if (seq->color_config.subsampling_x == 1 && seq->color_config.subsampling_y == 1) { if (bit_depth == 8) @@ -487,7 +487,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_YUV420P12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } } else { if (bit_depth == 8) @@ -497,7 +497,7 @@ static enum AVPixelFormat get_sw_pixel_format(AVCodecContext *avctx, else if (bit_depth == 12) pix_fmt = AV_PIX_FMT_GRAY12; else - av_log(avctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown AV1 pixel format.\n"); } return pix_fmt;