From patchwork Tue Jul 28 22:50:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 21346 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 5418544B063 for ; Wed, 29 Jul 2020 01:53:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2510C68B9EB; Wed, 29 Jul 2020 01:53:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AC87E68B96F for ; Wed, 29 Jul 2020 01:52:59 +0300 (EEST) Received: by mail-wm1-f41.google.com with SMTP id 3so1095133wmi.1 for ; Tue, 28 Jul 2020 15:52:59 -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:mime-version :content-transfer-encoding; bh=tP3WK1lBJOj8i8vV0YVaNi0ZUg9rGR4FdBl6ico1HK0=; b=tYPJBnoBHG0xYfLSBtv46o/RTe3lhmd5Ip/dAAhQR0tEqHgKw7KbtRw1cb0cX8TIZB 8MIpSqkwaMK3jxQfNzQ/xFNQIltWrXXCDcJ2BLU5foTHZrhr6A/cVYcP6fb+sqF4pNeF sl9NsFoRlncbENT1AlwFHr3Ye4+Q5uy2Bb4610OIKEXWMFwnd7FHE38O/M8At7G7ROsj icrKxPZPq4al4yiqGdAkyiNo8OgzmLTlBw2wykeyKGm097ec2LT1puGoMoR6vScHIQjv /htBVEQTzUYAHa5XkA9DmUrykApVJaIA1xd/SSfrr9IAEL+dtfY6p6u2mzaZJYIRTp6Y BsDw== 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:mime-version :content-transfer-encoding; bh=tP3WK1lBJOj8i8vV0YVaNi0ZUg9rGR4FdBl6ico1HK0=; b=HSIi1vvwpfWrPY3bicA1z2JCu5eUyYMyfcEOE4qnxAg4mYF90v31l0qnQjscrTVG4o 93BIgtWv+9RKOUZ36npFbhUGwJkW/wSX9bBoQQ3nxUSLyYRQVeMy6tB1r/7oLSzd7cY+ OylAUms/n5EcBhgcDobUi1mokuJugu0DymJXB4ZI2lkrvnuBpoM9mnvPRLTMCvRu4RsB VMZlaJ7v0jVXacclyZBj9X1CVci7J7RfobjHayTsXYM5/thkaSrc0ApAOTyecQHHWvgx L8OYBj2VkfofclXJ/fDQX/nMSdpJ6Al6SvFxaFt2H5G1uJnjmtnSvdptH+gJ17OG5G2p LfpA== X-Gm-Message-State: AOAM532ym8G/JTw1+XGnB4P5LXTgsZj8Pw90x6CtFlJkUbSdbsCkLNIO Nm3O6rLwWyQXD8aE/Pjv0j7wVtNDNoY= X-Google-Smtp-Source: ABdhPJy144i34cjMYbGHBXTCx6Az8B7hd53lKfAyJFgS8iFfOKBcTT1B2lOeD2EEFWv6nmzulgKI9g== X-Received: by 2002:a1c:26c4:: with SMTP id m187mr5842138wmm.90.1595976778259; Tue, 28 Jul 2020 15:52:58 -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.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jul 2020 15:52:57 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 28 Jul 2020 23:50:20 +0100 Message-Id: <20200728225025.1830283-1-sw@jkqxz.net> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] vaapi_encode_h265: Remove confusing and redundant tile options 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" The tile_rows/cols options currently do a confusingly different thing to the options of the same name on other encoders like libvpx and libaom. There is no backward-compatibility reason to implement the log2 behaviour as there was for libaom, so just get rid of them entirely. --- doc/encoders.texi | 8 -------- libavcodec/vaapi_encode_h265.c | 4 ---- 2 files changed, 12 deletions(-) diff --git a/doc/encoders.texi b/doc/encoders.texi index ed8ef63784..c837e9455a 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3206,14 +3206,6 @@ Set the number of tiles to encode the input video with, as rows x columns. Larger numbers allow greater parallelism in both encoding and decoding, but may decrease coding efficiency. -@item tile_rows -Selects how many rows of tiles to encode with. For example, 4 tile rows would -be requested by setting the tile_rows option to 4. - -@item tile_cols -Selects how many columns of tiles to encode with. For example, 5 tile columns -would be requested by setting the tile_cols option to 5. - @end table @item mjpeg_vaapi diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index f6008778df..511218f659 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -1291,10 +1291,6 @@ static const AVOption vaapi_encode_h265_options[] = { { "tiles", "Tile rows x cols", OFFSET(trows), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, FLAGS }, - { "tile_rows", "Number of rows for tile encoding", - OFFSET(trows), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, - { "tile_cols", "Number of cols for tile encoding", - OFFSET(tcols), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, FLAGS }, { NULL }, };