From patchwork Sun Sep 16 18:29:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10334 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp2789446jap; Sun, 16 Sep 2018 11:30:45 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbFiw2+8CQOidj9bAoizOqMSfPJFEjy9f2Vpya/TJY1tWWxk/EVbWcjVPm+I4katCtE6V9S X-Received: by 2002:a1c:e00a:: with SMTP id x10-v6mr8714375wmg.58.1537122645451; Sun, 16 Sep 2018 11:30:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537122645; cv=none; d=google.com; s=arc-20160816; b=zXRFyxHVw/NljgKcrNpIuxiWdDGT37Sf1FzJQ5jdxACKUGb3PKSbhhHYp0cKB9McjN S8GzwJc84KzmesDAQgbormiGXg+xdJMqNn+wWLUJ3O2HowLvdk9OGQUjecPUQc4BqPnm or5Gfj8CccUdGLsQREUl+0Rn6Xd/jXZyqglMULFi0ShqZxH3feZoVqkeDLk6SnzZoZn2 XKGIYC+bD+5W6WYfvjgQGt0/EPf7GVD4KDiFwo2ytNY1tf+MqhUExc6Kgcvooej7nmls ffKlrkNPqRttr1U+SdmzaMapszNjVEZoNRpngI4J9qu2/muFlxm82/ni5bOa1sUgN9ea HuNA== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=IF6vL4kQ4VAdwmMnKPCktW3KaAzVRZVfeTuuGiGS5Cg=; b=XuIbXFNCIqi9FAS9O/J3Szu5xieFUHomSzi/QMEgDhFuLqs0SXZpxvUQC3FF6K2exN +bRSGgaZOaMKqLF/1n3X385d6oQj6lTCXji7rIKGSP5D3KQ3OCZBCdj5SwwBU/gKBNu0 hDL4fi0K3H/XnO5qcqi+uolkml5tQ6eTivvqVmR73HAKXqwo3IYs3cJztwBbF+LSBZu7 gC6c9lLk7YoGJvN8sac7p2lXyv0MNWWmHTm/j0ScjiFZzNr7q3GYqXi3PvXEZJp+0zv5 Gj0lw7y/XrZA7FKdQ3iI79UCl2FyOvzktf+laIMcf2zeJjaoFEptp3sS5g9Lw1ojdhKj w+0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NCyRaCOr; 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 z2-v6si11058358wrs.106.2018.09.16.11.30.45; Sun, 16 Sep 2018 11:30:45 -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=20161025 header.b=NCyRaCOr; 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 A208368A451; Sun, 16 Sep 2018 21:30:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f193.google.com (mail-qt0-f193.google.com [209.85.216.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CA9368A1CD for ; Sun, 16 Sep 2018 21:30:25 +0300 (EEST) Received: by mail-qt0-f193.google.com with SMTP id r37-v6so13430675qtc.0 for ; Sun, 16 Sep 2018 11:30:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Rong4hvIxxi4dlQjNOLKCiaROaXg+aTghhwqbDJyCrg=; b=NCyRaCOr4RuPERps/mNIPAmxzjL/LZIArROznIN3TE+op7es3lGQ/U4nD4gYOROmW3 vzl23gMa+VmmzMq/x6fRLFq5rqAqYQMpNZnfaTZa6G5MklqG0N7+E0kzvRkPxolB6VF+ E/2qonRknac3UQwN68bSpZpd/iE+TYJ2osLiTMAcbvAcCalw19XBenjbJb7DmacYP66h n6Wm9fgk6Bxd56VsEHtw6Md4WW5rCZuPHz9VARGdsyQYrXcSGNwmrvGUZCUIlpx1pRqG 8d2mHG6db7ygU4MpuQFvA2neUsPi6MacdbJcdsrg0/Y2Z/vkRvTp4fdyYjHu38SfqaP+ Eedw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Rong4hvIxxi4dlQjNOLKCiaROaXg+aTghhwqbDJyCrg=; b=ptYLiaowGsOjFkEfT9SNWSgzbMhREf3n+UKicdArPh3uUVK43dz5CoMNLyvewe8oYz Gxol9GzVSCGogou/vJ1JAqVoOcYoHSLT4YiEed7SThjdw218j/KMmfZeBUWSn1qOmBhH i1NKnqjMorKZdvvj3SKP2MRy/RF8opIgfIp+Myd6s3jhXYpL4usnFApMWwGURAMyNu5q 8a2bqP025QlSpqlTqUz4L/hubehnNemNCp5Rk7P/rNh2FdndT9CUJ9Riw0Ff7hk8H72P FzcuTyHY1bdGXf/lkx6vL2SZ4Eh3obdgKcA8rbxNZSWDhscglgApl4zkcTcvgHpF10v/ b6TA== X-Gm-Message-State: APzg51BacIbw4Qvqwa1rdkMoiWPuRPhY+ssW1N8nrI80kh3pycYF4tb6 gp5Amoqf1vvqn1gNjamFHU3U0EQs X-Received: by 2002:a0c:f752:: with SMTP id e18-v6mr15807143qvo.105.1537122636220; Sun, 16 Sep 2018 11:30:36 -0700 (PDT) Received: from localhost.localdomain ([179.38.240.204]) by smtp.gmail.com with ESMTPSA id y143-v6sm9753319qky.95.2018.09.16.11.30.35 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 16 Sep 2018 11:30:35 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Sep 2018 15:29:49 -0300 Message-Id: <20180916182950.13088-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/libaomenc: support setting chroma sample location X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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" Signed-off-by: James Almer --- libavcodec/libaomenc.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 6a79d9b873..55d50ded28 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -76,6 +76,7 @@ static const char *const ctlidstr[] = { [AOME_SET_ENABLEAUTOALTREF] = "AOME_SET_ENABLEAUTOALTREF", [AOME_SET_STATIC_THRESHOLD] = "AOME_SET_STATIC_THRESHOLD", [AV1E_SET_COLOR_RANGE] = "AV1E_SET_COLOR_RANGE", + [AV1E_SET_CHROMA_SAMPLE_POSITION] = "AV1E_SET_CHROMA_SAMPLE_POSITION", [AV1E_SET_COLOR_PRIMARIES] = "AV1E_SET_COLOR_PRIMARIES", [AV1E_SET_MATRIX_COEFFICIENTS] = "AV1E_SET_MATRIX_COEFFICIENTS", [AV1E_SET_TRANSFER_CHARACTERISTICS] = "AV1E_SET_TRANSFER_CHARACTERISTICS", @@ -284,6 +285,22 @@ static void set_color_range(AVCodecContext *avctx) codecctl_int(avctx, AV1E_SET_COLOR_RANGE, aom_cr); } +static void set_chroma_location(AVCodecContext *avctx) +{ + enum aom_chroma_sample_position aom_cps; + switch (avctx->chroma_sample_location) { + case AVCHROMA_LOC_UNSPECIFIED: aom_cps = AOM_CSP_UNKNOWN; break; + case AVCHROMA_LOC_LEFT: aom_cps = AOM_CSP_VERTICAL; break; + case AVCHROMA_LOC_TOPLEFT: aom_cps = AOM_CSP_COLOCATED; break; + default: + av_log(avctx, AV_LOG_WARNING, "Unsupported chroma sample location (%d)\n", + avctx->chroma_sample_location); + return; + } + + codecctl_int(avctx, AV1E_SET_CHROMA_SAMPLE_POSITION, aom_cps); +} + static av_cold int aom_init(AVCodecContext *avctx, const struct aom_codec_iface *iface) { @@ -452,6 +469,7 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_COLOR_PRIMARIES, avctx->color_primaries); codecctl_int(avctx, AV1E_SET_MATRIX_COEFFICIENTS, avctx->colorspace); codecctl_int(avctx, AV1E_SET_TRANSFER_CHARACTERISTICS, avctx->color_trc); + set_chroma_location(avctx); set_color_range(avctx); // provide dummy value to initialize wrapper, values will be updated each _encode()