From patchwork Tue Jul 28 22:50:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21347 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 4C7D644B063 for ; Wed, 29 Jul 2020 01:53:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 33D5C68B9F3; Wed, 29 Jul 2020 01:53:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E58E68B99A for ; Wed, 29 Jul 2020 01:53:00 +0300 (EEST) Received: by mail-wm1-f49.google.com with SMTP id 184so1105685wmb.0 for ; Tue, 28 Jul 2020 15:53:00 -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:in-reply-to:references:mime-version :content-transfer-encoding; bh=OsX31h4ixFZ5BTnut4UPfMoKDIsQwLr4fJ3ZVCchjgk=; b=fFNqhc5pZncTNTsL0RJx2P6yImM3ntQH41R8owzJAFMaMVDm41HOG6/Igc2avL+Gxx jrBDB776GtGfkTL3jqEOu/rRfnDQSVVhfFfkqCHXwxO/h5WubuL50hh6Vn56S2ISOvRz s7Un/IX94fbbi4SDKXKaTEkLSU4TqatTkImyXXiVpiKjqW04+dctsMxBoFaklCoa739V d8q0E1U7Uzu8USh2Gsuc4t1VO3VaUBUMWc4TUYSSu/W+MK+PFOY74cmCI4QjWXmkRyA2 ZX8NdUOSmZXJqvRCjz4IFK9UN5lMBogIavhgTTzi6ogjq2/8N/Kxb7DrvuSJ8yVJu675 +o6g== 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=OsX31h4ixFZ5BTnut4UPfMoKDIsQwLr4fJ3ZVCchjgk=; b=V4C7OpErPdgA4noHQOztg49W+SSyL7B9lcq7sWOHKBS3abb0GtmrBohLOHs43+mMMb sQMUM0Ms6Q0NS3qIA+QfZeRe+Lmm0pmFyibP0GnTx4jIkFUmJ/wKvqHjiiBNmAFv1cUs FTeBufCA2Bw5n/4FnfPbdw7o1F/uZYwtG6Pq0Ccl73mU/QDoDMXq/G8Bxcu3c22vDZKd pr2HVJYMdZDGmYl/5QvsxacQCGh12VTBc8/Ctok4+s/fVaeDMdvXAbcOcXgDu52cx/sr PZQaqq6T/+EyvgjAdmO5jRJ5a36x5P4jdyG8Pf2Any7QBsKFuXuaoMRC/uKEqz6/f1+R LyDA== X-Gm-Message-State: AOAM5329uq1Ihr2wdm71HMuO3mekOzV/Gvii+iDoXjttSApPjheUzsEE U+Dw2Rlm9IdGfBhrVl1Vzyd0n6Z9OgQ= X-Google-Smtp-Source: ABdhPJy9TZkzlHchnWTR8n8YYZKlRDrv/tZ+f3J703bOueS/psENBrkmDmnkLLNvt2YgUAQWVotRGQ== X-Received: by 2002:a1c:2e17:: with SMTP id u23mr5739535wmu.142.1595976779325; Tue, 28 Jul 2020 15:52:59 -0700 (PDT) Received: from localhost.localdomain (cpc91242-cmbg18-2-0-cust650.5-4.cable.virginm.net. [82.8.130.139]) by smtp.gmail.com with ESMTPSA id 5sm629197wmk.9.2020.07.28.15.52.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 15:52:58 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 23:50:21 +0100 Message-Id: <20200728225025.1830283-2-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200728225025.1830283-1-sw@jkqxz.net> References: <20200728225025.1830283-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/6] vaapi_encode_h265: Fix ordering of tile dimensions 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Dimensions are normally specified as width x height. Remove the indirection through the private context at the same time. --- doc/encoders.texi | 2 +- libavcodec/vaapi_encode.h | 2 +- libavcodec/vaapi_encode_h265.c | 13 +++---------- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index c837e9455a..62258370c6 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3202,7 +3202,7 @@ messages). @end table @item tiles -Set the number of tiles to encode the input video with, as rows x columns. +Set the number of tiles to encode the input video with, as columns x rows. Larger numbers allow greater parallelism in both encoding and decoding, but may decrease coding efficiency. diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 6487a99604..2d71eb0199 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -307,8 +307,8 @@ typedef struct VAAPIEncodeContext { int slice_size; // Tile encoding. - int tile_rows; int tile_cols; + int tile_rows; // Tile width of the i-th column. int col_width[MAX_TILE_COLS]; // Tile height of i-th row. diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 511218f659..04bd2bef1d 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -63,9 +63,6 @@ typedef struct VAAPIEncodeH265Context { int level; int sei; - int trows; - int tcols; - // Derived settings. int fixed_qp_idr; int fixed_qp_p; @@ -1208,11 +1205,6 @@ static av_cold int vaapi_encode_h265_init(AVCodecContext *avctx) if (priv->qp > 0) ctx->explicit_qp = priv->qp; - if (priv->trows && priv->tcols) { - ctx->tile_rows = priv->trows; - ctx->tile_cols = priv->tcols; - } - return ff_vaapi_encode_init(avctx); } @@ -1289,8 +1281,9 @@ static const AVOption vaapi_encode_h265_options[] = { { .i64 = SEI_MASTERING_DISPLAY | SEI_CONTENT_LIGHT_LEVEL }, INT_MIN, INT_MAX, FLAGS, "sei" }, - { "tiles", "Tile rows x cols", - OFFSET(trows), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, FLAGS }, + { "tiles", "Tile columns x rows", + OFFSET(common.tile_cols), AV_OPT_TYPE_IMAGE_SIZE, + { .str = NULL }, 0, 0, FLAGS }, { NULL }, };