libvpx: Pull from upstream

source/libvpx/test/encode_test_driver.cc

 /*
  *  Copyright (c) 2012 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 25 matching lines @@
 
 #if CONFIG_VP9_ENCODER
     if (CodecInterface() == &vpx_codec_vp9_cx_algo) {
       // Default to 1 tile column for VP9.
       const int log2_tile_columns = 0;
       res = vpx_codec_control_(&encoder_, VP9E_SET_TILE_COLUMNS,
                                log2_tile_columns);
       ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
     } else
 #endif
+#if CONFIG_VP10_ENCODER
+    if (CodecInterface() == &vpx_codec_vp10_cx_algo) {
+      // Default to 1 tile column for VP10.
+      const int log2_tile_columns = 0;
+      res = vpx_codec_control_(&encoder_, VP9E_SET_TILE_COLUMNS,
+                               log2_tile_columns);
+      ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();
+    } else
+#endif
     {
 #if CONFIG_VP8_ENCODER
       ASSERT_EQ(&vpx_codec_vp8_cx_algo, CodecInterface())
           << "Unknown Codec Interface";
 #endif
     }
   }
 }
 
 void Encoder::EncodeFrame(VideoSource *video, const unsigned long frame_flags) {
@@ skipping 207 matching lines @@
     if (decoder)
       delete decoder;
     delete encoder;
 
     if (!Continue())
       break;
   }
 }
 
 }  // namespace libvpx_test