Revert "Revert "Update webrtc/sdk/objc to new VideoFrameBuffer interface""

This reverts commit 5b383c0ebd586b973d6bf14624cece61d2fc590c.

Reason for revert: External code updated.

Original change's description:
> Revert "Update webrtc/sdk/objc to new VideoFrameBuffer interface"
> 
> This reverts commit b008b45f1e609556a04c1aabb4e8ed6a894265af.
> 
> Reason for revert: Breaks external clients.
> 
> Original change's description:
> > Update webrtc/sdk/objc to new VideoFrameBuffer interface
> > 
> > More thorough refactoring work is planned for RTCVideoFrame (see webrtc:7785), and this CL just unblocks removing the old interface from webrtc::VideoFrameBuffer.
> > 
> > Bug: webrtc:7632,webrtc:7785
> > Change-Id: I351536c5ca454c2acd8944bbc2ebb1d1439dc50c
> > Reviewed-on: https://chromium-review.googlesource.com/530231
> > Reviewed-by: Anders Carlsson <andersc@webrtc.org>
> > Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> > Cr-Commit-Position: refs/heads/master@{#18553}
> 
> TBR=magjed@webrtc.org,andersc@webrtc.org
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: webrtc:7632,webrtc:7785
> 
> Change-Id: Ib5c6fcb939175c67c3ac7b3df7cea0f7c2bb0af0
> Reviewed-on: https://chromium-review.googlesource.com/533013
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#18557}

TBR=tterriberry@mozilla.com,magjed@webrtc.org,webrtc-reviews@webrtc.org,andersc@webrtc.org

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: webrtc:7632, webrtc:7785
Change-Id: I8d37428d093486b52e05e9c5992382247049ff61
Reviewed-on: https://chromium-review.googlesource.com/535645
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Anders Carlsson <andersc@webrtc.org>
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18594}
This commit is contained in:
Magnus Jedvert
2017-06-14 14:04:36 +00:00
committed by Commit Bot
parent 26ecfcc1c1
commit 386e49690a
4 changed files with 58 additions and 35 deletions

View File

@ -31,27 +31,27 @@
}
- (const uint8_t *)dataY {
return _videoBuffer->DataY();
return _videoBuffer->GetI420()->DataY();
}
- (const uint8_t *)dataU {
return _videoBuffer->DataU();
return _videoBuffer->GetI420()->DataU();
}
- (const uint8_t *)dataV {
return _videoBuffer->DataV();
return _videoBuffer->GetI420()->DataV();
}
- (int)strideY {
return _videoBuffer->StrideY();
return _videoBuffer->GetI420()->StrideY();
}
- (int)strideU {
return _videoBuffer->StrideU();
return _videoBuffer->GetI420()->StrideU();
}
- (int)strideV {
return _videoBuffer->StrideV();
return _videoBuffer->GetI420()->StrideV();
}
- (int64_t)timeStampNs {
@ -59,12 +59,14 @@
}
- (CVPixelBufferRef)nativeHandle {
return static_cast<CVPixelBufferRef>(_videoBuffer->native_handle());
return (_videoBuffer->type() == webrtc::VideoFrameBuffer::Type::kNative) ?
static_cast<webrtc::CoreVideoFrameBuffer *>(_videoBuffer.get())->pixel_buffer() :
nil;
}
- (RTCVideoFrame *)newI420VideoFrame {
return [[RTCVideoFrame alloc]
initWithVideoBuffer:_videoBuffer->NativeToI420Buffer()
initWithVideoBuffer:_videoBuffer->ToI420()
rotation:_rotation
timeStampNs:_timeStampNs];
}