From patchwork Tue Apr 7 18:11:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18755 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 9092C44919D for ; Tue, 7 Apr 2020 21:12:44 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6C27968B698; Tue, 7 Apr 2020 21:12:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F0B7468B469 for ; Tue, 7 Apr 2020 21:12:36 +0300 (EEST) Received: by mail-pf1-f179.google.com with SMTP id q3so1148079pff.13 for ; Tue, 07 Apr 2020 11:12:36 -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=NDrTtHYsnyTHGO5FiNN/IBFA56NYFWAd2TWPlqddbR0=; b=TybkmH+XCzHq9yNyQejgojkFF0tM7GNWO6TV1b1BHlioxR6lFHfHe3bOoee4cG6cZc RUhSmSEtKLNnphvlyjBPIUCqtBJZOqaVBQTwyFilacRD3Aa5UZ5Gc3pZOA9iBAXh8RNF qqy8VvVqVDljDkxh11zHwTt3h+Jp3+FwBSK1C0Z6/Ra9np32mVamx3ClW3oayphc+phB ASeNi2/M6vY9MvYDraviiYLMQX19xoD456YJEX0qS35euzPVrRjBGha4IDD0m5l6QGNB z/i1jWpu3dQHYpcW1udSMCl3LDD58JbgUASeMZrih9uWimFqcleSOvoohm3nVMUzvZpn dKbA== 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=NDrTtHYsnyTHGO5FiNN/IBFA56NYFWAd2TWPlqddbR0=; b=ay+zWGZMhkJfwYDkZhDrJD8f+XBxVcqHEDQJduWRT6wpnvDAot0p+TXE9ciWsIS6Ns jLlVgxyERgf55JoMBoiTtCb0qxJxagElAkdX6Zx7qSopsL4IvZ4sSf/IUoOG/Z9f89sC Y5yVl54bP9rOw6KYKS3sIAnzR+1o6q2zEN/fHINGZiOLPPXpfoliRsgFcJanwhsozr5v Tfb0ytZO7287pFIDQTKq5KakISGtRC4e60MaTUz6YRGjgeeh4QKrl/GUnTA2PjH3AqJd c0GeOfeOvQgIt7bN2ZZBQ5R42Z7F0SHxTA4fbM/YgoplCCvcvF6ZlgUf+12FOgSF+XH9 g+WQ== X-Gm-Message-State: AGi0PubYrKtBa5d9wL4iE8DOuEtCYyESto59c1/BHvmjvwIfxVO7XW+K HnumtV3FtRxdmcNuB8rNhimKaxS9cXA= X-Google-Smtp-Source: APiQypIYlCGuwEyits80w8HiPoZfRH87PaHE3Vlcem5NLVV8nHJGTO4+f2m9TdUKVLJFh53JxqSlMQ== X-Received: by 2002:a62:1c4a:: with SMTP id c71mr3754045pfc.58.1586283155139; Tue, 07 Apr 2020 11:12:35 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id l22sm2211550pjq.15.2020.04.07.11.12.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 11:12:34 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 03:11:59 +0900 Message-Id: <20200407181157.74792-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 v3 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. Fixes ticket #7600 --- libavcodec/libaomenc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index a3c5ae8f54..0cc5afdb7a 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);