From patchwork Mon Sep 17 23:47:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10353 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:12c4:0:0:0:0:0 with SMTP id 65-v6csp4068977jap; Mon, 17 Sep 2018 16:48:01 -0700 (PDT) X-Google-Smtp-Source: ANB0Vda/xihN/m1VIO2SbtJ9yWrICOiqshLdKtPB/ZZFEA8TMuVwEJA39RaPp7+q2nBYodMg9nVc X-Received: by 2002:adf:b69a:: with SMTP id j26-v6mr20806607wre.55.1537228081604; Mon, 17 Sep 2018 16:48:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537228081; cv=none; d=google.com; s=arc-20160816; b=G8VpLliEx1nehMzy8q54walJT604M3XUM7MSv3F4owoxe8mKu4KnAFT3dD1JYd1+H3 +1rLch+BfAm3N5rJfnqgggwsyVxytmfSvQpU1lh9cas1TMwzKoJjk3oKhU5dErqFESlw hD/K2XadwD86S7OtcBC1BZI5FBSHhsaGp5uPUAbpZfZk9lxTCXwfTtEjKWMySZNGY5/6 gs9oTUTvM6CIziGGe1btF0CJGBcrpW7JbKumby33RC9osMC3gHx1PDUN58NaRE8cMb4o zqEPcnKuoQFiiWWgCzix8vAKOMliub9Pf2y+2Jag/cqWWS2Wp6L+IBctGkudKwRnxgGr W0uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=RkJY6VfVwoF+nIYYUtPbjTaSQucGy3BKSSCaiejYgN8=; b=r/S/1/DHfLXyd5Od6id8GRgbhVW0lHITsTQkNJK+F29CxAQ0mw90RvhF/RXXE9zmOa 3NBxwL1vzDOQ/u3Fe0hJzbntjYqJWhENW3Y0NguHKyTAcA0SXH4TRD5gpnZ+v2qpeXiC AZf3OnA6NDfmUAARRcqKklAaxOMrfJsbeoFxD8q9K0apQmrp0KOmncsFNQ00h0JoBpDW 7jKeR6eqN6MM7B7FALQKoVuwc0eNTJkKlk8VbU6G+7OET7iacx3z17DqMx9r4FH0V6ey RMo04KofufWB32tjsl7vQf7cTP0U8q0O4e7W8yj7W26cPJYaDanXFfad1YmEZClt+t4a Wrhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=e3aG+3o5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id u15-v6si15139937wrr.132.2018.09.17.16.48.00; Mon, 17 Sep 2018 16:48:01 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20150623.gappssmtp.com header.s=20150623 header.b=e3aG+3o5; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A72F68A7B7; Tue, 18 Sep 2018 02:47:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3A29968A704 for ; Tue, 18 Sep 2018 02:47:40 +0300 (EEST) Received: by mail-wm1-f48.google.com with SMTP id j192-v6so514214wmj.1 for ; Mon, 17 Sep 2018 16:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=kYh9a1qIsMKSHBUo3iTYX3F6Bv8kIQrFJbUHLM7j8gI=; b=e3aG+3o5vcLYdZayCeRtvVyPtLWXmdSmzLahWrok/OXFNhpAlpip0nvNYotJgm/Ao3 CMvgTjX7Zu/E6rRGg0lmYmC3PgIFxuluAD2UTdlfY35NvbprK+F4EZ/I99jVee8XVv6u /fsYI1EfE7c798AWYPPgSrdomiedU90XIs/XILrqR9wf+ruvga81m1bj0uwKoeRfP5Nc On+4qYXKpQLqgjK7SyH7//yWKNmU1f+YIuYVWRDBVaX/Q7KXvke7Ul1YTa/grDgkkTfV JJOqbTdvPJl+E/S9ft8xsGNlamsgVcQ+VnazaG2rg5Uz17xRFf7oNHTJmXKoOkbFMoD5 3EYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=kYh9a1qIsMKSHBUo3iTYX3F6Bv8kIQrFJbUHLM7j8gI=; b=ei0qDbKbKcEb5wAP4GB2h6tq+CTWuspRgl9Yt4DQmMnUats86d9qpLluqqjyQtNwR/ 1vLeHgo56tXYTr9exvGOTtDofYEzqaZhrEsLR4633sqiA5oN36Kh1jm+fDTqdMliQoNh 2vfUy7nRNUmICMzMSPWYN3NQDHzYw3TGk9knyfNvnDn5+F8NAmpvTSpPmK1pD+QDn7ov p7eraHP0cRHJ4czFqGpqmPQea7klk2aImFbJhXnGFFLA27tkCAk3eMmYemB5CdlJtaKC DVzbC4fl/KfiRHGOuh6Chg+vUNbf4a4AKxvWYsVJFMZiKLsxpqhIK7LHZeRgrXECOAfm A+zg== X-Gm-Message-State: APzg51DbE5D/lNBvfnBPS9l6MB0Mn/ibbxSCyD4p0IiHiTEyxNORs2LL XJoD54a4KncTfPsJGPpXIDSwu/YSmgU= X-Received: by 2002:a1c:a401:: with SMTP id n1-v6mr13816455wme.125.1537228071905; Mon, 17 Sep 2018 16:47:51 -0700 (PDT) Received: from rywe.jkqxz.net (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id q5-v6sm926567wmd.29.2018.09.17.16.47.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Sep 2018 16:47:51 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Sep 2018 00:47:44 +0100 Message-Id: <20180917234746.27125-1-sw@jkqxz.net> X-Mailer: git-send-email 2.18.0 Subject: [FFmpeg-devel] [PATCH v2 1/3] libaomenc: Add support for tiles 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Adds an option to specify the number of tile rows and columns, then uses equal-sized tiles to fill the frame. --- libavcodec/libaomenc.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 6a79d9b873..3ccff0e0fb 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -68,6 +68,7 @@ typedef struct AOMEncoderContext { int static_thresh; int drop_threshold; int noise_sensitivity; + int tile_cols, tile_rows; } AOMContext; static const char *const ctlidstr[] = { @@ -79,6 +80,7 @@ static const char *const ctlidstr[] = { [AV1E_SET_COLOR_PRIMARIES] = "AV1E_SET_COLOR_PRIMARIES", [AV1E_SET_MATRIX_COEFFICIENTS] = "AV1E_SET_MATRIX_COEFFICIENTS", [AV1E_SET_TRANSFER_CHARACTERISTICS] = "AV1E_SET_TRANSFER_CHARACTERISTICS", + [AV1E_SET_SUPERBLOCK_SIZE] = "AV1E_SET_SUPERBLOCK_SIZE", }; static av_cold void log_encoder_error(AVCodecContext *avctx, const char *desc) @@ -143,6 +145,10 @@ static av_cold void dump_enc_cfg(AVCodecContext *avctx, width, "kf_mode:", cfg->kf_mode, width, "kf_min_dist:", cfg->kf_min_dist, width, "kf_max_dist:", cfg->kf_max_dist); + av_log(avctx, level, "tile settings\n" + " %*s%d\n %*s%d\n", + width, "tile_width_count:", cfg->tile_width_count, + width, "tile_height_count:", cfg->tile_height_count); av_log(avctx, level, "\n"); } @@ -294,6 +300,7 @@ static av_cold int aom_init(AVCodecContext *avctx, int res; aom_img_fmt_t img_fmt; aom_codec_caps_t codec_caps = aom_codec_get_caps(iface); + aom_superblock_size_t superblock_size = AOM_SUPERBLOCK_SIZE_DYNAMIC; av_log(avctx, AV_LOG_INFO, "%s\n", aom_codec_version_str()); av_log(avctx, AV_LOG_VERBOSE, "%s\n", aom_codec_build_config()); @@ -431,6 +438,50 @@ static av_cold int aom_init(AVCodecContext *avctx, enccfg.g_error_resilient = ctx->error_resilient; + if (ctx->tile_cols && ctx->tile_rows) { + int sb_size, sb_width, sb_height; + int cols_per_tile, cols_step, rows_per_tile, rows_step, i; + + // Default to 128x128 superblocks if they fit, otherwise use 64x64. + if ((avctx->width + 127) / 128 < ctx->tile_cols || + (avctx->height + 127) / 128 < ctx->tile_rows) { + sb_size = 64; + superblock_size = AOM_SUPERBLOCK_SIZE_64X64; + } else { + sb_size = 128; + superblock_size = AOM_SUPERBLOCK_SIZE_128X128; + } + + if ((avctx->width + sb_size - 1) / sb_size < ctx->tile_cols || + (avctx->height + sb_size - 1) / sb_size < ctx->tile_rows) { + av_log(avctx, AV_LOG_ERROR, "Invalid tile sizing: frame not " + "large enough to fit specified tile arrangement.\n"); + return AVERROR(EINVAL); + } + if (ctx->tile_cols > MAX_TILE_WIDTHS || + ctx->tile_rows > MAX_TILE_HEIGHTS) { + av_log(avctx, AV_LOG_ERROR, "Invalid tile sizing: at most %dx%d " + "tiles allowed.\n", MAX_TILE_WIDTHS, MAX_TILE_HEIGHTS); + return AVERROR(EINVAL); + } + + enccfg.tile_width_count = ctx->tile_cols; + enccfg.tile_height_count = ctx->tile_rows; + + sb_width = (avctx->width + sb_size - 1) / sb_size; + sb_height = (avctx->height + sb_size - 1) / sb_size; + + cols_per_tile = sb_width / ctx->tile_cols; + cols_step = sb_width % ctx->tile_cols; + for (i = 0; i < ctx->tile_cols; i++) + enccfg.tile_widths[i] = cols_per_tile + (i < cols_step); + + rows_per_tile = sb_height / ctx->tile_rows; + rows_step = sb_height % ctx->tile_rows; + for (i = 0; i < ctx->tile_rows; i++) + enccfg.tile_heights[i] = rows_per_tile + (i < rows_step); + } + dump_enc_cfg(avctx, &enccfg); /* Construct Encoder Context */ res = aom_codec_enc_init(&ctx->encoder, iface, &enccfg, flags); @@ -454,6 +505,8 @@ static av_cold int aom_init(AVCodecContext *avctx, codecctl_int(avctx, AV1E_SET_TRANSFER_CHARACTERISTICS, avctx->color_trc); set_color_range(avctx); + codecctl_int(avctx, AV1E_SET_SUPERBLOCK_SIZE, superblock_size); + // provide dummy value to initialize wrapper, values will be updated each _encode() aom_img_wrap(&ctx->rawimg, img_fmt, avctx->width, avctx->height, 1, (unsigned char*)1); @@ -742,6 +795,7 @@ static const AVOption options[] = { { "static-thresh", "A change threshold on blocks below which they will be skipped by the encoder", OFFSET(static_thresh), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "drop-threshold", "Frame drop threshold", offsetof(AOMContext, drop_threshold), AV_OPT_TYPE_INT, {.i64 = 0 }, INT_MIN, INT_MAX, VE }, { "noise-sensitivity", "Noise sensitivity", OFFSET(noise_sensitivity), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 4, VE}, + { "tiles", "Tile rows x columns", OFFSET(tile_cols), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, VE }, { NULL } };