From patchwork Wed Apr 8 00:13:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18771 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 3449244A945 for ; Wed, 8 Apr 2020 03:13:57 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 16CD268B6B2; Wed, 8 Apr 2020 03:13:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AEC068B6A4 for ; Wed, 8 Apr 2020 03:13:50 +0300 (EEST) Received: by mail-pj1-f46.google.com with SMTP id n4so439689pjp.1 for ; Tue, 07 Apr 2020 17:13:50 -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=VGPyTyXtXgq/1ixWtborsfZC9MVpDOuU6hwgjNQnB/M=; b=PQiiWQ0GX2OU/7kXGhF0o0UkQ0wOLMp2SNDvg/PhmkFzAq52Nnv/VklS3h7mu4ac2h jGODHUyNfV7CPTNNO8paJnYXF8EHYYcJq2Ricqz4FcXt3Jw/sUVQNJ24ChhoIFxyGBse xn8A3aU+hPC5ZSNHD1HizwYDpJp0bxSlR6309dptoV520wFZpXFTG5UZ2fnkaG8kvBEq gN3Zf2t+jTK+g6KPaD1NFWg93CNk0PKtYBTcCJw3Tczj5VeymiK166bPdkoQg7s1/b8q 30niUqhlO5XoZTuYDMkhY2lcJWJujPaD7m+AMMjiaYiWTkixGGRORje5yEAlDJrHpXQ+ xhaQ== 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=VGPyTyXtXgq/1ixWtborsfZC9MVpDOuU6hwgjNQnB/M=; b=APrK3WeLZ5pvdF1NxAf9tKb5atJNP2gRiQnLluW50voa6Y7wfLGJre43Rx/N2Ac222 VpvGyqkbf3qdXGMM4rHfxgfMx8GgWDVNBl9luff7yOJuUhL5u0FkYL0tfdkJsBtr7CGr MKWfvOsi2dIykFLatQ+fBXpUKoU8dVwa73LXxnYCfh+4dn8z4zAFs9VWWWZYsbADf0Ig 0r6GSiRRSr2kmlR6S7KtAR6jt0yO0kzVdzQKPgJjyLPK53NkFn0yGa44YjZV9ZlgJohD hE9YabPkQZF5lNsrgXDxYJ7yIEHhG/SGLmrYWvVknYn1vOqi9oKK/O9o42bjnReVW/yu gFsA== X-Gm-Message-State: AGi0PubNNM4rVi6sHfh7KSxWdHfP+5/gVcd4l1kDKs+TCoaUfJDJmSHO YJxndw7VmHlxssSYLXg3jIYJPtSM5UM= X-Google-Smtp-Source: APiQypIzPovRITb/KF+ItukZ/WXovxLgibrxAGSw/IKzrW5yhypvAhNxgGiVqDQtrWACMhORl74/Dg== X-Received: by 2002:a17:902:9f81:: with SMTP id g1mr4733386plq.269.1586304827473; Tue, 07 Apr 2020 17:13:47 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id o128sm14818190pfb.58.2020.04.07.17.13.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 17:13:46 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 09:13:40 +0900 Message-Id: <20200408001341.65204-1-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 v4 1/2] libavcodec/libaomenc.c: Support gray input 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 decoders, libaomdec and libdav1d, both support grayscale image. However, libaomenc does not support it yet. In this patch, I add a grayscale image support also to libaomenc. Fixes ticket #7599 --- libavcodec/libaomenc.c | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 096aadbe1c..ff79c0af9f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -154,7 +154,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 +163,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, @@ -276,7 +277,9 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, AOMContext av_unused *ctx = avctx->priv_data; enccfg->g_bit_depth = enccfg->g_input_bit_depth = 8; switch (avctx->pix_fmt) { + case AV_PIX_FMT_GRAY8: case AV_PIX_FMT_YUV420P: + enccfg->monochrome = avctx->pix_fmt == AV_PIX_FMT_GRAY8; enccfg->g_profile = FF_PROFILE_AV1_MAIN; *img_fmt = AOM_IMG_FMT_I420; return 0; @@ -288,9 +291,13 @@ static int set_pix_fmt(AVCodecContext *avctx, aom_codec_caps_t codec_caps, enccfg->g_profile = FF_PROFILE_AV1_HIGH; *img_fmt = AOM_IMG_FMT_I444; return 0; + case AV_PIX_FMT_GRAY10: + case AV_PIX_FMT_GRAY12: case AV_PIX_FMT_YUV420P10: case AV_PIX_FMT_YUV420P12: if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) { + enccfg->monochrome = avctx->pix_fmt == AV_PIX_FMT_GRAY10 || + avctx->pix_fmt == AV_PIX_FMT_GRAY12; enccfg->g_bit_depth = enccfg->g_input_bit_depth = avctx->pix_fmt == AV_PIX_FMT_YUV420P10 ? 10 : 12; enccfg->g_profile = @@ -979,12 +986,27 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, if (frame) { rawimg = &ctx->rawimg; - rawimg->planes[AOM_PLANE_Y] = frame->data[0]; - rawimg->planes[AOM_PLANE_U] = frame->data[1]; - rawimg->planes[AOM_PLANE_V] = frame->data[2]; - rawimg->stride[AOM_PLANE_Y] = frame->linesize[0]; - rawimg->stride[AOM_PLANE_U] = frame->linesize[1]; - rawimg->stride[AOM_PLANE_V] = frame->linesize[2]; + if (frame->format == AV_PIX_FMT_GRAY8 || + frame->format == AV_PIX_FMT_GRAY10 || + frame->format == AV_PIX_FMT_GRAY12) { + rawimg->monochrome = 1; + // Information of U and V planes are ignored, + // but must point some valid pointer to avoid SIGSEGV of libaom. + rawimg->planes[AOM_PLANE_Y] = frame->data[0]; + rawimg->planes[AOM_PLANE_U] = frame->data[0]; + rawimg->planes[AOM_PLANE_V] = frame->data[0]; + rawimg->stride[AOM_PLANE_Y] = frame->linesize[0]; + rawimg->stride[AOM_PLANE_U] = frame->linesize[0]; + rawimg->stride[AOM_PLANE_V] = frame->linesize[0]; + } else { + rawimg->monochrome = 0; + rawimg->planes[AOM_PLANE_Y] = frame->data[0]; + rawimg->planes[AOM_PLANE_U] = frame->data[1]; + rawimg->planes[AOM_PLANE_V] = frame->data[2]; + rawimg->stride[AOM_PLANE_Y] = frame->linesize[0]; + rawimg->stride[AOM_PLANE_U] = frame->linesize[1]; + rawimg->stride[AOM_PLANE_V] = frame->linesize[2]; + } timestamp = frame->pts; switch (frame->color_range) { case AVCOL_RANGE_MPEG: @@ -1025,6 +1047,7 @@ static int aom_encode(AVCodecContext *avctx, AVPacket *pkt, } static const enum AVPixelFormat av1_pix_fmts[] = { + AV_PIX_FMT_GRAY8, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, @@ -1032,6 +1055,9 @@ static const enum AVPixelFormat av1_pix_fmts[] = { }; static const enum AVPixelFormat av1_pix_fmts_highbd[] = { + AV_PIX_FMT_GRAY8, + AV_PIX_FMT_GRAY10, + AV_PIX_FMT_GRAY12, AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV444P, From patchwork Wed Apr 8 00:13:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18772 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 0C47544A945 for ; Wed, 8 Apr 2020 03:14:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6F3A68B6E5; Wed, 8 Apr 2020 03:13:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7C22C68B6A4 for ; Wed, 8 Apr 2020 03:13:51 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id g32so2512247pgb.6 for ; Tue, 07 Apr 2020 17:13:51 -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=YytKbfSeO3COwZmrIrLdCqFTrNhD1B4nPS4CEJLtBp8=; b=r1yXY9g6znSGVWAKiTOUre02ff+buS2ossgN8KiQvacD6zpUVifR9gfaLHNPUCI+IY Ek0C91WFe3RojcQCRz5HEiGwqaz9e+/6Q1E1ISFaZAy61awCev7quzMNaybEH3/KogM7 /4KYSY2fPXAxow+shGGo10/uTSziUkKGfnBMZcCEhp4K67KvhkiTDQ9CXnu2uVge0IWQ ET1oeKYsw7xmn/B/q0DB5WwoSq+IqEH8U8vDy6H36qyGe0S2QL3boqFwamF3qw/ge4qb x9z887Y0OtSq1/PiaGt7OKCvkxF/nLi8V/4cIkvoyYM+F/mQv7LNOrSEvWUxFeYf/qUI 9PDg== 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=YytKbfSeO3COwZmrIrLdCqFTrNhD1B4nPS4CEJLtBp8=; b=sTfGwdzfvZrz7F3hEfkYAAsiBFRZ6Cq129m8qrNDreWpNIIjkVSLzTUAu9Z0J6/GXZ xvc+tmjXHl8dn/3oO96LS5TI/Mi4I/xqRwRb5nyfQWMB8VEHore9zyFtFj9kRNXWHfDr VjfOYBLpETwDj8tmPTGNmI2jMKP/hge8dAZyHjyc9lGGqnfsB4q6jjKmZlX5AHSBnjCj M/DPKnNPpIk6JkTxMfCHq1mMVYXmmegHulpxJH7jgYQ5NSTKKiSnqz3t6lGAaMDWAS0u +ake38qUskpAWOCGDcyvMe7jS0NYuvYL8UAR6lFs74eKAccd8m2C1Pjnr+byOCMkB55H X2KA== X-Gm-Message-State: AGi0PuaAYWJiWx+WrLvqSGTjIok0aZ+RYhjkC1SnC0C25H+PCUVLWuWv icPn0JJtAUOgggpi4A9LzwFT4S8ckjU= X-Google-Smtp-Source: APiQypL2vLCj87TjT4nOp5v/vGRSQSybaKYeTFHNCByIPPVgEfhOClWxo3GCRp8fCAUGHbEND+C28A== X-Received: by 2002:a62:1601:: with SMTP id 1mr551101pfw.45.1586304829047; Tue, 07 Apr 2020 17:13:49 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id o128sm14818190pfb.58.2020.04.07.17.13.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 17:13:48 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 09:13:41 +0900 Message-Id: <20200408001341.65204-2-ryo.hirafuji@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200408001341.65204-1-ryo.hirafuji@gmail.com> References: <20200404095341.128020-1-ryo.hirafuji@gmail.com> <20200408001341.65204-1-ryo.hirafuji@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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 | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index ff79c0af9f..cc50ffc11b 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", }; @@ -574,7 +577,9 @@ 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) { + } 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) enccfg.rc_end_usage = AOM_Q; @@ -704,9 +709,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);