From patchwork Tue Apr 7 18:03:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18756 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 93C4144A21D for ; Tue, 7 Apr 2020 21:13:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7CB0968B63A; Tue, 7 Apr 2020 21:13:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 545CE68B617 for ; Tue, 7 Apr 2020 21:13:56 +0300 (EEST) Received: by mail-pj1-f45.google.com with SMTP id k3so100833pjj.2 for ; Tue, 07 Apr 2020 11:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AlROz0vpRB6JjalNN+UXdMwBri7ErZeqkozZRAG8zU4=; b=N3FL4UtKIBSzL9Mz7LQtWeFJh2w2HD+QvvJ9w9faiIW760hGJTq/0kuHjFo8gxpJct qTK3eYJe73x68izx93jUufyxp+MWWW0Lz6rsvkDQoBBtlEkYi+b4VJ9v20lkf+zsPtpa jxll+MbW8e6VqOoRddeRyxqqljq0K5HDtcoU+2YSix+Dn2XjXInFLWmeb9+niItodeX8 McXf08W1O6iR/Sqpi3UfKOLeYLJQHp2JRhdMBV0fE/5NuPgpdMBqSFBC92Snd1upnpwo hB3HdsmVVfgeqdj/bvFwB8TruoYKkYHtA6DoG5fLVZHV8kovf+hQ8KJxN6pUhvHxY9vP 5ApQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AlROz0vpRB6JjalNN+UXdMwBri7ErZeqkozZRAG8zU4=; b=mrXyJQTMO2OmNqV8QVZ+kp4LqMTRChHAcSuDFoVgEJgowL2xGLfozvU2jVA5fTYwnn 0f69CoNIEQYmbpGSpKYVhKmSKXy9GJnJGRbq6gRBmxsKvopj6nS7XZnwKiGh0UtgRkCY RmkqLdCSUha2I9de55mDhsLAwtAsnYd47P2B3sNMjhpSrVNdGaBtZPsVG5rvSXmwwA/I JpqHZjyHVSgDlZ02wwIM/wPjXNT15CUPZfatUvq5vjYg7XndWb8lUcmYJALZMCIpKVNc OcON/r3wT8X7OfrqzPyzMo86/8+iNiSDh3bjiAPfrkqIQ61iJnkFmJWSY8ETw9satARb u4lQ== X-Gm-Message-State: AGi0PuZsNXj9HbyTiyi9sgKLM8jFxZU68o3cAasX7JvlGWpMZLEc5lMb 6//muKR9c9/lijkr/Qw/GVRHPneoLYQ= X-Google-Smtp-Source: APiQypIpcEIojZkfBq5iwzOtkBFmMdEp9gPX5NujHkhrhoeq3waCY5Z+xZNQvf68gTcmF321X/AAeg== X-Received: by 2002:aa7:8a99:: with SMTP id a25mr3666269pfc.76.1586282744972; Tue, 07 Apr 2020 11:05:44 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id d14sm14599573pfq.29.2020.04.07.11.05.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 11:05:44 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 03:03:53 +0900 Message-Id: <20200407180350.72793-2-ryo.hirafuji@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200404095341.128020-1-ryo.hirafuji@gmail.com> References: <20200404095341.128020-1-ryo.hirafuji@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] libavcodec/libaomenc.c: Support lossless encoding 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 Cc: Ryo Hirafuji Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Ryo Hirafuji AV1 support lossless encoding. In this patch, I added a command line flag to enable it. --- libavcodec/libaomenc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index a3c5ae8f54..2133abb1a7 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -130,6 +130,9 @@ static const char *const ctlidstr[] = { #endif #ifdef AOM_CTRL_AV1E_SET_ENABLE_INTRABC [AV1E_SET_ENABLE_INTRABC] = "AV1E_SET_ENABLE_INTRABC", +#endif +#ifdef AOM_CTRL_AV1E_SET_LOSSLESS + [AV1E_SET_LOSSLESS] = "AOM_CTRL_AV1E_SET_LOSSLESS", #endif [AV1E_SET_ENABLE_CDEF] = "AV1E_SET_ENABLE_CDEF", }; @@ -587,6 +590,8 @@ static av_cold int aom_init(AVCodecContext *avctx, if (avctx->rc_min_rate == avctx->rc_max_rate && avctx->rc_min_rate == avctx->bit_rate && avctx->bit_rate) { enccfg.rc_end_usage = AOM_CBR; + } else if (ctx->crf == 0) { + enccfg.rc_end_usage = AOM_Q; } else if (ctx->crf >= 0) { enccfg.rc_end_usage = AOM_CQ; if (!avctx->bit_rate) @@ -717,9 +722,12 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_ENABLE_RESTORATION, ctx->enable_restoration); codecctl_int(avctx, AOME_SET_STATIC_THRESHOLD, ctx->static_thresh); - if (ctx->crf >= 0) + if (ctx->crf >= 0) { codecctl_int(avctx, AOME_SET_CQ_LEVEL, ctx->crf); - +#ifdef AOM_CTRL_AV1E_SET_LOSSLESS + codecctl_int(avctx, AV1E_SET_LOSSLESS, ctx->crf == 0); +#endif + } 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);