diff --git a/app/src/main/assets/config.static b/app/src/main/assets/config.static index 29b6eaf..0a795dc 100644 --- a/app/src/main/assets/config.static +++ b/app/src/main/assets/config.static @@ -40,6 +40,8 @@ module vumeter.so module_app account.so module_app debug_cmd.so module_app mwi.so +avcodec_h264enc h264_mediacodec +video_fps 30 evdev_device /dev/input/event0 opus_samplerate 48000 opus_stereo no diff --git a/app/src/main/kotlin/com/tutpro/baresip/plus/BaresipService.kt b/app/src/main/kotlin/com/tutpro/baresip/plus/BaresipService.kt index 76661bf..89c989f 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/plus/BaresipService.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/plus/BaresipService.kt @@ -1420,6 +1420,7 @@ class BaresipService: Service() { val ua = UserAgent.ofUap(uap) val aor = ua?.account?.aor + Log.w(TAG, "[RITO] got uaEvent $event/$aor/$callp") Log.d(TAG, "got uaEvent $event/$aor/$callp") if (ua == null) { diff --git a/app/src/main/kotlin/com/tutpro/baresip/plus/Config.kt b/app/src/main/kotlin/com/tutpro/baresip/plus/Config.kt index e04d782..ed82d69 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/plus/Config.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/plus/Config.kt @@ -191,7 +191,7 @@ object Config { val cameraManager: CameraManager = ctx.getSystemService(Context.CAMERA_SERVICE) as CameraManager //val defaultSizes = arrayListOf("320x240", "640x480", "720x480", "960x720", "1280x720", "1920x1080") - val defaultSizes = arrayListOf("720x480", "1280x720", "1920x1080") + val defaultSizes = arrayListOf("640x480", "960x540", "1280x720", "1920x1080") /* for (id in cameraManager.cameraIdList) { val cameraCharacteristics = cameraManager.getCameraCharacteristics(id) @@ -224,6 +224,7 @@ object Config { Size(videoSize.substringBefore("x").toInt(), videoSize.substringAfter("x").toInt()) } + //BaresipService.videoSize = Size(640, 480) config = "${config}video_size " + "${BaresipService.videoSize.width}x${BaresipService.videoSize.height}\n" diff --git a/app/src/main/kotlin/com/tutpro/baresip/plus/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/plus/MainActivity.kt index 6fd2679..9c05c62 100644 --- a/app/src/main/kotlin/com/tutpro/baresip/plus/MainActivity.kt +++ b/app/src/main/kotlin/com/tutpro/baresip/plus/MainActivity.kt @@ -2201,6 +2201,7 @@ class MainActivity : AppCompatActivity() { private fun handleIntent(intent: Intent, action: String) { Log.d(TAG, "Handling intent '$action'") + Log.w(TAG, " Handling intent '$action'") val ev = action.split(",") when (ev[0]) { "no network" -> { // 네트워크 안잡힌 경우 @@ -2264,7 +2265,9 @@ class MainActivity : AppCompatActivity() { resumeCall = call if(ev[0] == "call answer") { - videoButton.performClick() + Handler(Looper.getMainLooper()).postDelayed({ + videoButton.performClick() + }, 1000) } } "call missed" -> { diff --git a/distribution.video/baresip/lib/arm64-v8a/libbaresip.a b/distribution.video/baresip/lib/arm64-v8a/libbaresip.a index 2d153f8..92f6aa9 100644 Binary files a/distribution.video/baresip/lib/arm64-v8a/libbaresip.a and b/distribution.video/baresip/lib/arm64-v8a/libbaresip.a differ diff --git a/distribution.video/ffmpeg/lib/arm64-v8a/libavcodec.so b/distribution.video/ffmpeg/lib/arm64-v8a/libavcodec.so index 46f3220..cc1d5ff 100644 Binary files a/distribution.video/ffmpeg/lib/arm64-v8a/libavcodec.so and b/distribution.video/ffmpeg/lib/arm64-v8a/libavcodec.so differ diff --git a/distribution.video/ffmpeg/lib/arm64-v8a/libavdevice.so b/distribution.video/ffmpeg/lib/arm64-v8a/libavdevice.so index 03cc0f1..ab2351c 100644 Binary files a/distribution.video/ffmpeg/lib/arm64-v8a/libavdevice.so and b/distribution.video/ffmpeg/lib/arm64-v8a/libavdevice.so differ diff --git a/distribution.video/re/lib/arm64-v8a/libre.a b/distribution.video/re/lib/arm64-v8a/libre.a index 3769ebe..6c655e2 100644 Binary files a/distribution.video/re/lib/arm64-v8a/libre.a and b/distribution.video/re/lib/arm64-v8a/libre.a differ