talk/app/webrtc/java/jni/androidmediadecoder_jni.cc - Issue 1158273010: Re-land "Convert native handles to buffers before encoding."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

Issue 1158273010: Re-land "Convert native handles to buffers before encoding." (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Created 5 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

index b92b2de8ff8c8e0f62a6121991e299c056a7ad1b..9952e26d2ecb5fd47227b4b2ad0cc0f7e6be8555 100644

--- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

+++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

@@ -654,9 +654,9 @@ bool MediaCodecVideoDecoder::DeliverPendingOutputs(

int32_t callback_status = WEBRTC_VIDEO_CODEC_OK;

if (use_surface_) {

native_handle_.SetTextureObject(surface_texture_, texture_id);

- VideoFrame texture_image(&native_handle_, width, height, output_timestamp_,

- 0, webrtc::kVideoRotation_0,

- rtc::Callback0<void>());

+ VideoFrame texture_image(new rtc::RefCountedObject<JniNativeHandleBuffer>(

+ &native_handle_, width, height),

+ output_timestamp_, 0, webrtc::kVideoRotation_0);

texture_image.set_ntp_time_ms(output_ntp_time_ms_);

callback_status = callback_->Decoded(texture_image);

} else {

« no previous file with comments | « no previous file | talk/app/webrtc/java/jni/native_handle_impl.h » ('j') | no next file with comments »