Index: webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h |
diff --git a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h |
index 2481252c7b275e16f2a53ad588c867ab615defde..1ad6419aff8d94de0995b2693f4ab8485827a874 100644 |
--- a/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h |
+++ b/webrtc/modules/video_coding/codecs/test/videoprocessor_integrationtest.h |
@@ -606,6 +606,12 @@ class VideoProcessorIntegrationTest : public testing::Test { |
while (frame_number < num_frames) { |
EXPECT_TRUE(processor_->ProcessFrame(frame_number)); |
+#if !defined(WEBRTC_VIDEOPROCESSOR_H264_TESTS) |
brandtr
2017/05/26 07:18:46
This will disable the EXPECT whenever H264 is comp
jianj
2017/05/26 18:20:27
Done.
|
+ if (!process.hw_codec) |
brandtr
2017/05/26 07:18:46
{}
jianj
2017/05/26 18:20:27
Done.
|
+ EXPECT_EQ(processor_->GetQpFromEncoder(), |
+ processor_->GetQpFromBitstream()); |
+#endif |
+ |
++num_frames_per_update_[TemporalLayerIndexForFrame(frame_number)]; |
++num_frames_total_; |
UpdateRateControlMetrics(frame_number); |