From bff0c8ea0567108f3cb4640b67105ad90aa327dc Mon Sep 17 00:00:00 2001 From: penghuailiang Date: Wed, 29 Apr 2020 20:07:54 +0800 Subject: [PATCH] lipsync --- Assets/LipSync/Demo/Scenes/AudioScene.unity | Bin 59204 -> 59220 bytes Assets/LipSync/Demo/Scenes/FmodScene.unity | Bin 137916 -> 137932 bytes Assets/LipSync/Scripts/Core/MathToolBox.cs | 15 ++++++--------- Assets/LipSync/Scripts/LipSync.cs | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/Assets/LipSync/Demo/Scenes/AudioScene.unity b/Assets/LipSync/Demo/Scenes/AudioScene.unity index be65b71a761001d58ae9410182adb88e6aa3d700..57cd2f922c3833f348c70d856781dec087c5beaa 100644 GIT binary patch delta 1197 zcmYk5Ur1AN6vxj{@~*O6b7onwUSzZilaf6&x|P_9q(xCiOsgj!qE-6v)E26qaccY7^F3LFC3A+;C1< zOijm~egitIJJ3{Fi3aKc8%A7u-OPgPh#n$x-;A(=nuNhzPZR+~ zpjoM8k#r!h!kQE2Mv_5}U8UziV=n>~lq2EvhcR~%8IRvDm9`B;KaeBP3t<7Leu@EM zF?A6JqZ-qrlc$?2e)1tu9~fWYCYl$vAPj*PgjK0H40+eTr{HIP``PYCpkR&O-FLzk zz^vWP2#YCO(&^7_)Q0noV~5xfsMUs$usoP$Xcrb$Ct=89_jxCIhUV6~7B-lhwV_2= z4$Lwf5!R*pVMy0$!>y$EufexP8*U5Bf?0-$u(0|G!|Scu5K2Bf&NDP@(}s3oX|Ms* z_-%FwyPyuf!P|7}bMdh;c?u0Q24+Mx|AQZd0SL(?Vibv9(dtgqiE%%}FGa4x(=z3AX~u~;#B zgS&fn>ND_Fn0uGr$t7WV)tz#>JUBNd?&337l1gV{C{>qX)RQ{NUco(AaWc=3DPbDHAQdysvB%jq3Nfk=Q?Bc>VxV57_$v delta 1178 zcmYL|Pe{{Y7{{Nn;kIhEHD{I;>td@_EHl|<@Tj=TifO1WKKG!3l9k zG%uAjl5XT~j0ItCBooN7X?oe=Xhfir@?^b{IM%&_jF&$omDcS<732u?T3FbtcQGt1 zsd`}8KxF`(yt;*zuVDmwQcc8vP@+X)Gr|z)yD(B27>d6CyWl;4_~witkWr&g_mi+0 zF!OXLge8?F=Z)ldXv5`(k0;p>uGNN^up*dg=n~eeI$=oT^!X%t4bAO!Eo=zw(uNjc zc`(y(T3A92!7x&%4R>WW71pYr!mzPlzvp*S2?zAL zmajg(&W1dg`Sq^~Gt?3cl>^$aCY8`ZZD_g@yvc?%nECaGg$2~naomd_(KB@LyI8W1 z-Qw=PL;4Q<6y`pxPjXpUQT2~|eYLnZ2A<+OwnANMp4Hd~nVSbQOL hSTOi!#o*kg)~9^x{&bb4N0kf5)SpR5wyod@`~`T*&&2=$ diff --git a/Assets/LipSync/Demo/Scenes/FmodScene.unity b/Assets/LipSync/Demo/Scenes/FmodScene.unity index 76cdfe78af3c14aea3a1ec9359b311c6e8a2ee8f..2dfa779cb406a97c3296e3bf372070a0ac7aceac 100644 GIT binary patch delta 1178 zcmYL|O-NKx6vyvUrFOKkuI3IsDH#@6C&5N#&aAz}x{B1OeZ&k=`OWltOx4sMOuD5*0L*TBj@TmD02YvM;5@M|(E|s| zsj9n%7PlS7!R+cQ#5^Tx<*US!Vjd1gsmk>JJXIlQm;>{nm;5q)#F(WzT_Y9}Mc+-Y z?&53?m4%S=aq_TqSO6PEEWe|hSisF$5V73i&C6h&tV@Y@I1HAles3wW0A|03cf?xD z)n>ERV=dAlDW>7jx{tFD)USbGJ}WbaD%57jiKW1NsFRzWAZ7`^W_ri>EANiY4Zn2o zc$7mYu_T!7aEX{9{BRhqR1U+%KiZ{(Ri&yQ5NiXoHyb0C5|7{zIH3A%nMSX4Fb;Bd z5!1S%Kg7Dh;)vy+{~xhhvA$+H=c+lo09poRDC3E`*3bNQ$XgQYSm6_;GZC##6T=&N zIbA0ds~aQFvNl|k<^kQlgyDF$)(}plc~x$G6JwEiD7=~GUWcp*H)MEC!QP=*qpfgv zhL1aor5XKjG1)OFODt_UteB>rV|aycGaesXWj&yQ?d;!q#^t7(oB MhnzCzaA~vrKS{MCumAu6 delta 1160 zcmYL|OH30{6o&5|Mj5ce;5hWb!=kb?h6E*OQU#5Xjj=3@ER2EyF}mTAMi(NF7{UUR z%C!`C8d<6V8`3UVlwFNPs|(YG3-G;Biw}eZ!T**s-bqgGobR0Z&pCH;=4XuA8N*=g zmzQb2*=Zv^7P~iI>xpH?=JI0mPh3a(?atwg49`>nXMH$zSShiZLe3`P+b}n=4A=pV z954?t)5Y0AnFCwQf7*+KHG$p6DfQkF%YZ$CZ^7PgvVJzQowF7I59|XaE`T+_-v;|g z%wNRW4fy%6fzKO-2xl<*?$kQmJ)Rzy~LQP`ep@8OBHPnrF~K%2<8+$Lo5w8hymoSoF&#Gx}jj$D*N*2 zLQY`>%*nn&%q&$SUnQ0lb5LMz73uleSSfp$0&74md6B)uvS3bM*NAnAlJ8bv#lu+= znZ+>sVS2w*NO(EB3twKlk66&hSqQ$I;@RU+t;|b_HYi*#Q}v!xBmw5sdr7RmTuqj! zj+~GRNihwD`U=k8QoVZKc}hk+m1?p>#8O}l$di*DCT0kpwE`o%ly>`{?@S25oHiBGykc-bg-wiSv0H&VXK zw8$;3RhKIs`J$aK7&^|_>tl@hqo=tR$nj{HYx`W|eMLvRUeyJpMN?dxuRF{p#cY3u1{|6c% B7?J=0 diff --git a/Assets/LipSync/Scripts/Core/MathToolBox.cs b/Assets/LipSync/Scripts/Core/MathToolBox.cs index ed58c6f..f6aedcf 100644 --- a/Assets/LipSync/Scripts/Core/MathToolBox.cs +++ b/Assets/LipSync/Scripts/Core/MathToolBox.cs @@ -47,7 +47,6 @@ public static float[] DiscreteCosineTransform(float[] data) { sumCos += data[k] * Mathf.Cos((Mathf.PI / data.Length) * m * (k + 0.5f)); } - result[m] = (sumCos > 0) ? sumCos : -sumCos; } @@ -122,13 +121,11 @@ public static void FindLocalLargestPeaks(float[] data, float[] peakValue, int[] isIncreasing = false; } - if (peakNum >= peakValue.Length) { break; } } - Debug.Log("len: " + peakValue.Length); } /// @@ -142,7 +139,7 @@ public static float[] GenerateGaussianFilter(int size, float deviationSquare) float[] result = new float[size]; float sum = 0.0f; - float mu = (float) (size - 1) / 2; + float mu = (float)(size - 1) / 2; for (int i = 0; i < size; ++i) { float param = -((i - mu) * (i - mu)) / (2 * deviationSquare); @@ -179,16 +176,16 @@ public static float[] GenerateWindow(int size, EWindowType windowType) break; case EWindowType.Hanning: for (int i = 0; i < size; ++i) - result[i] = (float) (0.5f * (1.0 - Mathf.Cos((2 * Mathf.PI * i) / size))); + result[i] = (float)(0.5f * (1.0 - Mathf.Cos((2 * Mathf.PI * i) / size))); break; case EWindowType.BlackMan: for (int i = 0; i < size; ++i) - result[i] = (float) (0.42f - 0.5 * Mathf.Cos((2 * Mathf.PI * i) / size)) + - (float) (0.08 * Mathf.Cos(4 * Mathf.PI * i) / size); + result[i] = (float)(0.42f - 0.5 * Mathf.Cos((2 * Mathf.PI * i) / size)) + + (float)(0.08 * Mathf.Cos(4 * Mathf.PI * i) / size); break; case EWindowType.BlackmanHarris: for (int i = 0; i < size; ++i) - result[i] = (float) ((0.35875 - 0.48829 * Mathf.Cos((2 * Mathf.PI * i) / size)) + + result[i] = (float)((0.35875 - 0.48829 * Mathf.Cos((2 * Mathf.PI * i) / size)) + (0.14128 * Mathf.Cos(4 * Mathf.PI * i) / size) - (0.01168 * Mathf.Cos(6 * Mathf.PI * i / size))); break; @@ -229,4 +226,4 @@ public static float GetValueFromArray(float[] data, int index, EPaddleType paddl } } } -} +} \ No newline at end of file diff --git a/Assets/LipSync/Scripts/LipSync.cs b/Assets/LipSync/Scripts/LipSync.cs index 2de8785..e61d449 100644 --- a/Assets/LipSync/Scripts/LipSync.cs +++ b/Assets/LipSync/Scripts/LipSync.cs @@ -89,7 +89,7 @@ protected void UpdateForward() } } visualization.Update(runtimeRecognizer.playingAudioSpectrum); - if (recognizeText) recognizeText.text = recognizeResult; + if (recognizeText) recognizeText.text = "RecognizeResult: " + recognizeResult; } }