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

Side by Side Diff: webrtc/api/objc/RTCVideoFrame.mm

Issue 1838353004: cricket::VideoFrame cleanup. New width() and height(). Deleted GetChroma* methods. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Use objc dot syntax. Delete chromaSize property. Created 4 years, 8 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
OLDNEW
1 /* 1 /*
2 * Copyright 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright 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 #import "RTCVideoFrame.h" 11 #import "RTCVideoFrame.h"
12 12
13 #include "webrtc/base/scoped_ptr.h" 13 #include "webrtc/base/scoped_ptr.h"
14 14
15 #import "webrtc/api/objc/RTCVideoFrame+Private.h" 15 #import "webrtc/api/objc/RTCVideoFrame+Private.h"
16 16
17 @implementation RTCVideoFrame { 17 @implementation RTCVideoFrame {
18 rtc::scoped_ptr<cricket::VideoFrame> _videoFrame; 18 rtc::scoped_ptr<cricket::VideoFrame> _videoFrame;
19 } 19 }
20 20
21 - (size_t)width { 21 - (size_t)width {
22 return _videoFrame->GetWidth(); 22 return _videoFrame->width();
23 } 23 }
24 24
25 - (size_t)height { 25 - (size_t)height {
26 return _videoFrame->GetHeight(); 26 return _videoFrame->height();
27 } 27 }
28 28
29 - (size_t)chromaWidth { 29 - (size_t)chromaWidth {
30 return _videoFrame->GetChromaWidth(); 30 return (self.width + 1) / 2;
31 } 31 }
32 32
33 - (size_t)chromaHeight { 33 - (size_t)chromaHeight {
34 return _videoFrame->GetChromaHeight(); 34 return (self.height + 1) / 2;
35 }
36
37 - (size_t)chromaSize {
38 return _videoFrame->GetChromaSize();
39 } 35 }
40 36
41 - (const uint8_t *)yPlane { 37 - (const uint8_t *)yPlane {
42 const cricket::VideoFrame *const_frame = _videoFrame.get(); 38 const cricket::VideoFrame *const_frame = _videoFrame.get();
43 return const_frame->GetYPlane(); 39 return const_frame->GetYPlane();
44 } 40 }
45 41
46 - (const uint8_t *)uPlane { 42 - (const uint8_t *)uPlane {
47 const cricket::VideoFrame *const_frame = _videoFrame.get(); 43 const cricket::VideoFrame *const_frame = _videoFrame.get();
48 return const_frame->GetUPlane(); 44 return const_frame->GetUPlane();
(...skipping 21 matching lines...) Expand all
70 - (instancetype)initWithNativeFrame:(const cricket::VideoFrame *)nativeFrame { 66 - (instancetype)initWithNativeFrame:(const cricket::VideoFrame *)nativeFrame {
71 if (self = [super init]) { 67 if (self = [super init]) {
72 // Keep a shallow copy of the video frame. The underlying frame buffer is 68 // Keep a shallow copy of the video frame. The underlying frame buffer is
73 // not copied. 69 // not copied.
74 _videoFrame.reset(nativeFrame->Copy()); 70 _videoFrame.reset(nativeFrame->Copy());
75 } 71 }
76 return self; 72 return self;
77 } 73 }
78 74
79 @end 75 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698