Chromium Code Reviews| Index: webrtc/media/base/videoadapter_unittest.cc |
| diff --git a/webrtc/media/base/videoadapter_unittest.cc b/webrtc/media/base/videoadapter_unittest.cc |
| index e8056798907f36dc8afae9e9e77d7032f2a3b8bc..3559781b8eea4a486575aced3b27f224792d4e91 100644 |
| --- a/webrtc/media/base/videoadapter_unittest.cc |
| +++ b/webrtc/media/base/videoadapter_unittest.cc |
| @@ -31,14 +31,19 @@ class VideoAdapterTest : public testing::Test { |
| capture_format_.interval = VideoFormat::FpsToInterval(30); |
| listener_.reset(new VideoCapturerListener(&adapter_)); |
| +#if 0 |
| + // TODO(nisse): Have to reorganize this test. |
| capturer_->SignalFrameCaptured.connect( |
| listener_.get(), &VideoCapturerListener::OnFrameCaptured); |
| +#endif |
| } |
| virtual void TearDown() { |
| // Explicitly disconnect the VideoCapturer before to avoid data races |
| // (frames delivered to VideoCapturerListener while it's being destructed). |
| +#if 0 |
| capturer_->SignalFrameCaptured.disconnect_all(); |
| +#endif |
|
pthatcher1
2016/08/23 00:13:13
And these?
nisse-webrtc
2016/08/23 06:46:39
Same here, needs rewrite to use OnFrame and not us
|
| } |
| protected: |
| @@ -60,8 +65,12 @@ class VideoAdapterTest : public testing::Test { |
| captured_frames_(0), |
| dropped_frames_(0), |
| last_adapt_was_no_op_(false) { |
| + // TODO(nisse): XXX Silence warning. |
| + (void) video_adapter_; |
| } |
| +#if 0 |
| + // TODO(nisse): Have to reorganize this test. |
| void OnFrameCaptured(VideoCapturer* capturer, |
| const CapturedFrame* captured_frame) { |
| rtc::CritScope lock(&crit_); |
| @@ -87,6 +96,7 @@ class VideoAdapterTest : public testing::Test { |
| } |
| ++captured_frames_; |
| } |
| +#endif |
| Stats GetStats() { |
| rtc::CritScope lock(&crit_); |