libvpx: Pull from upstream

source/libvpx/test/test_vector_test.cc

 /*
  *  Copyright (c) 2013 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 11 matching lines @@
 #include "test/util.h"
 #if CONFIG_WEBM_IO
 #include "test/webm_video_source.h"
 #endif
 #include "vpx_mem/vpx_mem.h"
 
 namespace {
 
 enum DecodeMode {
   kSerialMode,
-  kFrameParallMode
+  kFrameParallelMode
 };
 
 const int kDecodeMode = 0;
 const int kThreads = 1;
 const int kFileName = 2;
 
 typedef std::tr1::tuple<int, int, const char*> DecodeParam;
 
 class TestVectorTest : public ::libvpx_test::DecoderTest,
     public ::libvpx_test::CodecTestWithParam<DecodeParam> {
@@ skipping 45 matching lines @@
 TEST_P(TestVectorTest, MD5Match) {
   const DecodeParam input = GET_PARAM(1);
   const std::string filename = std::tr1::get<kFileName>(input);
   const int threads = std::tr1::get<kThreads>(input);
   const int mode = std::tr1::get<kDecodeMode>(input);
   libvpx_test::CompressedVideoSource *video = NULL;
   vpx_codec_flags_t flags = 0;
   vpx_codec_dec_cfg_t cfg = {0};
   char str[256];
 
-  if (mode == kFrameParallMode) {
+  if (mode == kFrameParallelMode) {
     flags |= VPX_CODEC_USE_FRAME_THREADING;
   }
 
   cfg.threads = threads;
 
   snprintf(str, sizeof(str) / sizeof(str[0]) - 1,
            "file: %s  mode: %s threads: %d",
            filename.c_str(), mode == 0 ? "Serial" : "Parallel", threads);
   SCOPED_TRACE(str);
 
@@ skipping 54 matching lines @@
         ::testing::Values(
             static_cast<const libvpx_test::CodecFactory *>(&libvpx_test::kVP9)),
         ::testing::Combine(
             ::testing::Values(1),        // Frame Parallel mode.
             ::testing::Range(2, 9),      // With 2 ~ 8 threads.
             ::testing::ValuesIn(libvpx_test::kVP9TestVectors,
                                 libvpx_test::kVP9TestVectors +
                                     libvpx_test::kNumVP9TestVectors))));
 #endif
 }  // namespace