From patchwork Sat Apr 4 09:30:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18633 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 A4AB644B3D8 for ; Sat, 4 Apr 2020 13:01:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B21768B15B; Sat, 4 Apr 2020 13:01:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oi1-f176.google.com (mail-oi1-f176.google.com [209.85.167.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9135468AB21 for ; Sat, 4 Apr 2020 13:01:00 +0300 (EEST) Received: by mail-oi1-f176.google.com with SMTP id u20so8553187oic.4 for ; Sat, 04 Apr 2020 03:01:00 -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=tpatbBOD98ivA0Q9El8+w3SB3J/RI1+IgnzDs3oAI5I=; b=XwxnQW0iTl9huCTS561uOjagkHBfgPUhXKbPRNgoIZWOd2R1Qsg95spAO1jKzZXidx JU3B/NI3GKBcSaAinUUCF4AsBfC475xplfyfOWN2hwVQW6gf+2W0lHX6G1UbltXU3s+Z qP05i8mMJLiCNOku/lLHIMQYu1T2pxYGbKbWk37ceRn9a3aaYiC3ahPdoZIv1wfzUa/k sQLMKJSQLV8Tgpw0BvlrlH175Hex3kDd3lreMLcJmCogbCVnVGSnTLkfDWlSPtrF1s3T JRl2Y6hnkJ2a0RIifuYpnJMWXdAXW61FmkTgtAuqrTv+aQjT6e1uJVnRK1SDucGb3TvY fwJg== 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=tpatbBOD98ivA0Q9El8+w3SB3J/RI1+IgnzDs3oAI5I=; b=dj7UcIGCFhyd5nCuP98fZDR4czUbMHBVoeHNHkzDnkIAGdltyjs7vXwGIItxjZT4xO JE9bltN4jCS/ShGqXz0DfOeet7sBKac4nF+09vyZq3OCRXF1Vi1sCZe0zhwx3QTF/7AW mP/qy4RpulN401SR6ztUsdD2S/5/ZH4vTmYn/5AflCGWJ8JrVwWR0rGrAhAN9Bn1lmn0 /e4wPeXoQsMcwzj5BuMrlHUKRjTeB27PP4IyG8jnbPj9FsRIgzwda789rkHmGP1TcQHm k7g1N41iHDqxlXmEKc9A7d2Xo4mH3VqNkPKyuZe0A3eHw/ZL8xbUe5L3PLAvjeE+vJHq 0AxA== X-Gm-Message-State: AGi0PubmoerBSbGN0evpp2YWc0hzpmnZE5aTaqeJZFyd0p0/4eqTHa3N nikrI1E6bUaX7gIkVqeUXOCkPX4L4sQ= X-Google-Smtp-Source: APiQypK6Vvb0DVeUlE6Ulq1OY0uaEcyJjCXz1gQYghRx/AOLYlLFwZWrc6pMOY/v8eTK0FQaO6960g== X-Received: by 2002:a17:90a:2e15:: with SMTP id q21mr14682687pjd.166.1585992631911; Sat, 04 Apr 2020 02:30:31 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id x68sm5966463pfb.5.2020.04.04.02.30.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 02:30:31 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Apr 2020 18:30:15 +0900 Message-Id: <20200404093015.63848-2-ryo.hirafuji@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200404093015.63848-1-ryo.hirafuji@gmail.com> References: <20200404093015.63848-1-ryo.hirafuji@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/libaomenc: 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, 11 insertions(+), 1 deletion(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index fb61ce82e2..4a7f4b662a 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -94,6 +94,7 @@ typedef struct AOMEncoderContext { int enable_intrabc; int enable_restoration; int usage; + int lossless; } AOMContext; static const char *const ctlidstr[] = { @@ -130,6 +131,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", }; @@ -154,7 +158,7 @@ static av_cold void dump_enc_cfg(AVCodecContext *avctx, av_log(avctx, level, "aom_codec_enc_cfg\n"); av_log(avctx, level, "generic settings\n" " %*s%u\n %*s%u\n %*s%u\n %*s%u\n %*s%u\n" - " %*s%u\n %*s%u\n" + " %*s%u\n %*s%u\n %*s%u\n" " %*s{%u/%u}\n %*s%u\n %*s%d\n %*s%u\n", width, "g_usage:", cfg->g_usage, width, "g_threads:", cfg->g_threads, @@ -163,6 +167,7 @@ static av_cold void dump_enc_cfg(AVCodecContext *avctx, width, "g_h:", cfg->g_h, width, "g_bit_depth:", cfg->g_bit_depth, width, "g_input_bit_depth:", cfg->g_input_bit_depth, + width, "monochrome:", cfg->monochrome, width, "g_timebase:", cfg->g_timebase.num, cfg->g_timebase.den, width, "g_error_resilient:", cfg->g_error_resilient, width, "g_pass:", cfg->g_pass, @@ -751,6 +756,10 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_MAX_REFERENCE_FRAMES, avctx->refs); } #endif +#ifdef AOM_CTRL_AV1E_SET_LOSSLESS + if (ctx->lossless >= 0) + codecctl_int(avctx, AV1E_SET_LOSSLESS, ctx->lossless); +#endif #ifdef AOM_CTRL_AV1E_SET_ROW_MT if (ctx->row_mt >= 0) codecctl_int(avctx, AV1E_SET_ROW_MT, ctx->row_mt); @@ -1132,6 +1141,7 @@ static const AVOption options[] = { { "usage", "Quality and compression efficiency vs speed tradeof", OFFSET(usage), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, VE, "usage"}, { "good", "Good quality", 0, AV_OPT_TYPE_CONST, {.i64 = 0 /* AOM_USAGE_GOOD_QUALITY */}, 0, 0, VE, "usage"}, { "realtime", "Realtime encoding", 0, AV_OPT_TYPE_CONST, {.i64 = 1 /* AOM_USAGE_REALTIME */}, 0, 0, VE, "usage"}, + { "lossless", "Lossless encoding", OFFSET(lossless), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, { NULL }, };