diff --git a/.idea/misc.xml b/.idea/misc.xml index 5c9f89f..54d5acd 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - + diff --git a/app/libs/mediapipe_pose_tracking.aar b/app/libs/mediapipe_pose_tracking.aar index cf39e8b..f7ef8c0 100755 Binary files a/app/libs/mediapipe_pose_tracking.aar and b/app/libs/mediapipe_pose_tracking.aar differ diff --git a/app/src/main/assets/pose_tracking_gpu.binarypb b/app/src/main/assets/pose_tracking_gpu.binarypb index 3ce2c51..9e6900f 100755 --- a/app/src/main/assets/pose_tracking_gpu.binarypb +++ b/app/src/main/assets/pose_tracking_gpu.binarypb @@ -1,7 +1,4 @@ -…ConstantSidePacketCalculator2PACKET:enable_segmentationBI -Atype.googleapis.com/mediapipe.ConstantSidePacketCalculatorOptions - `FlowLimiterCalculator input_videoFINISHED:output_video"throttled_input_videoj FINISHED ×PoseLandmarkGpuIMAGE:throttled_input_video"LANDMARKS:pose_landmarks"#SEGMENTATION_MASK:segmentation_mask"DETECTION:pose_detection"%ROI_FROM_LANDMARKS:roi_from_landmarks*'ENABLE_SEGMENTATION:enable_segmentation diff --git a/app/src/main/java/top/rrricardo/motioncapture/MainActivity.kt b/app/src/main/java/top/rrricardo/motioncapture/MainActivity.kt index 0d1d405..ea1e961 100644 --- a/app/src/main/java/top/rrricardo/motioncapture/MainActivity.kt +++ b/app/src/main/java/top/rrricardo/motioncapture/MainActivity.kt @@ -40,7 +40,6 @@ class MainActivity : AppCompatActivity() { init { // 加载项目中用到的jni库 System.loadLibrary("mediapipe_jni") - System.loadLibrary("opencv_java3") } override fun onCreate(savedInstanceState: Bundle?) { @@ -80,7 +79,6 @@ class MainActivity : AppCompatActivity() { processor.videoSurfaceOutput.setFlipY(true) - // æ•èŽ·èŽ·å¾—çš„å标数æ®åŒ… // é‡åˆ°InvalidProtocolBufferException // å‚考 https://github.com/google/mediapipe/issues/1013 @@ -91,8 +89,13 @@ class MainActivity : AppCompatActivity() { ) { Log.i(tag, "Received Landmark Packets.") try { - val landmarkList = PacketGetter.getProto(it, NormalizedLandmarkList::class.java) - Log.i(tag, getPoseLandmarksDebugString(landmarkList)) + // 无法采用这ç§æ–¹æ³•èŽ·å–packet + // 回报Fatal signal 6 (SIGABRT), code -1 (SI_QUEUE) in tid 15943 (Thread-9), pid 15810 (o.motioncapture) + /*val packetRaw = PacketGetter.getBytes(it) + val landmarks = NormalizedLandmarkList.parseFrom(packetRaw) + Log.i(tag, getPoseLandmarksDebugString(landmarks))*/ + val landmarks = PacketGetter.getProto(it, NormalizedLandmarkList.getDefaultInstance()) + Log.i(tag, getPoseLandmarksDebugString(landmarks)) } catch (exception: InvalidProtocolBufferException) { Log.e(tag, "failed to get protocol.", exception) } diff --git a/build.gradle b/build.gradle index 2536974..3aa8eea 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.3.1' apply false - id 'com.android.library' version '7.3.1' apply false + id 'com.android.application' version '7.4.0' apply false + id 'com.android.library' version '7.4.0' apply false id 'org.jetbrains.kotlin.android' version '1.7.20' apply false } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d288949..f64d380 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Sat Jan 07 16:28:48 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME