e5960ce737
This reverts commit 1cfeb435427a2fa677a495e34c882096efc193d0. Reason for revert: Fix unit test Original change's description: > Revert "Revert "Revert "Support more formats in RTCVideoFrame""" > > This reverts commit 7583390d1a3a7c4e9a77da0d77250abac0c34d1d. > > Reason for revert: Breaks unit tests > > Original change's description: > > Revert "Revert "Support more formats in RTCVideoFrame"" > > > > This reverts commit 0789dab2cbd1617e94d7300e375163d42345f3d4. > > > > Reason for revert: Include obc_corevideoframebuffer target > > > > Original change's description: > > > Revert "Support more formats in RTCVideoFrame" > > > > > > This reverts commit bd2220a9c496ef2e8567b68d4be9435a110bdc34. > > > > > > Reason for revert: Broke external clients > > > > > > Original change's description: > > > > Support more formats in RTCVideoFrame > > > > > > > > Implement Obj-C version of webrtc::VideoFrameBuffer and use that in > > > > RTCVideoFrame. > > > > > > > > Bug: webrtc:7785 > > > > Change-Id: I49f42bcf451dd6769b3a79a65fe7b400dce22677 > > > > Reviewed-on: https://chromium-review.googlesource.com/536773 > > > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > > > Reviewed-by: Magnus Jedvert <magjed@webrtc.org> > > > > Cr-Commit-Position: refs/heads/master@{#18691} > > > > > > TBR=magjed@webrtc.org,andersc@webrtc.org > > > > > > Change-Id: Id765dd9543ed0613a6b2de108b268c3501025fcd > > > No-Presubmit: true > > > No-Tree-Checks: true > > > No-Try: true > > > Bug: webrtc:7785 > > > Reviewed-on: https://chromium-review.googlesource.com/542837 > > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > > Cr-Commit-Position: refs/heads/master@{#18697} > > > > TBR=magjed@webrtc.org,andersc@webrtc.org > > > > Change-Id: I1ef5313b4a6c56eb8c7fd02d95db62c4e3c00255 > > No-Presubmit: true > > No-Tree-Checks: true > > No-Try: true > > Bug: webrtc:7785 > > Reviewed-on: https://chromium-review.googlesource.com/542838 > > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#18716} > > TBR=magjed@webrtc.org,andersc@webrtc.org > > Change-Id: Id12f33698eb02041607cb9a5c54f37f01bfac5b1 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Bug: webrtc:7785 > Reviewed-on: https://chromium-review.googlesource.com/544840 > Reviewed-by: Anders Carlsson <andersc@webrtc.org> > Commit-Queue: Anders Carlsson <andersc@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#18718} TBR=magjed@webrtc.org,andersc@webrtc.org Change-Id: I184303ecba8db91ef7de709f982a295a2efe92eb Bug: webrtc:7785 Reviewed-on: https://chromium-review.googlesource.com/544841 Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Reviewed-by: Anders Carlsson <andersc@webrtc.org> Cr-Commit-Position: refs/heads/master@{#18731}
109 lines
2.3 KiB
Plaintext
109 lines
2.3 KiB
Plaintext
/*
|
|
* Copyright 2017 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#import "WebRTC/RTCVideoFrameBuffer.h"
|
|
|
|
#include "webrtc/api/video/i420_buffer.h"
|
|
|
|
@implementation RTCI420Buffer {
|
|
@protected
|
|
rtc::scoped_refptr<webrtc::I420BufferInterface> _i420Buffer;
|
|
}
|
|
|
|
- (instancetype)initWithWidth:(int)width height:(int)height {
|
|
if (self = [super init]) {
|
|
_i420Buffer = webrtc::I420Buffer::Create(width, height);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithWidth:(int)width
|
|
height:(int)height
|
|
strideY:(int)strideY
|
|
strideU:(int)strideU
|
|
strideV:(int)strideV {
|
|
if (self = [super init]) {
|
|
_i420Buffer = webrtc::I420Buffer::Create(width, height, strideY, strideU, strideV);
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (instancetype)initWithFrameBuffer:(rtc::scoped_refptr<webrtc::I420BufferInterface>)i420Buffer {
|
|
if (self = [super init]) {
|
|
_i420Buffer = i420Buffer;
|
|
}
|
|
|
|
return self;
|
|
}
|
|
|
|
- (int)width {
|
|
return _i420Buffer->width();
|
|
}
|
|
|
|
- (int)height {
|
|
return _i420Buffer->height();
|
|
}
|
|
|
|
- (int)strideY {
|
|
return _i420Buffer->StrideY();
|
|
}
|
|
|
|
- (int)strideU {
|
|
return _i420Buffer->StrideU();
|
|
}
|
|
|
|
- (int)strideV {
|
|
return _i420Buffer->StrideV();
|
|
}
|
|
|
|
- (int)chromaWidth {
|
|
return _i420Buffer->ChromaWidth();
|
|
}
|
|
|
|
- (int)chromaHeight {
|
|
return _i420Buffer->ChromaHeight();
|
|
}
|
|
|
|
- (const uint8_t *)dataY {
|
|
return _i420Buffer->DataY();
|
|
}
|
|
|
|
- (const uint8_t *)dataU {
|
|
return _i420Buffer->DataU();
|
|
}
|
|
|
|
- (const uint8_t *)dataV {
|
|
return _i420Buffer->DataV();
|
|
}
|
|
|
|
- (id<RTCI420Buffer>)toI420 {
|
|
return self;
|
|
}
|
|
|
|
@end
|
|
|
|
@implementation RTCMutableI420Buffer
|
|
|
|
- (uint8_t *)mutableDataY {
|
|
return static_cast<webrtc::I420Buffer *>(_i420Buffer.get())->MutableDataY();
|
|
}
|
|
|
|
- (uint8_t *)mutableDataU {
|
|
return static_cast<webrtc::I420Buffer *>(_i420Buffer.get())->MutableDataU();
|
|
}
|
|
|
|
- (uint8_t *)mutableDataV {
|
|
return static_cast<webrtc::I420Buffer *>(_i420Buffer.get())->MutableDataV();
|
|
}
|
|
|
|
@end
|