Index: remoting/codec/video_encoder_vpx_unittest.cc |
diff --git a/remoting/codec/video_encoder_vpx_unittest.cc b/remoting/codec/video_encoder_vpx_unittest.cc |
index 98b39917b0dcf414fc298557cb8864c28640ff74..efe07d2b5e296c77c0a86919f315f5a64640f608 100644 |
--- a/remoting/codec/video_encoder_vpx_unittest.cc |
+++ b/remoting/codec/video_encoder_vpx_unittest.cc |
@@ -39,19 +39,19 @@ static scoped_ptr<webrtc::DesktopFrame> CreateTestFrame( |
return frame.Pass(); |
} |
-TEST(VideoEncoderVpxTest, TestVp8VideoEncoder) { |
+TEST(VideoEncoderVpxTest, Vp8) { |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP8()); |
TestVideoEncoder(encoder.get(), false); |
} |
-TEST(VideoEncoderVpxTest, TestVp9VideoEncoder) { |
+TEST(VideoEncoderVpxTest, Vp9) { |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP9()); |
// VP9 encoder defaults to lossless encode and lossy (I420) color. |
TestVideoEncoder(encoder.get(), false); |
} |
// Test that the VP9 encoder can switch between lossy & lossless encode. |
-TEST(VideoEncoderVpxTest, TestVp9VideoEncoderLossyEncode) { |
+TEST(VideoEncoderVpxTest, Vp9LossyEncodeSwitching) { |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP9()); |
webrtc::DesktopSize frame_size(1024, 768); |
@@ -77,7 +77,7 @@ TEST(VideoEncoderVpxTest, TestVp9VideoEncoderLossyEncode) { |
} |
// Test that the VP9 encoder can switch between lossy & lossless color. |
-TEST(VideoEncoderVpxTest, TestVp9VideoEncoderLossyColor) { |
+TEST(VideoEncoderVpxTest, Vp9LossyColorSwitching) { |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP9()); |
webrtc::DesktopSize frame_size(1024, 768); |
@@ -97,7 +97,7 @@ TEST(VideoEncoderVpxTest, TestVp9VideoEncoderLossyColor) { |
} |
// Test that the VP8 encoder ignores lossless modes without crashing. |
-TEST(VideoEncoderVpxTest, TestVp8VideoEncoderIgnoreLossy) { |
+TEST(VideoEncoderVpxTest, Vp8IgnoreLossy) { |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP8()); |
webrtc::DesktopSize frame_size(1024, 768); |
@@ -112,7 +112,7 @@ TEST(VideoEncoderVpxTest, TestVp8VideoEncoderIgnoreLossy) { |
// Test that calling Encode with a larger frame size than the initial one |
// does not cause VP8 to crash. |
-TEST(VideoEncoderVpxTest, TestVp8SizeChangeNoCrash) { |
+TEST(VideoEncoderVpxTest, Vp8SizeChangeNoCrash) { |
webrtc::DesktopSize frame_size(1000, 1000); |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP8()); |
@@ -131,7 +131,7 @@ TEST(VideoEncoderVpxTest, TestVp8SizeChangeNoCrash) { |
// Test that calling Encode with a larger frame size than the initial one |
// does not cause VP9 to crash. |
-TEST(VideoEncoderVpxTest, TestVp9SizeChangeNoCrash) { |
+TEST(VideoEncoderVpxTest, Vp9SizeChangeNoCrash) { |
webrtc::DesktopSize frame_size(1000, 1000); |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP9()); |
@@ -150,7 +150,7 @@ TEST(VideoEncoderVpxTest, TestVp9SizeChangeNoCrash) { |
// Test that the DPI information is correctly propagated from the |
// media::ScreenCaptureData to the VideoPacket. |
-TEST(VideoEncoderVpxTest, TestDpiPropagation) { |
+TEST(VideoEncoderVpxTest, DpiPropagation) { |
webrtc::DesktopSize frame_size(32, 32); |
scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP8()); |
@@ -162,4 +162,21 @@ TEST(VideoEncoderVpxTest, TestDpiPropagation) { |
EXPECT_EQ(packet->format().y_dpi(), 97); |
} |
+TEST(VideoEncoderVerbatimTest, Vp8EncodeUnchangedFrame) { |
+ scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP8()); |
+ TestVideoEncoderEmptyFrames(encoder.get(), 0); |
+} |
+ |
+TEST(VideoEncoderVerbatimTest, Vp9LosslessUnchangedFrame) { |
+ scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP9()); |
+ encoder->SetLosslessEncode(true); |
+ TestVideoEncoderEmptyFrames(encoder.get(), 0); |
+} |
+ |
+TEST(VideoEncoderVerbatimTest, Vp9LossyUnchangedFrame) { |
+ scoped_ptr<VideoEncoderVpx> encoder(VideoEncoderVpx::CreateForVP9()); |
+ encoder->SetLosslessEncode(false); |
+ TestVideoEncoderEmptyFrames(encoder.get(), 2); |
+} |
+ |
} // namespace remoting |