| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2004 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 // | 11 // |
| 12 // Definition of class GdiVideoRenderer that implements the abstract class | 12 // Definition of class GdiVideoRenderer that implements the abstract class |
| 13 // cricket::VideoRenderer via GDI on Windows. | 13 // cricket::VideoRenderer via GDI on Windows. |
| 14 | 14 |
| 15 #ifndef WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ | 15 #ifndef WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ |
| 16 #define WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ | 16 #define WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ |
| 17 #ifdef WIN32 | 17 #ifdef WIN32 |
| 18 | 18 |
| 19 #include <memory> | 19 #include <memory> |
| 20 | 20 |
| 21 // TODO(nisse): Temporarily; to be replaced with a forward declaration | |
| 22 // of webrtc::VideoFrame when dependency on cricket::VideoFrame is deleted. | |
| 23 #include "webrtc/media/base/videoframe.h" | |
| 24 #include "webrtc/media/base/videosinkinterface.h" | 21 #include "webrtc/media/base/videosinkinterface.h" |
| 25 | 22 |
| 23 namespace webrtc { |
| 24 class VideoFrame; |
| 25 } |
| 26 |
| 26 namespace cricket { | 27 namespace cricket { |
| 27 | 28 |
| 28 class GdiVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> { | 29 class GdiVideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> { |
| 29 public: | 30 public: |
| 30 GdiVideoRenderer(int x, int y); | 31 GdiVideoRenderer(int x, int y); |
| 31 virtual ~GdiVideoRenderer(); | 32 virtual ~GdiVideoRenderer(); |
| 32 | 33 |
| 33 // Implementation of VideoSinkInterface | 34 // Implementation of VideoSinkInterface |
| 34 void OnFrame(const VideoFrame& frame) override; | 35 void OnFrame(const VideoFrame& frame) override; |
| 35 | 36 |
| 36 private: | 37 private: |
| 37 class VideoWindow; // forward declaration, defined in the .cc file | 38 class VideoWindow; // forward declaration, defined in the .cc file |
| 38 std::unique_ptr<VideoWindow> window_; | 39 std::unique_ptr<VideoWindow> window_; |
| 39 // The initial position of the window. | 40 // The initial position of the window. |
| 40 int initial_x_; | 41 int initial_x_; |
| 41 int initial_y_; | 42 int initial_y_; |
| 42 }; | 43 }; |
| 43 | 44 |
| 44 } // namespace cricket | 45 } // namespace cricket |
| 45 | 46 |
| 46 #endif // WIN32 | 47 #endif // WIN32 |
| 47 #endif // WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ | 48 #endif // WEBRTC_MEDIA_DEVICES_GDIVIDEORENDERER_H_ |
| OLD | NEW |