shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: SVC: Enable simple_block_yrd for temporal layers."

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

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

@@ -670,7 +670,7 @@

 #endif

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

-      bsize < BLOCK_32X32) {

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

     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

@@ -550,8 +550,10 @@

       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) {

       sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_EVENMORE;

+      sf->use_simple_block_yrd = 1;

+    }

     if (!cpi->external_resize) sf->use_source_sad = 1;

     if (sf->use_source_sad) {

       if (cpi->content_state_sb_fd == NULL &&