| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "remoting/protocol/video_frame_pump.h" | 5 #include "remoting/protocol/video_frame_pump.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 | 43 |
| 44 std::unique_ptr<webrtc::DesktopFrame> CreateNullFrame( | 44 std::unique_ptr<webrtc::DesktopFrame> CreateNullFrame( |
| 45 webrtc::SharedMemoryFactory* shared_memory_factory) { | 45 webrtc::SharedMemoryFactory* shared_memory_factory) { |
| 46 return nullptr; | 46 return nullptr; |
| 47 } | 47 } |
| 48 | 48 |
| 49 std::unique_ptr<webrtc::DesktopFrame> CreateUnchangedFrame( | 49 std::unique_ptr<webrtc::DesktopFrame> CreateUnchangedFrame( |
| 50 webrtc::SharedMemoryFactory* shared_memory_factory) { | 50 webrtc::SharedMemoryFactory* shared_memory_factory) { |
| 51 const webrtc::DesktopSize kSize(800, 640); | 51 const webrtc::DesktopSize kSize(800, 640); |
| 52 // updated_region() is already empty by default in new BasicDesktopFrames. | 52 // updated_region() is already empty by default in new BasicDesktopFrames. |
| 53 return base::WrapUnique(new webrtc::BasicDesktopFrame(kSize)); | 53 return base::MakeUnique<webrtc::BasicDesktopFrame>(kSize); |
| 54 } | 54 } |
| 55 | 55 |
| 56 class MockVideoEncoder : public VideoEncoder { | 56 class MockVideoEncoder : public VideoEncoder { |
| 57 public: | 57 public: |
| 58 MockVideoEncoder() {} | 58 MockVideoEncoder() {} |
| 59 ~MockVideoEncoder() {} | 59 ~MockVideoEncoder() {} |
| 60 | 60 |
| 61 MOCK_METHOD1(SetLosslessEncode, void(bool)); | 61 MOCK_METHOD1(SetLosslessEncode, void(bool)); |
| 62 MOCK_METHOD1(SetLosslessColor, void(bool)); | 62 MOCK_METHOD1(SetLosslessColor, void(bool)); |
| 63 MOCK_METHOD1(EncodePtr, VideoPacket*(const webrtc::DesktopFrame&)); | 63 MOCK_METHOD1(EncodePtr, VideoPacket*(const webrtc::DesktopFrame&)); |
| (...skipping 14 matching lines...) Expand all Loading... |
| 78 ThreadCheckVideoEncoder( | 78 ThreadCheckVideoEncoder( |
| 79 scoped_refptr<base::SingleThreadTaskRunner> task_runner) | 79 scoped_refptr<base::SingleThreadTaskRunner> task_runner) |
| 80 : task_runner_(task_runner) { | 80 : task_runner_(task_runner) { |
| 81 } | 81 } |
| 82 ~ThreadCheckVideoEncoder() override { | 82 ~ThreadCheckVideoEncoder() override { |
| 83 EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); | 83 EXPECT_TRUE(task_runner_->BelongsToCurrentThread()); |
| 84 } | 84 } |
| 85 | 85 |
| 86 std::unique_ptr<VideoPacket> Encode(const webrtc::DesktopFrame& frame, | 86 std::unique_ptr<VideoPacket> Encode(const webrtc::DesktopFrame& frame, |
| 87 uint32_t flags) override { | 87 uint32_t flags) override { |
| 88 return base::WrapUnique(new VideoPacket()); | 88 return base::MakeUnique<VideoPacket>(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 private: | 91 private: |
| 92 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; | 92 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; |
| 93 | 93 |
| 94 DISALLOW_COPY_AND_ASSIGN(ThreadCheckVideoEncoder); | 94 DISALLOW_COPY_AND_ASSIGN(ThreadCheckVideoEncoder); |
| 95 }; | 95 }; |
| 96 | 96 |
| 97 class ThreadCheckDesktopCapturer : public webrtc::DesktopCapturer { | 97 class ThreadCheckDesktopCapturer : public webrtc::DesktopCapturer { |
| 98 public: | 98 public: |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 // Start video frame capture. | 238 // Start video frame capture. |
| 239 pump_.reset(new VideoFramePump(encode_task_runner_, std::move(capturer), | 239 pump_.reset(new VideoFramePump(encode_task_runner_, std::move(capturer), |
| 240 std::move(encoder), &video_stub_)); | 240 std::move(encoder), &video_stub_)); |
| 241 | 241 |
| 242 // Run MessageLoop until the first frame is received. | 242 // Run MessageLoop until the first frame is received. |
| 243 run_loop.Run(); | 243 run_loop.Run(); |
| 244 } | 244 } |
| 245 | 245 |
| 246 } // namespace protocol | 246 } // namespace protocol |
| 247 } // namespace remoting | 247 } // namespace remoting |
| OLD | NEW |