From patchwork Tue Apr 7 18:03:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18753 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 20D5B44A7D9 for ; Tue, 7 Apr 2020 21:04:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 082F268B685; Tue, 7 Apr 2020 21:04:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 52A3A68B61A for ; Tue, 7 Apr 2020 21:04:25 +0300 (EEST) Received: by mail-pj1-f42.google.com with SMTP id np9so85989pjb.4 for ; Tue, 07 Apr 2020 11:04:25 -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=Fd81fRB03QfNWTp+V9puU6AZUnIAo1SSo3OqThvkyYE=; b=kv9OPgzj+h9dXbweiAf4Td61sZw8pdJOedUe4JuvDEhHzbfuOU7c6UVCXrSsa9oUKy fEPr3EM02p81gKUT6p2h8WaXgnxIEUS0ER7HC0YhWRAYjKufVPOq1IT1qSMkfgAUncPZ RYDY49hnhi3DssNW8h25hFfARvvMT6A1CtPzynXc8bTW55R/0AYcEZ6xKO+Q5riL8avL O9SonLeipSaTusDR0frEFQOOIW1F6+CKDVK9Du8CK8kdYp+peOSXyfXhr99yOTx/BXCU GJ1t/FzYF/r6ymexPplQNqF2NIKsst72JjVJwVSqmkv8mGogYkjVuUtnrvrzPiFEcN0S rmJA== 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=Fd81fRB03QfNWTp+V9puU6AZUnIAo1SSo3OqThvkyYE=; b=JRn3JlAEvb/9u2tEFNKw/FJGhe5MT0fDKlwwPb9dbrefNtQcUDvDQx+5/m6gQh9xx9 1FPez/NATiLchSd/wowDH1yPR3kgMOkuRSxIPEXSzZwpt+3GmMdx83G3N60rbviYWxa6 sPx6foZTMwQ5FQXisy0wYN1hvlEFqaP8pM4aCZJwAnK8xLl7mH+uY+LJiQjFRCd7lt+c 6GAM08FwLKktnM3mO1XMEedsz5h7Wtbv+QUh5DJ/R71yL4KVqGtyX1nlMF1N1v59N0CN x5gVRCoRSld0Xp9tD6UVWHpHSpmdRI0Ie7xFxzVgyQVUlvY4i2OtcRV9nOxUSqR5M6LZ hWlw== X-Gm-Message-State: AGi0PubLP4mXy1kdxqALQGukkuXi0aR1aTmXL3AFEz960ZK8rdvG3aPs 9Oq8oOez7YBF8dESsEfYx9XHVO3Ym9w= X-Google-Smtp-Source: APiQypLS2STilHYa82FQsI7rOZ+IEuHOL4SvEmLZN8lOtuJHFdoYbCn1r1J7os6MzwEropKgRFk//w== X-Received: by 2002:a17:902:fe88:: with SMTP id x8mr3554491plm.295.1586282663036; Tue, 07 Apr 2020 11:04:23 -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.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2020 11:04:22 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Wed, 8 Apr 2020 03:03:50 +0900 Message-Id: <20200407180350.72793-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 v2 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. --- libavcodec/libaomenc.c | 51 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 096aadbe1c..a3c5ae8f54 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,6 +277,25 @@ 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: + enccfg->monochrome = 1u; + enccfg->g_profile = FF_PROFILE_AV1_MAIN; + *img_fmt = AOM_IMG_FMT_I420; + return 0; + case AV_PIX_FMT_GRAY10: + case AV_PIX_FMT_GRAY12: + if (codec_caps & AOM_CODEC_CAP_HIGHBITDEPTH) { + enccfg->monochrome = 1u; + enccfg->g_profile = + avctx->pix_fmt == AV_PIX_FMT_GRAY10 ? FF_PROFILE_AV1_MAIN + : FF_PROFILE_AV1_PROFESSIONAL; + enccfg->g_bit_depth = enccfg->g_input_bit_depth = + avctx->pix_fmt == AV_PIX_FMT_GRAY10 ? 10 : 12; + *img_fmt = AOM_IMG_FMT_I42016; + *flags |= AOM_CODEC_USE_HIGHBITDEPTH; + return 0; + } + break; case AV_PIX_FMT_YUV420P: enccfg->g_profile = FF_PROFILE_AV1_MAIN; *img_fmt = AOM_IMG_FMT_I420; @@ -979,12 +999,25 @@ 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; + 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 +1058,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 +1066,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,