shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: Modify simple_block_yrd condition for SVC"

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -676,7 +676,9 @@

 #endif

   if (cpi->sf.use_simple_block_yrd && cpi->common.frame_type != KEY_FRAME &&

-      (bsize < BLOCK_32X32 || cpi->use_svc)) {

+      (bsize < BLOCK_32X32 ||

+       (cpi->use_svc &&

+        (bsize < BLOCK_32X32 || cpi->svc.temporal_layer_id > 0)))) {

     unsigned int var_y, sse_y;

     (void)tx_size;

     if (!rd_computed)

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -572,7 +572,7 @@

       sf->mv.search_method = NSTEP;

       sf->mv.fullpel_search_step_param = 6;

     }

-    if (cpi->svc.temporal_layer_id > 0) {

+    if (cpi->svc.temporal_layer_id > 0 || cpi->svc.spatial_layer_id > 1) {

       sf->use_simple_block_yrd = 1;

       if (cpi->svc.non_reference_frame)

         sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_EVENMORE;