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

Side by Side Diff: webrtc/common_video/include/video_frame_buffer.h

Issue 2845333002: Revert of Delete deprecated and transitional stuff related to video frame refactoring. (Closed)
Patch Set: Created 3 years, 7 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 unified diff | Download patch
« no previous file with comments | « webrtc/common_video/i420_video_frame_unittest.cc ('k') | webrtc/common_video/rotation.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ 11 #ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_
12 #define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ 12 #define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_
13 13
14 #include <memory> 14 #include <memory>
15 15
16 #include "webrtc/api/video/video_frame_buffer.h" 16 #include "webrtc/api/video/video_frame_buffer.h"
17 // TODO(nisse): For backwards compatibility, files including this file
18 // expect it to declare I420Buffer. Delete after callers are updated.
19 #include "webrtc/api/video/i420_buffer.h"
17 #include "webrtc/base/callback.h" 20 #include "webrtc/base/callback.h"
18 #include "webrtc/base/scoped_ref_ptr.h" 21 #include "webrtc/base/scoped_ref_ptr.h"
19 22
20 namespace webrtc { 23 namespace webrtc {
21 24
22 // Base class for native-handle buffer is a wrapper around a |native_handle|. 25 // Base class for native-handle buffer is a wrapper around a |native_handle|.
23 // This is used for convenience as most native-handle implementations can share 26 // This is used for convenience as most native-handle implementations can share
24 // many VideoFrame implementations, but need to implement a few others (such 27 // many VideoFrame implementations, but need to implement a few others (such
25 // as their own destructors or conversion methods back to software I420). 28 // as their own destructors or conversion methods back to software I420).
26 class NativeHandleBuffer : public VideoFrameBuffer { 29 class NativeHandleBuffer : public VideoFrameBuffer {
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 const uint8_t* const v_plane_; 83 const uint8_t* const v_plane_;
81 const int y_stride_; 84 const int y_stride_;
82 const int u_stride_; 85 const int u_stride_;
83 const int v_stride_; 86 const int v_stride_;
84 rtc::Callback0<void> no_longer_used_cb_; 87 rtc::Callback0<void> no_longer_used_cb_;
85 }; 88 };
86 89
87 } // namespace webrtc 90 } // namespace webrtc
88 91
89 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_ 92 #endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_BUFFER_H_
OLDNEW
« no previous file with comments | « webrtc/common_video/i420_video_frame_unittest.cc ('k') | webrtc/common_video/rotation.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698