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

Side by Side Diff: remoting/client/jni/chromoting_jni_runtime.cc

Issue 1288063004: Simplify FrameConsumer interface. Remove FrameProducer interface. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « remoting/client/jni/chromoting_jni_runtime.h ('k') | remoting/client/jni/jni_frame_consumer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/client/jni/chromoting_jni_runtime.h" 5 #include "remoting/client/jni/chromoting_jni_runtime.h"
6 6
7 #include "base/android/jni_android.h" 7 #include "base/android/jni_android.h"
8 #include "base/android/jni_array.h" 8 #include "base/android/jni_array.h"
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/android/library_loader/library_loader_hooks.h" 10 #include "base/android/library_loader/library_loader_hooks.h"
11 #include "base/android/scoped_java_ref.h" 11 #include "base/android/scoped_java_ref.h"
12 #include "base/basictypes.h" 12 #include "base/basictypes.h"
13 #include "base/command_line.h" 13 #include "base/command_line.h"
14 #include "base/memory/singleton.h" 14 #include "base/memory/singleton.h"
15 #include "base/stl_util.h" 15 #include "base/stl_util.h"
16 #include "base/synchronization/waitable_event.h" 16 #include "base/synchronization/waitable_event.h"
17 #include "google_apis/google_api_keys.h" 17 #include "google_apis/google_api_keys.h"
18 #include "jni/JniInterface_jni.h" 18 #include "jni/JniInterface_jni.h"
19 #include "media/base/yuv_convert.h" 19 #include "media/base/yuv_convert.h"
20 #include "remoting/base/url_request_context_getter.h" 20 #include "remoting/base/url_request_context_getter.h"
21 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
22 21
23 using base::android::ConvertJavaStringToUTF8; 22 using base::android::ConvertJavaStringToUTF8;
24 using base::android::ConvertUTF8ToJavaString; 23 using base::android::ConvertUTF8ToJavaString;
25 using base::android::ToJavaByteArray; 24 using base::android::ToJavaByteArray;
26 25
27 namespace { 26 namespace {
28 27
29 const int kBytesPerPixel = 4; 28 const int kBytesPerPixel = 4;
30 29
31 } // namespace 30 } // namespace
(...skipping 285 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 DCHECK(ui_task_runner_->BelongsToCurrentThread()); 316 DCHECK(ui_task_runner_->BelongsToCurrentThread());
318 JNIEnv* env = base::android::AttachCurrentThread(); 317 JNIEnv* env = base::android::AttachCurrentThread();
319 318
320 ScopedJavaLocalRef<jstring> j_type = ConvertUTF8ToJavaString(env, type); 319 ScopedJavaLocalRef<jstring> j_type = ConvertUTF8ToJavaString(env, type);
321 ScopedJavaLocalRef<jstring> j_message = ConvertUTF8ToJavaString(env, message); 320 ScopedJavaLocalRef<jstring> j_message = ConvertUTF8ToJavaString(env, message);
322 321
323 Java_JniInterface_handleExtensionMessage(env, j_type.obj(), j_message.obj()); 322 Java_JniInterface_handleExtensionMessage(env, j_type.obj(), j_message.obj());
324 } 323 }
325 324
326 base::android::ScopedJavaLocalRef<jobject> ChromotingJniRuntime::NewBitmap( 325 base::android::ScopedJavaLocalRef<jobject> ChromotingJniRuntime::NewBitmap(
327 webrtc::DesktopSize size) { 326 int width, int height) {
328 JNIEnv* env = base::android::AttachCurrentThread(); 327 JNIEnv* env = base::android::AttachCurrentThread();
329 return Java_JniInterface_newBitmap(env, size.width(), size.height()); 328 return Java_JniInterface_newBitmap(env, width, height);
330 } 329 }
331 330
332 void ChromotingJniRuntime::UpdateFrameBitmap(jobject bitmap) { 331 void ChromotingJniRuntime::UpdateFrameBitmap(jobject bitmap) {
333 DCHECK(display_task_runner_->BelongsToCurrentThread()); 332 DCHECK(display_task_runner_->BelongsToCurrentThread());
334 333
335 JNIEnv* env = base::android::AttachCurrentThread(); 334 JNIEnv* env = base::android::AttachCurrentThread();
336 Java_JniInterface_setVideoFrame(env, bitmap); 335 Java_JniInterface_setVideoFrame(env, bitmap);
337 } 336 }
338 337
339 void ChromotingJniRuntime::UpdateCursorShape( 338 void ChromotingJniRuntime::UpdateCursorShape(
(...skipping 24 matching lines...) Expand all
364 363
365 JNIEnv* env = base::android::AttachCurrentThread(); 364 JNIEnv* env = base::android::AttachCurrentThread();
366 Java_JniInterface_redrawGraphicsInternal(env); 365 Java_JniInterface_redrawGraphicsInternal(env);
367 } 366 }
368 367
369 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) { 368 void ChromotingJniRuntime::DetachFromVmAndSignal(base::WaitableEvent* waiter) {
370 base::android::DetachFromVM(); 369 base::android::DetachFromVM();
371 waiter->Signal(); 370 waiter->Signal();
372 } 371 }
373 } // namespace remoting 372 } // namespace remoting
OLDNEW
« no previous file with comments | « remoting/client/jni/chromoting_jni_runtime.h ('k') | remoting/client/jni/jni_frame_consumer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698