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

Unified Diff: webrtc/examples/peerconnection/client/main_wnd.h

Issue 2383093002: Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame. (Closed)
Patch Set: Deleted a newline. 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/examples/peerconnection/client/main_wnd.h
diff --git a/webrtc/examples/peerconnection/client/main_wnd.h b/webrtc/examples/peerconnection/client/main_wnd.h
index 03db80d0b6d693b9e28624ef301cfa10ca19b436..7d62e1946f22664f1ab4015fd5cbb541d1bf52ce 100644
--- a/webrtc/examples/peerconnection/client/main_wnd.h
+++ b/webrtc/examples/peerconnection/client/main_wnd.h
@@ -21,7 +21,7 @@
#include "webrtc/examples/peerconnection/client/peer_connection_client.h"
#include "webrtc/media/base/mediachannel.h"
#include "webrtc/media/base/videocommon.h"
-#include "webrtc/media/base/videoframe.h"
+#include "webrtc/video_frame.h"
class MainWndCallback {
public:
@@ -102,7 +102,7 @@ class MainWnd : public MainWindow {
HWND handle() const { return wnd_; }
- class VideoRenderer : public rtc::VideoSinkInterface<cricket::VideoFrame> {
+ class VideoRenderer : public rtc::VideoSinkInterface<VideoFrame> {
perkj_webrtc 2016/10/25 10:53:36 webrtc:: This is not in the webrtc ns.
nisse-webrtc 2016/10/25 11:21:01 Done. But why did it compile without webrtc:: ???
public:
VideoRenderer(HWND wnd, int width, int height,
webrtc::VideoTrackInterface* track_to_render);
@@ -117,7 +117,7 @@ class MainWnd : public MainWindow {
}
// VideoSinkInterface implementation
- void OnFrame(const cricket::VideoFrame& frame) override;
+ void OnFrame(const VideoFrame& frame) override;
perkj_webrtc 2016/10/25 10:53:36 dito
const BITMAPINFO& bmi() const { return bmi_; }
const uint8_t* image() const { return image_.get(); }

Powered by Google App Engine
This is Rietveld 408576698