From patchwork Sun Oct 28 20:08:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 10822 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 93ADC44E1DD for ; Sun, 28 Oct 2018 22:08:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0A51368A47D; Sun, 28 Oct 2018 22:08:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4AC07680D3A for ; Sun, 28 Oct 2018 22:07:58 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id u1-v6so6485503wrn.0 for ; Sun, 28 Oct 2018 13:08:28 -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=1M5a0TzrG8k+ri9CJBqYjkTV/EwSiIfftP0M5oBtUGg=; b=gBJ0Xu3qMhhhafXKyjvhCAO0SEF7JSv5eNOEwxczt2LPGvdWVOTjPv46zzU8v5Y3uP 1PpI8ERCCS0GVknRQ456TSCx+/5VAjTZheFFvpkujj2NwH1+1iZCTJsM0vLPREAIL64i W8MjNq02W4g42Fg3jDF1C5avxjAjyzFC+c8XKNdFCxAnrpMtkKK6pOGsNr6Y6OhrGVgp Fuy4ljRpa50wFthyH+0Jq7YfcR4IJq8USOiu4iLwicxFGUrZgVcgANxA3P8zzKiqe3Np ucXc0phDcslvtotmVuESYsfRVBK+m4fHM386xHienNfC1yZFhBnAexm7CFpw7pz1YQYr 5IlA== 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=1M5a0TzrG8k+ri9CJBqYjkTV/EwSiIfftP0M5oBtUGg=; b=rDknqZ1OAZXsregrBch+xYVz2YBvfjbUJyZ3jJvrTCXgtizneyCqwcdlxNmy7zrSuq tjdwoF5RwOJKDNIpa8bzOaVRcn+wPgsTyps6m7hPdKJdia2FwH3ApR6BrhnLvDMUiHGg 1ZXRtUblk4BbSKpBEy/cS4biMJbMUhKqrGnxr1uGGKD0IPV7JN4X0UUdZuawT8eHHm/a ZYKHd8SLMN0DWiZYDa94vukVq6vESnfGCMWu6cJ8tmalGsJhEJ79pYeI787BJn3IJR3X ujbDGtmTPWCEj6YXAdHkkLI8aM4Hg/YbId7sgTBKztmOrwUPNI0qSV88fj3wiNYbuPAQ MopA== X-Gm-Message-State: AGRZ1gLWkGk9XoEKPYuLDSt/vi6RdJ5uGPyliAapHD058i+X9O7+HXhZ GpCNFb1CVyqizYY++dUKpCzQoq0o/c8= X-Google-Smtp-Source: AJdET5cjAXB746qFxwpticikOuDBnnzc/iIH5nFlyq3VN8pQGwk4aOkaUTMcnaE1ttE4VLwcT9NFYQ== X-Received: by 2002:adf:8b5e:: with SMTP id v30-v6mr11377486wra.282.1540757307904; Sun, 28 Oct 2018 13:08:27 -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 c9-v6sm15350840wrh.50.2018.10.28.13.08.25 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Oct 2018 13:08:25 -0700 (PDT) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Oct 2018 20:08:19 +0000 Message-Id: <20181028200819.15139-3-sw@jkqxz.net> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181028200819.15139-1-sw@jkqxz.net> References: <20181028200819.15139-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] libaomenc: Deprecate unused noise-sensitivity option 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" --- This was in the 4.0 release, unfortunately (and did nothing there as well). libavcodec/libaomenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index c5458766cb..0c2eb6517f 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -71,7 +71,7 @@ typedef struct AOMEncoderContext { int crf; int static_thresh; int drop_threshold; - int noise_sensitivity; + int noise_sensitivity_unused; uint64_t sse[4]; int have_sse; /**< true if we have pending sse[] */ uint64_t frame_number; @@ -980,7 +980,7 @@ static const AVOption options[] = { { "crf", "Select the quality for constant quality mode", offsetof(AOMContext, crf), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 63, VE }, { "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}, + { "noise-sensitivity", "Deprecated, this option does nothing", OFFSET(noise_sensitivity_unused), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, 4, VE | AV_OPT_FLAG_DEPRECATED }, { "tiles", "Tile columns x rows", OFFSET(tile_cols), AV_OPT_TYPE_IMAGE_SIZE, { .str = NULL }, 0, 0, VE }, { "tile-columns", "Log2 of number of tile columns to use", OFFSET(tile_cols_log2), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE}, { "tile-rows", "Log2 of number of tile rows to use", OFFSET(tile_rows_log2), AV_OPT_TYPE_INT, {.i64 = -1}, -1, 6, VE},