shithub: libvpx

Download patch

ref: 486db59cb1c8d71755c829be13a087476186cd2f
parent: bbfa9f69596b51cc53ac336733f17137989af1a9
parent: 29af074fb5b633c0483ca7aa38155cd656f68e8b
author: Jingning Han <jingning@google.com>
date: Mon Mar 10 15:03:09 EDT 2014 

Merge "Fix use of uninitialized bsize in non-RD mode"


--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -707,7 +707,6 @@
   if (speed >= 5) {
     sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
     sf->partition_search_type = FIXED_PARTITION;
-    sf->always_this_block_size = BLOCK_16X16;
     sf->tx_size_search_method = frame_is_intra_only(cm) ?
       USE_FULL_RD : USE_LARGESTALL;
     sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH |
@@ -943,6 +942,9 @@
   for (i = 0; i < BLOCK_SIZES; ++i)
     sf->disable_inter_mode_mask[i] = 0;
   sf->max_intra_bsize = BLOCK_64X64;
+  // This setting only takes effect when partition_search_type is set
+  // to FIXED_PARTITION.
+  sf->always_this_block_size = BLOCK_16X16;
 
   switch (cpi->oxcf.mode) {
     case MODE_BESTQUALITY:
-- 
⑨