From patchwork Mon Apr 25 21:59:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jan_Ekstr=C3=B6m?= X-Patchwork-Id: 35436 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b9e:b0:7d:cfb5:dc7c with SMTP id b30csp2091399pzh; Mon, 25 Apr 2022 14:59:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJynj/oIJt1C3fvgAphubp+C4LpMa8rUyFA+BSC4pYRw9Nb7/KE6ZgMg//TLxxmlqHHprm45 X-Received: by 2002:a17:906:d555:b0:6da:ac8c:f66b with SMTP id cr21-20020a170906d55500b006daac8cf66bmr18184423ejc.107.1650923983016; Mon, 25 Apr 2022 14:59:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650923982; cv=none; d=google.com; s=arc-20160816; b=hK55eEgzAARnXmP5/vmUIgoWYli9fXxpR3XzGn8PvKqK6hc4hHK1PnITzYYTZYki/s q5vJ1/VgIdlkUWB4EhYBrnc0xg3EkQXjH8l5Gx6lPEGi8vFDWeMpAfX5bKHiCdEt1bHN 20hWPvEOnEe54rY3aGxKZQPB0r4kdAVIymnbgqO2aGCue8iU0TYMsnQvM35KOVdAo7GP RtuS+AdE8KNUBrrebHNzk0tkOhGkaJd8O5D5KzRg98hK6zM61KL1ndQIBc/6KN/+ASHq 8OxfRKgYlpPSGjuDmh1KVUp30aOhOC93Zi7IXGO6HebtmXWgK2OQ/dBkNXTS8V5P7J/b otWQ== 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:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=6e2TRLLJvIGMKOWVZJzr64h37htpa2CNNH5X/SxX2QQ=; b=Y2YGSfAGe4qWcNbSxhtQDNKnoj8s2XUWjbCcDFwUAQrPyYwQEiHpuO1IpBtDtRzTAz UXxsPx+CEzfrl61Msok3QRNOV3ic5d7oIxwvpT6vPbpdAWm5Ol5MMtc3uiPcxJT2D+y/ TI9Uv+JKKuAcboOydI+rlRHwSyR9K9QRHDqNcMB2k6QbtSkcwgNuiqneJwcpogPzrbtu RbaGWBRhE6xfM5TmnVPMXelcQMW/bW/84bhv2hkXLcNvl+Xu+INmjpMZAd3tRuXspwkE 6aVyfm2o6X6i/ztNsN7dC9IyVBjdV7Dmv8yDMN3EHEzsMCj2GYqsG4OSALYnDNFwcWYF Qwcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=HJ40H+wK; 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=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i3-20020a17090639c300b006e8a06f6f01si14891491eje.9.2022.04.25.14.59.41; Mon, 25 Apr 2022 14:59:42 -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=@gmail.com header.s=20210112 header.b=HJ40H+wK; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ED84C68A718; Tue, 26 Apr 2022 00:59:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f48.google.com (mail-lf1-f48.google.com [209.85.167.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6578E68A8CD for ; Tue, 26 Apr 2022 00:59:32 +0300 (EEST) Received: by mail-lf1-f48.google.com with SMTP id w19so28649156lfu.11 for ; Mon, 25 Apr 2022 14:59:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=K0n4SxyTKAvFgg6TQLheLwQuTDMjR+ZJAhujP0zkdIY=; b=HJ40H+wKUuRK2GWjTriWXI7t2dEsgnkt3cmd3v/4z8mqiiJwYkAd1pIWwnip0jJyF5 UOl2hB3QELVSjq0Uq5pnjaXx0F7Y/SyHxtLyJxct9CxGUSLzy9XroxIdgG874MNXCx9a 3VhPU2CeASI+khIATWBdZyI7Ke7lvgDeH5xes/lcwgaawZP9T+m04BwBwlyuNOItrCZA s38M4YgGMAHqFoliZ7XflhBgZig63T+89rkNM9Cd82GFLr+aAZbGPuMZDPWFxPhp5tAG iSvwVJPdqoCXd1UL/jZh3j3tbWva1TbzomVDwwHVMuSZN4wU5oRpFMIMbpJXUZKYyp86 T1og== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=K0n4SxyTKAvFgg6TQLheLwQuTDMjR+ZJAhujP0zkdIY=; b=EbL20hpbZlD5cTNlqiEEwIa6Iqhryv93urKT5Dem7rffj38G+7QFwbVzop/wLuftBm r4M4k73wJlOU2QOZetLPCnSeBposk/TT5dsdO3131G9BLzTuJ1F0bR+H8CJ8XsbXEAay 7usBaNRWeBp2xzfVVwYdgpsG0y6Ye3zClpc6V9xPiXvBvwM9wWcz3t2aRJd9STEKSmKc cXkmCoyJJoORRLa6/6U1rT8iJWdcFBtohc5m/TbMPHTsSUg3LD3TypTsoHhaaUuGxvW8 mAmY+lz/Qo4cnt9PMdaDYu5+5cBhYtZTZ/1XlT7FKTsIRlEHrrR5ku/EnT6cumZGwb16 pfxw== X-Gm-Message-State: AOAM532NKUMS3S81eCCzCAWDTSs0lpcOPRfbh3C+PdsUGHEQYltWxe0d FR3b83xBstCRNmHk43c8dmf1BqUfyMA= X-Received: by 2002:a05:6512:114c:b0:471:c3c9:6c00 with SMTP id m12-20020a056512114c00b00471c3c96c00mr14611246lfg.138.1650923971745; Mon, 25 Apr 2022 14:59:31 -0700 (PDT) Received: from localhost.localdomain (91-153-198-187.elisa-laajakaista.fi. [91.153.198.187]) by smtp.gmail.com with ESMTPSA id a18-20020a194f52000000b0047210db8b26sm166951lfk.197.2022.04.25.14.59.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Apr 2022 14:59:31 -0700 (PDT) From: =?utf-8?q?Jan_Ekstr=C3=B6m?= To: ffmpeg-devel@ffmpeg.org Date: Tue, 26 Apr 2022 00:59:23 +0300 Message-Id: <20220425215923.68551-1-jeebjp@gmail.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220425210212.64448-1-jeebjp@gmail.com> References: <20220425210212.64448-1-jeebjp@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avcodec/libsvtav1: add support for setting chroma sample location 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: WrPspoMnJnnZ Support for configuring this was added with version 1.0.0. --- libavcodec/libsvtav1.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 2e3d96ce37..49c396387f 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -205,6 +205,33 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, else param->color_range = !!(desc->flags & AV_PIX_FMT_FLAG_RGB); +#if SVT_AV1_CHECK_VERSION(1, 0, 0) + if (avctx->chroma_sample_location != AVCHROMA_LOC_UNSPECIFIED) { + const char *name = + av_chroma_location_name(avctx->chroma_sample_location); + + switch (avctx->chroma_sample_location) { + case AVCHROMA_LOC_LEFT: + param->chroma_sample_position = EB_CSP_VERTICAL; + break; + case AVCHROMA_LOC_TOPLEFT: + param->chroma_sample_position = EB_CSP_COLOCATED; + break; + default: + if (!name) + break; + + av_log(avctx, AV_LOG_WARNING, + "Specified chroma sample location %s is unsupported " + "on the AV1 bit stream level. Usage of a container that " + "allows passing this information - such as Matroska - " + "is recommended.\n", + name); + break; + } + } +#endif + if (avctx->profile != FF_PROFILE_UNKNOWN) param->profile = avctx->profile;