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

Side by Side Diff: talk/media/webrtc/webrtcvideoframe.h

Issue 1418913006: common_video: rename interface -> include (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased Created 5 years, 1 month 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 15 matching lines...) Expand all
26 */ 26 */
27 27
28 #ifndef TALK_MEDIA_WEBRTCVIDEOFRAME_H_ 28 #ifndef TALK_MEDIA_WEBRTCVIDEOFRAME_H_
29 #define TALK_MEDIA_WEBRTCVIDEOFRAME_H_ 29 #define TALK_MEDIA_WEBRTCVIDEOFRAME_H_
30 30
31 #include "talk/media/base/videoframe.h" 31 #include "talk/media/base/videoframe.h"
32 #include "webrtc/base/buffer.h" 32 #include "webrtc/base/buffer.h"
33 #include "webrtc/base/refcount.h" 33 #include "webrtc/base/refcount.h"
34 #include "webrtc/base/scoped_ref_ptr.h" 34 #include "webrtc/base/scoped_ref_ptr.h"
35 #include "webrtc/common_types.h" 35 #include "webrtc/common_types.h"
36 #include "webrtc/common_video/interface/video_frame_buffer.h" 36 #include "webrtc/common_video/include/video_frame_buffer.h"
37 37
38 namespace cricket { 38 namespace cricket {
39 39
40 struct CapturedFrame; 40 struct CapturedFrame;
41 41
42 class WebRtcVideoFrame : public VideoFrame { 42 class WebRtcVideoFrame : public VideoFrame {
43 public: 43 public:
44 WebRtcVideoFrame(); 44 WebRtcVideoFrame();
45 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer, 45 WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
46 int64_t time_stamp_ns, 46 int64_t time_stamp_ns,
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 webrtc::VideoRotation rotation_; 149 webrtc::VideoRotation rotation_;
150 150
151 // This is mutable as the calculation is expensive but once calculated, it 151 // This is mutable as the calculation is expensive but once calculated, it
152 // remains const. 152 // remains const.
153 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_; 153 mutable rtc::scoped_ptr<VideoFrame> rotated_frame_;
154 }; 154 };
155 155
156 } // namespace cricket 156 } // namespace cricket
157 157
158 #endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_ 158 #endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698