diff options
| author | sergeyu <sergeyu@chromium.org> | 2016-02-12 11:37:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-12 19:38:39 +0000 |
| commit | 01cd66fb59834fc950146580fab0b94fdecb9730 (patch) | |
| tree | 450e1150053c7b3f875f982674195038ee8e7e46 /remoting/test | |
| parent | 8e8a03dbf4d42a44c4ade6c9566256ad815832ed (diff) | |
| download | chromium_src-01cd66fb59834fc950146580fab0b94fdecb9730.zip chromium_src-01cd66fb59834fc950146580fab0b94fdecb9730.tar.gz chromium_src-01cd66fb59834fc950146580fab0b94fdecb9730.tar.bz2 | |
Update webrtc::DesktopCapturere clients to use SharedMemoryFactory
webrtc::DesktopCapturer::Callback::CreateSharedMemory() has been
deprecated and webrtc::SharedMemoryFactory should be used instead now.
Review URL: https://codereview.chromium.org/1690853002
Cr-Commit-Position: refs/heads/master@{#375224}
Diffstat (limited to 'remoting/test')
| -rw-r--r-- | remoting/test/cyclic_frame_generator.cc | 2 | ||||
| -rw-r--r-- | remoting/test/cyclic_frame_generator.h | 2 | ||||
| -rw-r--r-- | remoting/test/protocol_perftest.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/remoting/test/cyclic_frame_generator.cc b/remoting/test/cyclic_frame_generator.cc index eda4cbd..3ba3836 100644 --- a/remoting/test/cyclic_frame_generator.cc +++ b/remoting/test/cyclic_frame_generator.cc @@ -99,7 +99,7 @@ void CyclicFrameGenerator::SetTickClock(base::TickClock* tick_clock) { } scoped_ptr<webrtc::DesktopFrame> CyclicFrameGenerator::GenerateFrame( - webrtc::DesktopCapturer::Callback* callback) { + webrtc::SharedMemoryFactory* shared_memory_factory) { base::TimeTicks now = clock_->NowTicks(); int reference_frame = ((now - started_time_) / frame_cycle_period_) % reference_frames_.size(); diff --git a/remoting/test/cyclic_frame_generator.h b/remoting/test/cyclic_frame_generator.h index 3d41c91..a77706a 100644 --- a/remoting/test/cyclic_frame_generator.h +++ b/remoting/test/cyclic_frame_generator.h @@ -65,7 +65,7 @@ class CyclicFrameGenerator void set_draw_barcode(bool draw_barcode) { draw_barcode_ = draw_barcode; } scoped_ptr<webrtc::DesktopFrame> GenerateFrame( - webrtc::DesktopCapturer::Callback* callback); + webrtc::SharedMemoryFactory* shared_memory_factory); FrameType last_frame_type() { return last_frame_type_; } diff --git a/remoting/test/protocol_perftest.cc b/remoting/test/protocol_perftest.cc index 0a0c084..b936479 100644 --- a/remoting/test/protocol_perftest.cc +++ b/remoting/test/protocol_perftest.cc @@ -566,7 +566,7 @@ class IntermittentChangeFrameGenerator : frame_index_(0) {} scoped_ptr<webrtc::DesktopFrame> GenerateFrame( - webrtc::DesktopCapturer::Callback* callback) { + webrtc::SharedMemoryFactory* shared_memory_factory) { const int kWidth = 1000; const int kHeight = kIntermittentFrameSize / kWidth / 4; |