Add VP9 encode support to the remoting host.

remoting/codec/video_decoder_vpx_unittest.cc

Index: remoting/codec/video_decoder_vpx_unittest.cc
diff --git a/remoting/codec/video_decoder_vpx_unittest.cc b/remoting/codec/video_decoder_vpx_unittest.cc
index eab0274ec671d4787bee2f305165e8ef606609f9..63cf870ba409f2cba51028691230ee5f2664d250 100644
--- a/remoting/codec/video_decoder_vpx_unittest.cc
+++ b/remoting/codec/video_decoder_vpx_unittest.cc
@@ -12,6 +12,8 @@
 
 namespace remoting {
 
+namespace {
+
 class VideoDecoderVpxTest : public testing::Test {
  protected:
   scoped_ptr<VideoEncoderVpx> encoder_;
@@ -32,49 +34,121 @@ class VideoDecoderVpxTest : public testing::Test {
   }
 };
 
-TEST_F(VideoDecoderVpxTest, VideoEncodeAndDecode) {
+class VideoDecoderVp8Test : public VideoDecoderVpxTest {
+ protected:
+  VideoDecoderVp8Test() {
+    encoder_ = VideoEncoderVpx::CreateForVP8();
+    decoder_ = VideoDecoderVpx::CreateForVP8();
+  }
+};
+
+class VideoDecoderVp9Test : public VideoDecoderVpxTest {
+ protected:
+  VideoDecoderVp9Test() {
+    encoder_ = VideoEncoderVpx::CreateForVP9();
+    decoder_ = VideoDecoderVpx::CreateForVP9();
+  }
+};
+
+}  // namespace
+
+//
+// Test the VP8 codec.
+//
+
+TEST_F(VideoDecoderVp8Test, VideoEncodeAndDecode) {
+  TestVideoEncoderDecoder(encoder_.get(), decoder_.get(), false);
+}
+
+// Check that encoding and decoding a particular frame doesn't change the
+// frame too much. The frame used is a gradient, which does not contain sharp
+// transitions, so encoding lossiness should not be too high.
+TEST_F(VideoDecoderVp8Test, Gradient) {
+  TestGradient(320, 240, 320, 240, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleUpEvenToEven) {
+  TestGradient(320, 240, 640, 480, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleUpEvenToOdd) {
+  TestGradient(320, 240, 641, 481, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleUpOddToEven) {
+  TestGradient(321, 241, 640, 480, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleUpOddToOdd) {
+  TestGradient(321, 241, 641, 481, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleDownEvenToEven) {
+  TestGradient(320, 240, 160, 120, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleDownEvenToOdd) {
+  // The maximum error is non-deterministic. The mean error is not too high,
+  // which suggests that the problem is restricted to a small area of the output
+  // image. See crbug.com/139437 and crbug.com/139633.
+  TestGradient(320, 240, 161, 121, 1.0, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleDownOddToEven) {
+  TestGradient(321, 241, 160, 120, 0.04, 0.02);
+}
+
+TEST_F(VideoDecoderVp8Test, GradientScaleDownOddToOdd) {
+  TestGradient(321, 241, 161, 121, 0.04, 0.02);
+}
+
+//
+// Test the VP9 codec.
+//
+
+TEST_F(VideoDecoderVp9Test, VideoEncodeAndDecode) {
   TestVideoEncoderDecoder(encoder_.get(), decoder_.get(), false);
 }
 
 // Check that encoding and decoding a particular frame doesn't change the
 // frame too much. The frame used is a gradient, which does not contain sharp
 // transitions, so encoding lossiness should not be too high.
-TEST_F(VideoDecoderVpxTest, Gradient) {
+TEST_F(VideoDecoderVp9Test, Gradient) {
   TestGradient(320, 240, 320, 240, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleUpEvenToEven) {
+TEST_F(VideoDecoderVp9Test, GradientScaleUpEvenToEven) {
   TestGradient(320, 240, 640, 480, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleUpEvenToOdd) {
+TEST_F(VideoDecoderVp9Test, GradientScaleUpEvenToOdd) {
   TestGradient(320, 240, 641, 481, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleUpOddToEven) {
+TEST_F(VideoDecoderVp9Test, GradientScaleUpOddToEven) {
   TestGradient(321, 241, 640, 480, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleUpOddToOdd) {
+TEST_F(VideoDecoderVp9Test, GradientScaleUpOddToOdd) {
   TestGradient(321, 241, 641, 481, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleDownEvenToEven) {
+TEST_F(VideoDecoderVp9Test, GradientScaleDownEvenToEven) {
   TestGradient(320, 240, 160, 120, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleDownEvenToOdd) {
+TEST_F(VideoDecoderVp9Test, GradientScaleDownEvenToOdd) {
   // The maximum error is non-deterministic. The mean error is not too high,
   // which suggests that the problem is restricted to a small area of the output
   // image. See crbug.com/139437 and crbug.com/139633.
   TestGradient(320, 240, 161, 121, 1.0, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleDownOddToEven) {
+TEST_F(VideoDecoderVp9Test, GradientScaleDownOddToEven) {
   TestGradient(321, 241, 160, 120, 0.04, 0.02);
 }
 
-TEST_F(VideoDecoderVpxTest, GradientScaleDownOddToOdd) {
+TEST_F(VideoDecoderVp9Test, GradientScaleDownOddToOdd) {
   TestGradient(321, 241, 161, 121, 0.04, 0.02);
 }