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 C9F3844777 for ; Tue, 25 Oct 2022 18:28:48 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C00B268BA08; Tue, 25 Oct 2022 21:28:45 +0300 (EEST) 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-Google-Smtp-Source: AMsMyM6m+DyK34d9a3JLXivZMJGz6ENNMi6Mxz+aC3Tj0jkFeNTAL8y0QDtFsXrOs5Ha8O93zdrJHx1Zxw== 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 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: 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 { -- 2.38.0.135.g90850a2211-goog _______________________________________________ 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".