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

Unified Diff: webrtc/media/base/videoframe.h

Issue 2315663002: Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)
Patch Set: Created 4 years, 3 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/base/videoframe.h
diff --git a/webrtc/media/base/videoframe.h b/webrtc/media/base/videoframe.h
index f61445bfe75948c4e965d72eae2caee91cf26a40..5684e3df6b98db55cb154ca9db4274eb68cbd8c8 100644
--- a/webrtc/media/base/videoframe.h
+++ b/webrtc/media/base/videoframe.h
@@ -11,13 +11,19 @@
#ifndef WEBRTC_MEDIA_BASE_VIDEOFRAME_H_
#define WEBRTC_MEDIA_BASE_VIDEOFRAME_H_
+#include "webrtc/video_frame.h"
+
+#if 0
#include "webrtc/base/basictypes.h"
#include "webrtc/base/stream.h"
#include "webrtc/common_video/include/video_frame_buffer.h"
#include "webrtc/common_video/rotation.h"
+#endif
namespace cricket {
+using VideoFrame = webrtc::VideoFrame;
+#if 0
// Represents a YUV420 (a.k.a. I420) video frame.
// TODO(nisse): This class duplicates webrtc::VideoFrame. There's
@@ -67,6 +73,7 @@ class VideoFrame {
const uint8_t* sample,
size_t sample_size);
};
+#endif
} // namespace cricket

Powered by Google App Engine
This is Rietveld 408576698