From: Jerome Jiang <jianj@google.com>
Date: Wed, 10 Apr 2019 17:29:23 +0000 (-0700)
Subject: Revert "Disable mismatch check on vp9 svc examples."
X-Git-Tag: v1.8.1~126^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b9c527c6269bd5ef8eae9dd08183509e69c9cd8;p=platform%2Fupstream%2Flibvpx.git

Revert "Disable mismatch check on vp9 svc examples."

This reverts commit a1857812ea6a727d9bda91b852f7b8a9f506ac3f.

Change-Id: Ib33f49af7631c9a6917539a58c447624df325f7f
---

diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c
index bd04a52..b987989 100644
--- a/examples/vp9_spatial_svc_encoder.c
+++ b/examples/vp9_spatial_svc_encoder.c
@@ -1196,8 +1196,7 @@ int main(int argc, const char **argv) {
       vpx_codec_control(&encoder, VP9E_GET_SVC_LAYER_ID, &layer_id);
       // Don't look for mismatch on top spatial and top temporal layers as they
       // are non reference frames.
-      // TODO(jianj): Investigate mismatch on 3SL when denoiser is on.
-      if (enc_cfg.ss_number_layers == 1 &&
+      if ((enc_cfg.ss_number_layers > 1 || enc_cfg.ts_number_layers > 1) &&
           !(layer_id.temporal_layer_id > 0 &&
             layer_id.temporal_layer_id == (int)enc_cfg.ts_number_layers - 1 &&
             cx_pkt->data.frame