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

Revert "Remove usage of webrtc::NativeHandle since is just adds an extra level of indirection."

Browse Source 
This reverts commit 75db8612588b4fabdf1b05f4ab145f7737093b45.

Revert "Fix build breakage in WrappedI420Buffer::native_handle()"

This reverts commit 3211934ebf7cac3e6df2cb4aacb6e47cc1cffe2b.

Reason for revert: Breaks chrome build and tests on clank, See https://codereview.chromium.org/1067803002/

BUG=1128
TBR=magjed@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/43079004

Cr-Commit-Position: refs/heads/master@{#8940}
This commit is contained in:
Per
2015-04-07 17:20:48 +02:00
parent 3b71efc56e
commit e41d774c4d
14 changed files with 118 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
View File

@ -654,9 +654,8 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(
int32_t callback_status = WEBRTC_VIDEO_CODEC_OK;
if (use_surface_) {
native_handle_.SetTextureObject(surface_texture_, texture_id);
I420VideoFrame texture_image(&native_handle_, width, height,
output_timestamp_, 0, webrtc::kVideoRotation_0,
rtc::Callback0<void>());
I420VideoFrame texture_image(
&native_handle_, width, height, output_timestamp_, 0);
texture_image.set_ntp_time_ms(output_ntp_time_ms_);
callback_status = callback_->Decoded(texture_image);
} else {