Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(724)

Unified Diff: webrtc/api/java/jni/peerconnection_jni.cc

Issue 1990063005: Delete obsolete cricket::VideoFrame method names. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « no previous file | webrtc/media/base/videoframe.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/api/java/jni/peerconnection_jni.cc
diff --git a/webrtc/api/java/jni/peerconnection_jni.cc b/webrtc/api/java/jni/peerconnection_jni.cc
index b4a22ed8f34cf84f5f46bf9db58350f799eeb7cc..4fb5570b5913e6722fe75badb5ad0dd47ddcc574 100644
--- a/webrtc/api/java/jni/peerconnection_jni.cc
+++ b/webrtc/api/java/jni/peerconnection_jni.cc
@@ -742,9 +742,10 @@ class JavaVideoRendererWrapper
void OnFrame(const cricket::VideoFrame& video_frame) override {
ScopedLocalRefFrame local_ref_frame(jni());
- jobject j_frame = (video_frame.GetNativeHandle() != nullptr)
- ? CricketToJavaTextureFrame(&video_frame)
- : CricketToJavaI420Frame(&video_frame);
+ jobject j_frame =
+ (video_frame.video_frame_buffer()->native_handle() != nullptr)
+ ? CricketToJavaTextureFrame(&video_frame)
+ : CricketToJavaI420Frame(&video_frame);
// |j_callbacks_| is responsible for releasing |j_frame| with
// VideoRenderer.renderFrameDone().
jni()->CallVoidMethod(*j_callbacks_, j_render_frame_id_, j_frame);
@@ -792,8 +793,8 @@ class JavaVideoRendererWrapper
// Return a VideoRenderer.I420Frame referring texture object in |frame|.
jobject CricketToJavaTextureFrame(const cricket::VideoFrame* frame) {
- NativeHandleImpl* handle =
- reinterpret_cast<NativeHandleImpl*>(frame->GetNativeHandle());
+ NativeHandleImpl* handle = reinterpret_cast<NativeHandleImpl*>(
+ frame->video_frame_buffer()->native_handle());
jfloatArray sampling_matrix = jni()->NewFloatArray(16);
jni()->SetFloatArrayRegion(sampling_matrix, 0, 16, handle->sampling_matrix);
return jni()->NewObject(
« no previous file with comments | « no previous file | webrtc/media/base/videoframe.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698