From b4df911c64e283ef48adafcfc7bd4b00d79e70a7 Mon Sep 17 00:00:00 2001
From: jackfiled <xcrenchangjun@outlook.com>
Date: Thu, 19 Jan 2023 18:37:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=BC=96=E8=AF=91aar?=
 =?UTF-8?q?=E5=92=8Cbinarypb=E8=A7=A3=E5=86=B3=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84=E4=BA=BA=E4=BD=93=E9=81=AE=E7=BD=A9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E5=8D=87=E7=BA=A7=E4=BA=86gradle=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=20=E7=A7=BB=E9=99=A4=E4=BA=86=E5=BC=83=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84getProto=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |   2 +-
 app/libs/mediapipe_pose_tracking.aar          | Bin 21704101 -> 21704101 bytes
 .../main/assets/pose_tracking_gpu.binarypb    |   3 ---
 .../rrricardo/motioncapture/MainActivity.kt   |  11 +++++++----
 build.gradle                                  |   4 ++--
 gradle/wrapper/gradle-wrapper.properties      |   2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/libs/mediapipe_pose_tracking.aar b/app/libs/mediapipe_pose_tracking.aar
index cf39e8b820df090f487c432c31318e33c3d60211..f7ef8c023283af3e490379398152e1fc1899549d 100755
GIT binary patch
delta 1562
zcmZA1RZtXA7>40l5m0OtL`7^YuxJyNP%&{8ySsbMwN}^eM#Vw}TT$#-ySux)MQnXP
zF1YaGdFP-1?wm7oVsEc^ip404!IH*eXGxo2|0T}u+6<rh$#M1pj=ruZ+r#P?Zx07J
zA|2Ah2^o+PnUEP-kQLeBjO@q(7q}uP+>i^okq7R`3lHQ&eiT4K6hdJXfhUTh7>c6=
zO2P}?D237}gR&?GANax#{s=%If>0h6P!W|-8C4LBs;GwQ2tg>q5RMwCiCTz2ZPY<s
z)I)tVKqMN%h(>6f=ocU5>6UW6t!z>Lsn;8Ai?T-BnxH9~p*dQhC0e01+Mq4kp*=dF
zBRZiox}Yn%p*wn@Cwieb`k*iRp+5#-AO^vN!5D&}7>3~(0W(Ho6h>nV#=?Se7!NBZ
zU?L`AGNxcEreQi}U?yf^Hs)Y1=3zb-U?CPE8jG<6OA&)*SdJA~iB*WjYOKLp#33H*
zupS$*5u30XTd)<|kbv#jfkf=YF6_o0?8QFp#{nF~A=q#jM{pF!5~FR$2PC9CtF!4u
zQ0lWrnod|FO($^*r*Q^naSrEk0T*!zmvIGGaShjT12=ICw{Zt|aS!+L01xp9kMRUg
z@eI%L0x$6juki+N@ec3t0Uz-RpYbIz(v)=2A>}A8=A^*XqZrLeR-^eVlJO1S@dH2c
z3%~IPe<vHwhUrk!D0WI(#a?kx9F=rRdc{e}pk!1sDVdclN>(MC;;dv>awsl}tCCZ3
zQ*tS}l{|{Ol2`Fi@+tY10!l%pkWyGFqIfDrm10V9rG!#a@lw2%Qc7v1j8ax9r}!wo
zil5@I1So+@kWyZ$pj1>UDV3EfO0ZH@siss{LX=P?ObJ(NC^ZcSjOJQ~xD9%=rCt$+
jP&<C?n2k*CTE%o`3i)q$mR<ONJAdy8Ls-ggB$MYq{3OWK

delta 1562
zcmZA1RZtXA7>40l5Ks&hMNzR83&f(tmQXQq6}!88&9zq7?ncEz1;s?MW9{zl?iRb=
zj|(oic;5NvzdPs5oS54ioMSNBVzAg*>@8^$9KOWb2gUm=_!jHn@3hkHNC#Mb;~d}!
zC!|F>I3qnWAR{ut1(}fruE>gPa6@+FfID&`7jnY`d5{<RkRJt55QR_}Mc|2|D2C!F
zfs*ioH%h?=rBMcDQ4Zzd3qSZH0D-80AXG#pR7Mq4MKx4M4Fn?up$J1w)Ix29qYmn#
z9_ph38X^LXU_@gyN%W12^mI?Y-qyBAzm)5ZvPD{>Y)#P&&Cvoa(F(2625r#}?a=`p
z(FvW=1zph%-O&R*(F?uN2Yt~G{V@OoF$jZU!VnC_Fbu~CjD#7ZFdAbp7UN*Scuas5
z6EO*sF$GgG4bw3LGcgOZF$Z%o5A(4A3$X}`5rrjKie-q#a;(5gtio!<U=7w{9byrO
z_1J)TY{VvP#ujYFHY8v>b|4Wuu?xGg2Yay(`*8pVaR@dX#t|IFvBW6b@qr1+&+2MA
z5t#C<5vCK?2-8WN!fBkrS)9XpT);(K!ev~+Rb0b$+`vuT!fo8aUEITcJitRd!ecza
zQ#`|SyueGm!fU+2TfD=2e85M1!e@L*j4&k~bWA>qn>i^U<tRpTlGSMbif{OiANYx1
z_>DjKi+@v$X2T39c8a}{MsZLa6(=RFl1_0}(kmI1j7lcOMaisWQCyX*N;bt!$*$y3
z+?AY4E+x0(q2y8WD*2TBN&%&yQb;MR6j3~tqDnEPxKctXsdy>gN-4!hDXo-I$|~iQ
z@`|tGr}!%YN}y6f2~sL5m6Xa#6{V_DO{uQbP=b{ZB~%GhYAUr12aM+0hS+#L+A^<j
kLx?>;cJxLj53QoRFa@XDon;r6YUk%2ZU{}@jbifr4;!z@zyJUM

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
-

 `FlowLimiterCalculatorinput_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