libvpx: Pull from upstream

source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc

Index: source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
diff --git a/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc b/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
index 2049466a0ce532a36a9d27cf813faf889722be4d..a02070e43a6fb8b32b957da30bd7b5a638287902 100644
--- a/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
+++ b/source/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
@@ -86,17 +86,17 @@ int is_extension_y4m(const char *filename) {
     return !strcmp(dot, ".y4m");
 }
 
-class Vp9EncoderParmsGetToDecoder
+class VpxEncoderParmsGetToDecoder
     : public ::libvpx_test::EncoderTest,
       public ::libvpx_test::CodecTestWith2Params<EncodeParameters, \
                                                  EncodePerfTestVideo> {
  protected:
-  Vp9EncoderParmsGetToDecoder()
+  VpxEncoderParmsGetToDecoder()
       : EncoderTest(GET_PARAM(0)),
         encode_parms(GET_PARAM(1)) {
   }
 
-  virtual ~Vp9EncoderParmsGetToDecoder() {}
+  virtual ~VpxEncoderParmsGetToDecoder() {}
 
   virtual void SetUp() {
     InitializeConfig();
@@ -166,7 +166,7 @@ class Vp9EncoderParmsGetToDecoder
 
 // TODO(hkuang): This test conflicts with frame parallel decode. So disable it
 // for now until fix.
-TEST_P(Vp9EncoderParmsGetToDecoder, DISABLED_BitstreamParms) {
+TEST_P(VpxEncoderParmsGetToDecoder, DISABLED_BitstreamParms) {
   init_flags_ = VPX_CODEC_USE_PSNR;
 
   libvpx_test::VideoSource *video;
@@ -187,8 +187,12 @@ TEST_P(Vp9EncoderParmsGetToDecoder, DISABLED_BitstreamParms) {
 }
 
 VP9_INSTANTIATE_TEST_CASE(
-    Vp9EncoderParmsGetToDecoder,
+    VpxEncoderParmsGetToDecoder,
     ::testing::ValuesIn(kVP9EncodeParameterSet),
     ::testing::ValuesIn(kVP9EncodePerfTestVectors));
 
+VP10_INSTANTIATE_TEST_CASE(
+    VpxEncoderParmsGetToDecoder,
+    ::testing::ValuesIn(kVP9EncodeParameterSet),
+    ::testing::ValuesIn(kVP9EncodePerfTestVectors));
 }  // namespace