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

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

Browse Source 
This reverts commit e41d774c4d0a60066866fc2d0ae48dd0e839ff23.

Original code review: https://webrtc-codereview.appspot.com/43999004/
Reason for reland: There was nothing wrong with this cl as is, but it breaks chrome compatibility. We will now reland this and fix Chrome during roll.

Patset 1: Original cl.
Patchset 2: Removed more code that is no longer needed.

R=magjed@webrtc.org, pbos@webrtc.org
TBR=mflodman@webrtc.org

BUG=1128

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

Cr-Commit-Position: refs/heads/master@{#8956}
This commit is contained in:
Per
2015-04-09 13:44:16 +02:00
parent 2c37078e40
commit 9b3f56ea05
17 changed files with 110 additions and 181 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,8 +654,9 @@ 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);
I420VideoFrame texture_image(&native_handle_, width, height,
output_timestamp_, 0, webrtc::kVideoRotation_0,
rtc::Callback0<void>());
texture_image.set_ntp_time_ms(output_ntp_time_ms_);
callback_status = callback_->Decoded(texture_image);
} else {