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

Unified Diff: webrtc/video_frame.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
« webrtc/media/base/fakevideocapturer.h ('K') | « webrtc/media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/video_frame.h
diff --git a/webrtc/video_frame.h b/webrtc/video_frame.h
index b99e60d62113e6b6dc7b369a1597129bca0a8d94..2c5160aeac983498ac07f3624a6fda3347f92a76 100644
--- a/webrtc/video_frame.h
+++ b/webrtc/video_frame.h
@@ -18,6 +18,10 @@
#include "webrtc/common_video/rotation.h"
#include "webrtc/typedefs.h"
+namespace cricket {
+class WebRtcVideoFrameTest;
+} // namespace cricket
+
namespace webrtc {
// TODO(nisse): This class duplicates cricket::VideoFrame. There's
@@ -185,6 +189,9 @@ class VideoFrame {
}
private:
+ // Tests mutate |rotation_|, so the base test class is a friend.
+ friend class cricket::WebRtcVideoFrameTest;
pthatcher1 2016/09/07 18:11:39 A reference to a unit test class? That seems terr
nisse-webrtc 2016/09/08 11:07:13 No longer needed, since this cl also deletes those
+
// An opaque reference counted handle that stores the pixel data.
rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
uint32_t timestamp_rtp_;
« webrtc/media/base/fakevideocapturer.h ('K') | « webrtc/media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698