From patchwork Wed Sep 19 01:14:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 10398 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp122762jap; Tue, 18 Sep 2018 18:21:18 -0700 (PDT) X-Google-Smtp-Source: ANB0VdaGlfn7jI/cUoIbzXDXDmhXXW6G3T6NTwJ2j4hDa8OPFjyQfr/2ZdCjM1JsF+qgbGJQwEuC X-Received: by 2002:a5d:6a0e:: with SMTP id m14-v6mr26539968wru.192.1537320078350; Tue, 18 Sep 2018 18:21:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537320078; cv=none; d=google.com; s=arc-20160816; b=AeucZL4HkK4EG7zxFFb2NRlJQKq+zlOfLh96tmWuJXux14tr0wj/4llkHGpYur8LD8 KoCgtukoxoBLlxDnoE+kIAO0fblW+vnmTbXps2W7JhgkxnvhAwaXhOI8rLWWn579kJpl Grtc+DLbJ+2fjVuOFz5PNJ817t1Ajd7ingvxT2ESR/rFL1zGJu0U04wFe4v+NUqjhlsD 9pxYLiuLcTFW30CqnmhaXAqty8BWYeSHxgyfL6avrLwUfi4q1OpdmsY9vRFwo7CC0gpz aGJvok+zPCf9+tiG7GeEz+9IN2BhThl5yN0q+l2Y0w/f5sE//gUAIA3desYb4hFyN4YM KAZA== 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=OC/eBrNO5lYn24OdoiKojjlcB5C1fx95daEZ5HBi0E8=; b=bgwLIJ6N/cLlN/PIIeNwupgjKxNN/k/TysH7mGJibhvAZVr2W9ee4tgGXLFceY55E0 62BxqddAs02dH6gKLN0t1SAhwjEZ839ojorYLxqgDvWOl7C96brn7vxj9VsTbxZIJ9lI cmQOvC3YGiYUuEo7MAT4AQK/NbhTm7UJdVyi2sIdDZh4yd6HR9td27UgFZFKIDfceEDE EPrLH1iW130nohvWAJ+OnovCZavjMvqhdMLjV0X7vcVP5CU9qXq7LmUIoEfGywdY5p10 3zBBb++2PzIJWmLSPPz8mB4yGf10/tYbZ3vvmYB1QGou8r/zYg2lBiSn1FKkDk/e9Smz bDgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sU9vIMOb; 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 n10-v6si2375958wrt.154.2018.09.18.18.21.17; Tue, 18 Sep 2018 18:21:18 -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=sU9vIMOb; 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 8085C68A533; Wed, 19 Sep 2018 04:21:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt0-f195.google.com (mail-qt0-f195.google.com [209.85.216.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 183C9689F92 for ; Wed, 19 Sep 2018 04:20:57 +0300 (EEST) Received: by mail-qt0-f195.google.com with SMTP id t5-v6so3654466qtn.3 for ; Tue, 18 Sep 2018 18:21:10 -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=msiIREybok+yMDQJI6mhUecTyCWbHXGlP1JF6kK/jN4=; b=sU9vIMObsf+e/v+Ep5pYgMCw6etMti3XBsUsmSQ3MlgNIy6vFg1ydoh2Yc4rlu3bPf ofHWzv2BKDScuN6xLsdf/r0rQ2C0WYDAzce9H+g1jhdtXwhwRAwdKtcbZqiRvBKjvbdF RdIXHyf6Va+KX3QvhN/eKh16HJHg3wKeoSR/B7yrD6pKJ2ICFwTPLr4ihPBFE89ejbZR v+7CGeE+mZBugdXsRxL2L7/Im9lgjcTkls8CXHcedvkq1G2/8Vq/RrssZZf+P+5BzipB XTGyOeSYAL+axOS1LDntxroKk3zmo+tmXpWNeKyRVhHz5vOA5wMUP85m7xxfiB4r3m4g ATbA== 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=msiIREybok+yMDQJI6mhUecTyCWbHXGlP1JF6kK/jN4=; b=JtwBH/CD1FLUMr2J7YjncVJmKLqqxKswLrXXgKOB+7Z/yuDTfprxActxbvU34DBOGp qWGIzHAMAFW8MNLP8LItCFUKkN6xSeyOPMlT/11g2opVyXpBxGyPM6EUXJw04XSOH/cW 4NY5FOkdR5EJHLJn8Lazi40yy67dY5p6xDAqKIG2uUQXhW+55FGJ83NpIPwmplmqRhYF IAwTeyelUNWmSQ4kgwQNQD1YXveDsAJyqFKRY60wQh9iw3XWXIGKxRm+WaWZMrO5bSms iAeVBHALPn1qq6vo1GPRn2IUq4YHMzAGB0kJSnIhDFi96kzEIOgDjF84gA7wxIMVgf2X 8XhQ== X-Gm-Message-State: APzg51DrSVn4nspwVXDMm/BVdaVeNDbi9NgtJYK16t+uvly6wIfIAo1N RuE8uI3t2nlDrBWidS/I8UlQXm9DB4I= X-Received: by 2002:a0c:c30f:: with SMTP id f15-v6mr23447700qvi.104.1537319744528; Tue, 18 Sep 2018 18:15:44 -0700 (PDT) Received: from localhost.localdomain ([179.38.180.60]) by smtp.gmail.com with ESMTPSA id y27-v6sm13535958qtj.58.2018.09.18.18.15.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 18 Sep 2018 18:15:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 22:14:46 -0300 Message-Id: <20180919011447.8804-1-jamrial@gmail.com> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2 v2] 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 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 6a79d9b873..9669e82049 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,28 @@ static void set_color_range(AVCodecContext *avctx) codecctl_int(avctx, AV1E_SET_COLOR_RANGE, aom_cr); } +static void set_chroma_position(AVCodecContext *avctx) +{ + enum aom_chroma_sample_position aom_cps; + + if (avctx->pix_fmt != AV_PIX_FMT_YUV420P && + avctx->pix_fmt != AV_PIX_FMT_YUV420P10 && + avctx->pix_fmt != AV_PIX_FMT_YUV420P12) + return; + + 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 +475,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_position(avctx); set_color_range(avctx); // provide dummy value to initialize wrapper, values will be updated each _encode()