[FFmpeg-devel,3/3] libaomenc: Drop unused noise-sensitivity option

Submitted by Mark Thompson on Nov. 5, 2018, 2:52 p.m.

Details

Message ID 20181105145246.1157-3-sw@jkqxz.net
State Accepted
Commit e3991a5a459af602c888c13ee2a59e9e510a835b
Headers show

Commit Message

Mark Thompson Nov. 5, 2018, 2:52 p.m.
---
On 28/10/18 21:02, Carl Eugen Hoyos wrote:
> 2018-10-28 21:08 GMT+01:00, Mark Thompson <sw@jkqxz.net>:
>> ---
>> This was in the 4.0 release, unfortunately (and did nothing there as well).
> 
> If it has never worked, it can be removed imo.

Sure, here is a new version.

Thanks,

- Mark


 libavcodec/libaomenc.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Mark Thompson Nov. 18, 2018, 6:17 p.m.
On 05/11/18 14:52, Mark Thompson wrote:
> ---
> On 28/10/18 21:02, Carl Eugen Hoyos wrote:
>> 2018-10-28 21:08 GMT+01:00, Mark Thompson <sw@jkqxz.net>:
>>> ---
>>> This was in the 4.0 release, unfortunately (and did nothing there as well).
>>
>> If it has never worked, it can be removed imo.
> 
> Sure, here is a new version.

Ping.

- Mark


>  libavcodec/libaomenc.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
> index c5458766cb..4cad053a48 100644
> --- a/libavcodec/libaomenc.c
> +++ b/libavcodec/libaomenc.c
> @@ -71,7 +71,6 @@ typedef struct AOMEncoderContext {
>      int crf;
>      int static_thresh;
>      int drop_threshold;
> -    int noise_sensitivity;
>      uint64_t sse[4];
>      int have_sse; /**< true if we have pending sse[] */
>      uint64_t frame_number;
> @@ -980,7 +979,6 @@ 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},
>      { "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},
>
Jan Ekström Nov. 18, 2018, 6:34 p.m.
On Mon, Nov 5, 2018 at 4:53 PM Mark Thompson <sw@jkqxz.net> wrote:
>
> ---
> On 28/10/18 21:02, Carl Eugen Hoyos wrote:
> > 2018-10-28 21:08 GMT+01:00, Mark Thompson <sw@jkqxz.net>:
> >> ---
> >> This was in the 4.0 release, unfortunately (and did nothing there as well).
> >
> > If it has never worked, it can be removed imo.
>
> Sure, here is a new version.
>
> Thanks,
>
> - Mark
>
>
>  libavcodec/libaomenc.c | 2 --
>  1 file changed, 2 deletions(-)
>
> diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
> index c5458766cb..4cad053a48 100644
> --- a/libavcodec/libaomenc.c
> +++ b/libavcodec/libaomenc.c
> @@ -71,7 +71,6 @@ typedef struct AOMEncoderContext {
>      int crf;
>      int static_thresh;
>      int drop_threshold;
> -    int noise_sensitivity;
>      uint64_t sse[4];
>      int have_sse; /**< true if we have pending sse[] */
>      uint64_t frame_number;
> @@ -980,7 +979,6 @@ 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},
>      { "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},
> --
> 2.19.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Only two references to noise_sensitivity outside of libvpxenc. LGTM.

Jan
Mark Thompson Nov. 18, 2018, 10:09 p.m.
On 18/11/18 18:34, Jan Ekström wrote:
> On Mon, Nov 5, 2018 at 4:53 PM Mark Thompson <sw@jkqxz.net> wrote:
>>
>> ---
>> On 28/10/18 21:02, Carl Eugen Hoyos wrote:
>>> 2018-10-28 21:08 GMT+01:00, Mark Thompson <sw@jkqxz.net>:
>>>> ---
>>>> This was in the 4.0 release, unfortunately (and did nothing there as well).
>>>
>>> If it has never worked, it can be removed imo.
>>
>> Sure, here is a new version.
>>
>> Thanks,
>>
>> - Mark
>>
>>
>>  libavcodec/libaomenc.c | 2 --
>>  1 file changed, 2 deletions(-)
>>
>> diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
>> index c5458766cb..4cad053a48 100644
>> --- a/libavcodec/libaomenc.c
>> +++ b/libavcodec/libaomenc.c
>> @@ -71,7 +71,6 @@ typedef struct AOMEncoderContext {
>>      int crf;
>>      int static_thresh;
>>      int drop_threshold;
>> -    int noise_sensitivity;
>>      uint64_t sse[4];
>>      int have_sse; /**< true if we have pending sse[] */
>>      uint64_t frame_number;
>> @@ -980,7 +979,6 @@ 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},
>>      { "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},
>> --
>> 2.19.1
>>
> 
> Only two references to noise_sensitivity outside of libvpxenc. LGTM.

Applied.

Thanks,

- Mark

Patch hide | download patch | download mbox

diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index c5458766cb..4cad053a48 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -71,7 +71,6 @@  typedef struct AOMEncoderContext {
     int crf;
     int static_thresh;
     int drop_threshold;
-    int noise_sensitivity;
     uint64_t sse[4];
     int have_sse; /**< true if we have pending sse[] */
     uint64_t frame_number;
@@ -980,7 +979,6 @@  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},
     { "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},