libvpx: Pull from upstream

source/libvpx/test/decode_perf_test.cc

Index: source/libvpx/test/decode_perf_test.cc
===================================================================
--- source/libvpx/test/decode_perf_test.cc	(revision 284462)
+++ source/libvpx/test/decode_perf_test.cc	(working copy)
@@ -29,9 +29,9 @@
 /*
  DecodePerfTest takes a tuple of filename + number of threads to decode with
  */
-typedef std::tr1::tuple<const char *, unsigned> decode_perf_param_t;
+typedef std::tr1::tuple<const char *, unsigned> DecodePerfParam;
 
-const decode_perf_param_t kVP9DecodePerfVectors[] = {
+const DecodePerfParam kVP9DecodePerfVectors[] = {
   make_tuple("vp90-2-bbb_426x240_tile_1x1_180kbps.webm", 1),
   make_tuple("vp90-2-bbb_640x360_tile_1x2_337kbps.webm", 2),
   make_tuple("vp90-2-bbb_854x480_tile_1x2_651kbps.webm", 2),
@@ -47,7 +47,9 @@
   make_tuple("vp90-2-tos_426x178_tile_1x1_181kbps.webm", 1),
   make_tuple("vp90-2-tos_640x266_tile_1x2_336kbps.webm", 2),
   make_tuple("vp90-2-tos_854x356_tile_1x2_656kbps.webm", 2),
+  make_tuple("vp90-2-tos_854x356_tile_1x2_fpm_546kbps.webm", 2),
   make_tuple("vp90-2-tos_1280x534_tile_1x4_1306kbps.webm", 4),
+  make_tuple("vp90-2-tos_1280x534_tile_1x4_fpm_952kbps.webm", 4),
   make_tuple("vp90-2-tos_1920x800_tile_1x4_fpm_2335kbps.webm", 4),
 };
 
@@ -62,7 +64,7 @@
    power/temp/min max frame decode times/etc
  */
 
-class DecodePerfTest : public ::testing::TestWithParam<decode_perf_param_t> {
+class DecodePerfTest : public ::testing::TestWithParam<DecodePerfParam> {
 };
 
 TEST_P(DecodePerfTest, PerfTest) {