From patchwork Tue Oct 25 18:28:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Zern X-Patchwork-Id: 39006 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2967398pzb; Tue, 25 Oct 2022 11:28:51 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6cB4Fe5CqYHRuATaEFgnHvcDdAehahK29Pl8UOmpgGVKfHJiDNyfQdL3H5WtaSdQTTYLrP X-Received: by 2002:a17:906:2f87:b0:78a:c0d5:d019 with SMTP id w7-20020a1709062f8700b0078ac0d5d019mr33641010eji.158.1666722530873; Tue, 25 Oct 2022 11:28:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666722530; cv=none; d=google.com; s=arc-20160816; b=CVOCzVM/IJ6I/WTgLXbzn85h/DTLeRNSiFweK4S4IE9fih2LTj0eDzSoeh6K5HTj9t FcDuQnqyTy6gFRo+VF6LjEwJOh5mG9XEMl4za5O8HXvGpVMkpmtpjVIxemowQ88Nm+cu wR2sIUw2Vee8rviSs+t3lQyjLxUt7hXEMvT4+ApUdd9zzF2ir7V5v04tyaVcc24u1pUU sF2wzM4VfRLAHLmBlm+KhN6u2XpUfgndLH/aJ7CUIYAQji9/qU02TPjbUwt/MWtFIK3d SXZkE9Tz+lMoygLMJ8z62/jJf5xlT+CD4Ula5ym9ZNCDVEL+ci2OP124BUr3ZYs1QMpr pJcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:to:from:mime-version:message-id:date :dkim-signature:delivered-to; bh=oCl6M3RAUI+v6rQtJFfwdWoxCiP9TOyhjSEIeqH53yg=; b=FE3xdlRiqTNhOgJh5zJfaFcmWciQOWLb+4hY5wz0wQii5tS7hxWLKwbB4wpmLYvMMb iYfEoJxg/2826bp3sNRkyayaSex2G2GHHSTJvFg3DgqqOlkSYoTkSnhGhroPZ9dkJYm5 D0See4h0/dUWIRTGaVce+xq2HOotga4dI3cgROhIctsrhoJ5IPwe1bRCSFwItHknYZtf uoJwLrsBaRhcFUMrlNQKWjTX1LwRQn7jTbPLMjfx/kjxgemvFRHsL4MSGq2Yg4BjeJ28 +3uVzifUV+zl/8EOfrls+p0WQCKTnV39DfgAnM6sU5QPLs3O/QEME6QWAVPEywLSRNhm nnaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20210112 header.b=jozW16K8; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id z6-20020aa7cf86000000b0045f802c0b98si2840346edx.443.2022.10.25.11.28.49; Tue, 25 Oct 2022 11:28:50 -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=@google.com header.s=20210112 header.b=jozW16K8; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EF43468BA9D; Tue, 25 Oct 2022 21:28:45 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F210568B5B0 for ; Tue, 25 Oct 2022 21:28:38 +0300 (EEST) Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-36fde8f2cdcso1267707b3.23 for ; Tue, 25 Oct 2022 11:28:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=p51lVLkeiIINyzHC0leeJirp9gzR/ZZN1hzQXXrjurM=; b=jozW16K8iz2JnVxhNvEP7tNwLki65TZolU+Ldru6f1757ITb7HW3MWoTyroLTCvZJB NtNStx0cRd5hDp3dRPQpZIgrou0G5SFrvIPISWVqJsSG2M3rTfnMZicQcUmuQ1OuOWyx HDP9sFIPx6FDolV/W2peOmJZCnIUNO+VUbL6ryodYTu+mXdQaDxduiHIKFB82HMNpYlq Jodscd9vfM6Z8sjEETdI0NPjYGEVB5DYmrUDuJd1Dz3+dMNNfsu9XwpPZdozXpYn8nwo 39F5B9WqzeSO6YxDgWPPZFrNMo9slaUCDsepv2d8kJKv8r3m2ibUuW320mulIUikn1FH yltw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=p51lVLkeiIINyzHC0leeJirp9gzR/ZZN1hzQXXrjurM=; b=eEa0iA4WXrNp1EUbs9GQKFNDMSsxwq6bpsoIO8ESWeYPFBDT7wM/fXqGJTQ3IFqCnQ /rNgR1ZkbH8fUA3xe0Wfgqdj4UTezsgmODEL3qF/0H7suiJzcjiDqtRRq/OFecrG3Ria 52LciG3Noo0pifrPKVFF7qZ1K2Dp6f/6DcwfE5t9texQJRD9a/ukKAZZtM87ABpTZk+D 2bi5tXPW/tQyLkJOkoSTqs1Nbiel9E5Tat2ixSg35x/l6GUYC7lOh3sotXUjVJE94klo cN5ccYSpRfrgJQExb1TKWDSv4G8jVGdPM468qULvsk2rUrdHpubd/ir3p8p38Kc8CpFt rg4g== X-Gm-Message-State: ACrzQf27/ZWLrZaseYMPuuZ8v+7arfXtlRH9vFlZ5i1oZU6lnlvwENMs pHjfn6dtKG50vSxT2huqJ/IecKZq/jT9o2E82FjS6wvsbjN4Jk+QdPJaMmmL2OuZLnWOZygQwfn XL8B6o2AJBmFY2jQOWIAnfhCjvFfd0HHrS+njYrdQQwek7Grq/3KoKMU4Gi9N X-Received: from jzern.mtv.corp.google.com ([2620:0:1000:2511:5e37:11ab:a664:9c5d]) (user=jzern job=sendgmr) by 2002:a5b:503:0:b0:6ca:2939:7749 with SMTP id o3-20020a5b0503000000b006ca29397749mr0ybp.430.1666722516433; Tue, 25 Oct 2022 11:28:36 -0700 (PDT) Date: Tue, 25 Oct 2022 11:28:34 -0700 Message-Id: <20221025182834.3925004-1-jzern@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.38.0.135.g90850a2211-goog From: James Zern To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH] avcodec/libaomdec: fix pix_fmt w/AVCOL_SPC_RGB 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: HP7I333pez7o Signed-off-by: James Zern --- libavcodec/libaomdec.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/libaomdec.c b/libavcodec/libaomdec.c index 378d638a89..53982559d9 100644 --- a/libavcodec/libaomdec.c +++ b/libavcodec/libaomdec.c @@ -113,15 +113,19 @@ static int set_pix_fmt(AVCodecContext *avctx, struct aom_image *img) case AOM_IMG_FMT_I444: case AOM_IMG_FMT_I44416: if (img->bit_depth == 8) { - avctx->pix_fmt = AV_PIX_FMT_YUV444P; + avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? + AV_PIX_FMT_GBRP : AV_PIX_FMT_YUV444P; avctx->profile = FF_PROFILE_AV1_HIGH; return 0; } else if (img->bit_depth == 10) { avctx->pix_fmt = AV_PIX_FMT_YUV444P10; + avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? + AV_PIX_FMT_GBRP10 : AV_PIX_FMT_YUV444P10; avctx->profile = FF_PROFILE_AV1_HIGH; return 0; } else if (img->bit_depth == 12) { - avctx->pix_fmt = AV_PIX_FMT_YUV444P12; + avctx->pix_fmt = avctx->colorspace == AVCOL_SPC_RGB ? + AV_PIX_FMT_GBRP12 : AV_PIX_FMT_YUV444P12; avctx->profile = FF_PROFILE_AV1_PROFESSIONAL; return 0; } else {