shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Minor code cleanup"

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -3284,9 +3284,9 @@

     }

     vp9_zero(x->zcoeff_blk);

-    if (cpi->sf.partition_search_type == SOURCE_VAR_BASED_PARTITION &&

+    if (sf->partition_search_type == SOURCE_VAR_BASED_PARTITION &&

         cm->current_video_frame > 0) {

-      int check_freq = cpi->sf.search_type_check_frequency;

+      int check_freq = sf->search_type_check_frequency;

       if ((cm->current_video_frame - 1) % check_freq == 0) {

         cpi->use_large_partition_rate = 0;

@@ -3303,7 +3303,7 @@

       if ((cm->current_video_frame - 1) % check_freq >= 1) {

         if (cpi->use_large_partition_rate < 15)

-          cpi->sf.partition_search_type = FIXED_PARTITION;

+          sf->partition_search_type = FIXED_PARTITION;

       }

     }

   }

-- 

⑨