hongshaorou/rustdesk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffi.RustDesk -> ffi.FFI

Browse Source
This commit is contained in:
rustdesk 2024-04-15 15:49:37 +08:00
parent 56d353cb64
commit 05f6fde467
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flutter/android/app/src/main/kotlin/com/carriez/flutter_hbb/MainService.kt
View File

@ -1,6 +1,6 @@
package com.carriez.flutter_hbb package com.carriez.flutter_hbb
import ffi.RustDesk import ffi.FFI
/** /**
* Capture screen,get video and audio,send to rust. * Capture screen,get video and audio,send to rust.
@ -195,7 +195,7 @@ class MainService : Service() {
override fun onCreate() { override fun onCreate() {
super.onCreate() super.onCreate()
Log.d(logTag,"MainService onCreate") Log.d(logTag,"MainService onCreate")
RustDesk.init(this) FFI.init(this)
HandlerThread("Service", Process.THREAD_PRIORITY_BACKGROUND).apply { HandlerThread("Service", Process.THREAD_PRIORITY_BACKGROUND).apply {
start() start()
serviceLooper = looper serviceLooper = looper
@ -207,7 +207,7 @@ class MainService : Service() {
// keep the config dir same with flutter // keep the config dir same with flutter
val prefs = applicationContext.getSharedPreferences(KEY_SHARED_PREFERENCES, FlutterActivity.MODE_PRIVATE) val prefs = applicationContext.getSharedPreferences(KEY_SHARED_PREFERENCES, FlutterActivity.MODE_PRIVATE)
val configPath = prefs.getString(KEY_APP_DIR_CONFIG_PATH, "") ?: "" val configPath = prefs.getString(KEY_APP_DIR_CONFIG_PATH, "") ?: ""
RustDesk.startServer(configPath) FFI.startServer(configPath)
createForegroundNotification() createForegroundNotification()
} }
@ -262,7 +262,7 @@ class MainService : Service() {
SCREEN_INFO.dpi = dpi SCREEN_INFO.dpi = dpi
if (isStart) { if (isStart) {
stopCapture() stopCapture()
RustDesk.refreshScreen() FFI.refreshScreen()
startCapture() startCapture()
} }
} }
@ -290,7 +290,7 @@ class MainService : Service() {
createForegroundNotification() createForegroundNotification()
if (intent.getBooleanExtra(EXT_INIT_FROM_BOOT, false)) { if (intent.getBooleanExtra(EXT_INIT_FROM_BOOT, false)) {
RustDesk.startService() FFI.startService()
} }
Log.d(logTag, "service starting: ${startId}:${Thread.currentThread()}") Log.d(logTag, "service starting: ${startId}:${Thread.currentThread()}")
val mediaProjectionManager = val mediaProjectionManager =
@ -343,7 +343,7 @@ class MainService : Service() {
val planes = image.planes val planes = image.planes
val buffer = planes[0].buffer val buffer = planes[0].buffer
buffer.rewind() buffer.rewind()
RustDesk.onVideoFrameUpdate(buffer) FFI.onVideoFrameUpdate(buffer)
} }
} catch (ignored: java.lang.Exception) { } catch (ignored: java.lang.Exception) {
} }
@ -377,16 +377,16 @@ class MainService : Service() {
} }
checkMediaPermission() checkMediaPermission()
_isStart = true _isStart = true
RustDesk.setFrameRawEnable("video",true) FFI.setFrameRawEnable("video",true)
RustDesk.setFrameRawEnable("audio",true) FFI.setFrameRawEnable("audio",true)
return true return true
} }
@Synchronized @Synchronized
fun stopCapture() { fun stopCapture() {
Log.d(logTag, "Stop Capture") Log.d(logTag, "Stop Capture")
RustDesk.setFrameRawEnable("video",false) FFI.setFrameRawEnable("video",false)
RustDesk.setFrameRawEnable("audio",false) FFI.setFrameRawEnable("audio",false)
_isStart = false _isStart = false
// release video // release video
virtualDisplay?.release() virtualDisplay?.release()
@ -521,7 +521,7 @@ class MainService : Service() {
thread { thread {
while (audioRecordStat) { while (audioRecordStat) {
audioReader!!.readSync(audioRecorder!!)?.let { audioReader!!.readSync(audioRecorder!!)?.let {
RustDesk.onAudioFrameUpdate(it) FFI.onAudioFrameUpdate(it)
} }
} }
Log.d(logTag, "Exit audio thread") Log.d(logTag, "Exit audio thread")

2
flutter/android/app/src/main/kotlin/ffi.kt
View File

@ -5,7 +5,7 @@ package ffi
import android.content.Context import android.content.Context
import java.nio.ByteBuffer import java.nio.ByteBuffer
object RustDesk { object FFI {
init { init {
System.loadLibrary("rustdesk") System.loadLibrary("rustdesk")
} }

8
src/flutter_ffi.rs
View File

@ -2108,7 +2108,7 @@ pub mod server_side {
use crate::start_server; use crate::start_server;
#[no_mangle] #[no_mangle]
pub unsafe extern "system" fn Java_ffi_RustDesk_startServer( pub unsafe extern "system" fn Java_ffi_FFI_startServer(
env: JNIEnv, env: JNIEnv,
_class: JClass, _class: JClass,
app_dir: JString, app_dir: JString,
@ -2122,7 +2122,7 @@ pub mod server_side {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "system" fn Java_ffi_RustDesk_startService( pub unsafe extern "system" fn Java_ffi_FFI_startService(
_env: JNIEnv, _env: JNIEnv,
_class: JClass, _class: JClass,
) { ) {
@ -2132,7 +2132,7 @@ pub mod server_side {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "system" fn Java_ffi_RustDesk_translateLocale( pub unsafe extern "system" fn Java_ffi_FFI_translateLocale(
env: JNIEnv, env: JNIEnv,
_class: JClass, _class: JClass,
locale: JString, locale: JString,
@ -2151,7 +2151,7 @@ pub mod server_side {
} }
#[no_mangle] #[no_mangle]
pub unsafe extern "system" fn Java_ffi_RustDesk_refreshScreen( pub unsafe extern "system" fn Java_ffi_FFI_refreshScreen(
_env: JNIEnv, _env: JNIEnv,
_class: JClass, _class: JClass,
) { ) {