From patchwork Sat Apr 4 09:53: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: 18630 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 1D85F44B0CE for ; Sat, 4 Apr 2020 12:53:56 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EE01468B1E0; Sat, 4 Apr 2020 12:53:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36BF068AD2F for ; Sat, 4 Apr 2020 12:53:49 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id w3so3831142plz.5 for ; Sat, 04 Apr 2020 02:53:49 -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:mime-version :content-transfer-encoding; bh=aXQXgk04V0BjMAha/y+NdaWEPCV54Zfh3fKvH3f7rXU=; b=cZqMv2E55RZP2ZTAQRPbfNEAx716clR35JDVYpXD9gG3bptztjFg8WMzyfpA2rQfic yesNJbp7NmlEzf4+cxUlDv2jKoWl/3GgJMPKVYSQRhVspXmujMLBvQ38ehwB6WagG4vd 9SZw9fp7ObRqOQjuQ0WHH4T70vWVTUUUUWrTw6vCfVy9DuAlryoSoTYXBik+5dvmzNn8 s5vqDf2W1utCFPPLoOEjTQ+2U0FLTCiUK1/v8kPIgqlwETjasuNndELwT2aXPlw5L11A lJvZFJw7CNCt8N7IE1PRn45xZxOZAORv2ChhF/Es4xUnE61ApB4ZQ7+ZUSH/fZ11862k l+3Q== 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:mime-version :content-transfer-encoding; bh=aXQXgk04V0BjMAha/y+NdaWEPCV54Zfh3fKvH3f7rXU=; b=LaTo86jbYXuDglzgAYhV41f/V1WWnYBeurBpbZgRIYQxxKynP6pGM/tkoqHWQmlHGO zWvK3Uj267vML1pFC9WgUM34dspFWU2Qci7GwqYttJYybRlWI/Jl5cLC5TqkUswe1wqL S6ceRq9CPzivVnuKgAZIR7YLE1tT6w0eIJBzBKnZPbfN1JvQGvEqrzZiOXcuLEn+TC07 /yqOf9oz8rXtlv5Jc1Jyy265ZiVyGqkFOCukOK2EOXsZjVqzTotR1eTy6SK7Oh/Bn3Wh tOIg2ACPO/JmM/fhvhWV5sCFCROGE1J2dUtHIr2/WTRLw53Fi8D5saFa/UqQcLlk4kI1 Tg9w== X-Gm-Message-State: AGi0PuatQrYiro4dhOyxPcIQi4lu11qtkJwT/p96hig76m/QEz7iHoPD dIegc/3Ix5YL6MkbVfW+JOQSRaxrxvk= X-Google-Smtp-Source: APiQypK/hK8GyUu7COZpd4wFdCHxRIuI+R8QmX7Lx77cO47OLwVWYNKZOl4pZxnTwho/vdIihRa0QQ== X-Received: by 2002:a17:90a:c20b:: with SMTP id e11mr14775905pjt.57.1585994027040; Sat, 04 Apr 2020 02:53:47 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id x27sm7467098pfj.74.2020.04.04.02.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 02:53:46 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Apr 2020 18:53:40 +0900 Message-Id: <20200404095341.128020-1-ryo.hirafuji@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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" 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 | 48 ++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 096aadbe1c..fb61ce82e2 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -276,6 +276,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_I420; + *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 +998,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 +1057,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 +1065,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 Sat Apr 4 09:56:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryo Hirafuji X-Patchwork-Id: 18631 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 6E77E449843 for ; Sat, 4 Apr 2020 12:56:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5083968B1E1; Sat, 4 Apr 2020 12:56:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E737A689AA2 for ; Sat, 4 Apr 2020 12:56:52 +0300 (EEST) Received: by mail-pg1-f174.google.com with SMTP id d17so4902338pgo.0 for ; Sat, 04 Apr 2020 02:56:52 -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:mime-version :content-transfer-encoding; bh=tpatbBOD98ivA0Q9El8+w3SB3J/RI1+IgnzDs3oAI5I=; b=LGslkm4L+WaY9bCy/MjxxizEjarhyLDKcJikM/nAM6yahGlReeMBbTXOfKVJZy3xaO USNJaZMO0kMxX+bFtSOOmqAD/EVkqGpX+NwXw4H7OyBJEPsnqRXD+cwROsH5DDn6reKJ 3kFs9skbAnD7rzn8a9du7XVp7gkijigEk8v5R1iV3/pm74jl22SE7jJwanj9o2qHKhM3 phOXB3q7z4xOUcGq0gILG6mzsgyfigY8DObuhompZ3+DAFvU1qGfM4ZMWlmud7qsTwiD 3qo2jWMPzJmb48cPzBv7hRJk5cUeitPIq/lQD7+LpRzF5G62VCcFTXyFUPdYRaXjynUY 7nYg== 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:mime-version :content-transfer-encoding; bh=tpatbBOD98ivA0Q9El8+w3SB3J/RI1+IgnzDs3oAI5I=; b=pyeQkWtfX3IrJ940DHDRt6zqY//lwcReTnG9m/30munuJyXmEnKEMOoEL9l20SE8EA m2AKFXqFpnlZFMdQuQG24Z5kUN4ppV86XjxWgfz+XpXqyBtAV1uDb149ZwKLQ1gT0Ujz 1rQlBFEq8gsEOUrTE2D5kQr4M0dDgiZEOodKkRiLpLG5/Bx6V408DYqeeJvUC6NvhVdo KdGFvJEZFYQ8cOcnoPBF/0M6QI6oZWYM9CPiMWOssrGGkYiGCZzL2h1Fee4nhzddHe92 PxEtjhvaiJt9kJrjCmmNVl4fnBs7vqKrW66LlWbZlr/+Z1vxzJvnAFfJHLaESAXv5Ith hbAg== X-Gm-Message-State: AGi0PuaOxsWQDtyihTpEn+6o6xtjS69ptk1hwvdJ9YfZJg8GEWDAIl1H 6uB5+XGTyDEhQnLwST/yXFg1dQ+25GQ= X-Google-Smtp-Source: APiQypKgYNihFtSFbC2r77QNvnmbl3XK6CFQBfOskxClObihv9IP7cUKHD20/mIygxudnCvTHCTdsQ== X-Received: by 2002:a63:8c56:: with SMTP id q22mr12288946pgn.154.1585994211016; Sat, 04 Apr 2020 02:56:51 -0700 (PDT) Received: from localhost.localdomain (p2228151-ipngn9902souka.saitama.ocn.ne.jp. [153.162.21.151]) by smtp.gmail.com with ESMTPSA id z15sm7503466pfg.152.2020.04.04.02.56.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Apr 2020 02:56:50 -0700 (PDT) From: Ryo Hirafuji To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Apr 2020 18:56:43 +0900 Message-Id: <20200404095643.128435-2-ryo.hirafuji@gmail.com> X-Mailer: git-send-email 2.20.1 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 }, };