Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Unified Diff: webrtc/media/devices/gdivideorenderer.h

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Addressed Per's comments, except #include vs forward declare. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/media/devices/gdivideorenderer.h
diff --git a/webrtc/media/devices/gdivideorenderer.h b/webrtc/media/devices/gdivideorenderer.h
index eaf49ca26b5a6062797a6d97aa8e6f41262d1ecc..6139589e74034a9139070e08139e246468a09e70 100644
--- a/webrtc/media/devices/gdivideorenderer.h
+++ b/webrtc/media/devices/gdivideorenderer.h
@@ -18,20 +18,21 @@
#include <memory>
-// TODO(nisse): Temporarily; to be replaced with a forward declaration
-// of webrtc::VideoFrame when dependency on cricket::VideoFrame is deleted.
-#include "webrtc/media/base/videoframe.h"
#include "webrtc/media/base/videosinkinterface.h"
+namespace webrtc {
+class VideoFrame;
+}
+
namespace cricket {
-class GdiVideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
+class GdiVideoRenderer : public rtc::VideoSinkInterface<webrtc::VideoFrame> {
public:
GdiVideoRenderer(int x, int y);
virtual ~GdiVideoRenderer();
// Implementation of VideoSinkInterface
- void OnFrame(const VideoFrame& frame) override;
+ void OnFrame(const webrtc::VideoFrame& frame) override;
private:
class VideoWindow; // forward declaration, defined in the .cc file

Powered by Google App Engine
This is Rietveld 408576698