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

Unified Diff: webrtc/api/mediastreaminterface.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/api/mediastreaminterface.h
diff --git a/webrtc/api/mediastreaminterface.h b/webrtc/api/mediastreaminterface.h
index 988ee8438361aaff2dd571fe2e79fa2907a9e14f..b6107995bbdfea10df642813b02705e531560d91 100644
--- a/webrtc/api/mediastreaminterface.h
+++ b/webrtc/api/mediastreaminterface.h
@@ -25,9 +25,9 @@
#include "webrtc/base/scoped_ref_ptr.h"
#include "webrtc/base/optional.h"
#include "webrtc/media/base/mediachannel.h"
-#include "webrtc/media/base/videoframe.h"
#include "webrtc/media/base/videosinkinterface.h"
#include "webrtc/media/base/videosourceinterface.h"
+#include "webrtc/video_frame.h"
namespace webrtc {
@@ -98,7 +98,7 @@ class MediaStreamTrackInterface : public rtc::RefCountInterface,
// The same source can be used in multiple VideoTracks.
class VideoTrackSourceInterface
: public MediaSourceInterface,
- public rtc::VideoSourceInterface<cricket::VideoFrame> {
+ public rtc::VideoSourceInterface<VideoFrame> {
perkj_webrtc 2016/10/25 10:53:36 It make sense to have not write webrtc::VideoFrame
nisse-webrtc 2016/10/25 11:21:01 Done, in all of api/.
public:
struct Stats {
// Original size of captured frame, before video adaptation.
@@ -131,13 +131,13 @@ class VideoTrackSourceInterface
class VideoTrackInterface
: public MediaStreamTrackInterface,
- public rtc::VideoSourceInterface<cricket::VideoFrame> {
+ public rtc::VideoSourceInterface<VideoFrame> {
public:
// Register a video sink for this track.
- void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+ void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
const rtc::VideoSinkWants& wants) override{};
void RemoveSink(
- rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override{};
+ rtc::VideoSinkInterface<VideoFrame>* sink) override{};
virtual VideoTrackSourceInterface* GetSource() const = 0;

Powered by Google App Engine
This is Rietveld 408576698