zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete obsolete cricket::VideoFrame methods.

Browse Source 
GetWidth and GetHeight (renamed to width and height),

GetNativeHandle (replaced by video_frame_buffer()->native_handle).

TBR=tkchin@webrtc.org (trivial changes to objc RTCVideoFrame and VideoRendererAdapter)

BUG=webrtc:5682

Review-Url: https://codereview.webrtc.org/1990063005
Cr-Commit-Position: refs/heads/master@{#12822}
This commit is contained in:
nisse
2016-05-20 01:48:45 -07:00
committed by Commit bot
parent 94616b3b0b
commit 04ebea3629
7 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/sdk/objc/Framework/Classes/RTCVideoFrame.mm
View File

@ -83,12 +83,13 @@
}
- (CVPixelBufferRef)nativeHandle {
return static_cast<CVPixelBufferRef>(_videoFrame->GetNativeHandle());
return static_cast<CVPixelBufferRef>(
_videoFrame->video_frame_buffer()->native_handle());
}
- (void)convertBufferIfNeeded {
if (!_i420Buffer) {
if (_videoFrame->GetNativeHandle()) {
if (_videoFrame->video_frame_buffer()->native_handle()) {
// Convert to I420.
_i420Buffer = _videoFrame->video_frame_buffer()->NativeToI420Buffer();
} else {

2
webrtc/sdk/objc/Framework/Classes/RTCVideoRendererAdapter.mm
View File

@ -32,7 +32,7 @@ class VideoRendererAdapter
// I420 buffer for rotation before calling the rotation method otherwise
// it will hit a DCHECK.
if (nativeVideoFrame.rotation() != webrtc::kVideoRotation_0 &&
nativeVideoFrame.GetNativeHandle()) {
nativeVideoFrame.video_frame_buffer()->native_handle()) {
rtc::scoped_refptr<webrtc::VideoFrameBuffer> i420Buffer =
nativeVideoFrame.video_frame_buffer()->NativeToI420Buffer();
std::unique_ptr<cricket::VideoFrame> cpuFrame(