diff options
| author | Jerome Jiang <jianj@google.com> | 2019-04-10 21:13:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-10 21:13:46 +0000 |
| commit | ed19362e7723dd24d1949dff3b8490c9e7da9b3c (patch) | |
| tree | 4a7dafa3bd938ead2f8e77e4578b7d369c2b891a | |
| parent | c1b4e5290ea1ff393bd48e3e74204f4685149045 (diff) | |
| parent | 1b9c527c6269bd5ef8eae9dd08183509e69c9cd8 (diff) | |
| download | libvpx-ed19362e7723dd24d1949dff3b8490c9e7da9b3c.tar libvpx-ed19362e7723dd24d1949dff3b8490c9e7da9b3c.tar.gz libvpx-ed19362e7723dd24d1949dff3b8490c9e7da9b3c.tar.bz2 libvpx-ed19362e7723dd24d1949dff3b8490c9e7da9b3c.zip | |
Merge "Revert "Disable mismatch check on vp9 svc examples.""
| -rw-r--r-- | examples/vp9_spatial_svc_encoder.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/vp9_spatial_svc_encoder.c b/examples/vp9_spatial_svc_encoder.c index bd04a52b3..b987989a8 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 |