Commit 8af64ae5 authored by Tom Finegan's avatar Tom Finegan
Browse files

Silence logical-op warnings in av1/encoder/pickrst.c

Newer gcc's output logical-op warnings when and'ing together
a duplicate condition. In this case it's because a constant
was set to an enum value that was also checked locally.

Change-Id: Iada9571d3e59ec9b75aa446fd6690587092af161
parent d3bbfee8
...@@ -34,8 +34,8 @@ ...@@ -34,8 +34,8 @@
#include "av1/encoder/mathutils.h" #include "av1/encoder/mathutils.h"
// When set to RESTORE_WIENER or RESTORE_SGRPROJ only those are allowed. // When set to RESTORE_WIENER or RESTORE_SGRPROJ only those are allowed.
// When set to RESTORE_NONE (0) we allow switchable. // When set to RESTORE_TYPES we allow switchable.
const RestorationType force_restore_type = RESTORE_NONE; const RestorationType force_restore_type = RESTORE_TYPES;
// Number of Wiener iterations // Number of Wiener iterations
#define NUM_WIENER_ITERS 5 #define NUM_WIENER_ITERS 5
...@@ -1447,7 +1447,7 @@ void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi, ...@@ -1447,7 +1447,7 @@ void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi,
for (int plane = AOM_PLANE_Y; plane <= AOM_PLANE_V; ++plane) { for (int plane = AOM_PLANE_Y; plane <= AOM_PLANE_V; ++plane) {
for (r = 0; r < RESTORE_SWITCHABLE_TYPES; ++r) { for (r = 0; r < RESTORE_SWITCHABLE_TYPES; ++r) {
cost_restore[r] = DBL_MAX; cost_restore[r] = DBL_MAX;
if (force_restore_type != 0) if (force_restore_type != RESTORE_TYPES)
if (r != RESTORE_NONE && r != force_restore_type) continue; if (r != RESTORE_NONE && r != force_restore_type) continue;
cost_restore[r] = cost_restore[r] =
search_restore_fun[r](src, cpi, method == LPF_PICK_FROM_SUBIMAGE, search_restore_fun[r](src, cpi, method == LPF_PICK_FROM_SUBIMAGE,
...@@ -1463,7 +1463,7 @@ void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi, ...@@ -1463,7 +1463,7 @@ void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi,
best_cost_restore = DBL_MAX; best_cost_restore = DBL_MAX;
best_restore = 0; best_restore = 0;
for (r = 0; r < RESTORE_TYPES; ++r) { for (r = 0; r < RESTORE_TYPES; ++r) {
if (force_restore_type != 0) if (force_restore_type != RESTORE_TYPES)
if (r != RESTORE_NONE && r != force_restore_type) continue; if (r != RESTORE_NONE && r != force_restore_type) continue;
if (cost_restore[r] < best_cost_restore) { if (cost_restore[r] < best_cost_restore) {
best_restore = r; best_restore = r;
...@@ -1471,7 +1471,7 @@ void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi, ...@@ -1471,7 +1471,7 @@ void av1_pick_filter_restoration(const YV12_BUFFER_CONFIG *src, AV1_COMP *cpi,
} }
} }
cm->rst_info[plane].frame_restoration_type = best_restore; cm->rst_info[plane].frame_restoration_type = best_restore;
if (force_restore_type != 0) if (force_restore_type != RESTORE_TYPES)
assert(best_restore == force_restore_type || assert(best_restore == force_restore_type ||
best_restore == RESTORE_NONE); best_restore == RESTORE_NONE);
if (best_restore != RESTORE_SWITCHABLE) { if (best_restore != RESTORE_SWITCHABLE) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment