| author | Xindong Xu <xindong.xu@amlogic.com> | 2018-04-10 09:30:46 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@droid04> | 2018-04-10 09:30:46 (GMT) |
| commit | e4cbc103223225b07388672166f975b0dcffb3a8 (patch) | |
| tree | cde39b483de17ed77187350002e7ab23a1e3af3a | |
| parent | d4107daa25bf3c874afd4619ca9a283880e44472 (diff) | |
| parent | a51c15a8b2ee4ec2aeec28aa50ae5dadfd4a6fca (diff) | |
| download | amlogic-ampere-20180311.zip amlogic-ampere-20180311.tar.gz amlogic-ampere-20180311.tar.bz2 | |
Merge "wifi/bt: fix short key cannot invoke Voice Recognition sometimes[1/2]" into ampere-20180311
| -rw-r--r-- | audio/audio_hw.c | 3 | ||||
| -rwxr-xr-x | audio/rcaudio/audio.bt.remote-arm.a | 1100 | ||||
| -rwxr-xr-x | audio/rcaudio/audio.bt.remote-arm64.a | 657 | ||||
| -rw-r--r-- | audio/rcaudio/huitong_audio.h | 6 |
4 files changed, 778 insertions, 988 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 0bf1e7f..c539805 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -4831,7 +4831,8 @@ static void adev_close_input_stream (struct audio_hw_device *dev, LOGFUNC ("%s(%p, %p)", __FUNCTION__, dev, stream); in_standby (&stream->common); - huitong_in_close(); + if (in->device & AUDIO_DEVICE_IN_WIRED_HEADSET) + huitong_in_close(); if (in->resampler) { free (in->buffer); diff --git a/audio/rcaudio/audio.bt.remote-arm.a b/audio/rcaudio/audio.bt.remote-arm.a index af72af7..9e0e48d 100755 --- a/audio/rcaudio/audio.bt.remote-arm.a +++ b/audio/rcaudio/audio.bt.remote-arm.a @@ -1,13 +1,13 @@ !<arch> -/ 0 0 0 0 7098 ` - -5 -\ - -4 -p -\ - +/ 0 0 0 0 7110 ` + + +! +< +I +I +0 + decode_indices.o/ decode_parameters.o/ decoder_set_fs.o/ @@ -26,615 +26,515 @@ tables_NLSF_CB_NB_MB.o/ tables_NLSF_CB_WB.o/ tables_pitch_lag.o/ tables_pulses_per_block.o/ -huitong_audio.o/0 0 0 644 84972 ` -ELF -E"aK1BJDAB +huitong_audio.o/0 0 0 644 104508 ` +ELF +E"aK1BJDAB + ` "yD `!FA -`(JT T-T=yDzD -O -8F Fd!:F +`r(H ;F,yD +O +PF' Fd!RF zD -`4 xDFh0`(F,`
-yD( xD -O -8F Fd!:F -d!@xD -xD +`h xDFh0`(F`
+yD| +xD +O +PF' Fd!RF +d!xD +xD zD -` -xD -P!xDF -!zD -P!xDF +`( +xD +}8 8*;FyDzD@O + );FyDzDO +P P*yDzDF| |);FyDzDp P!xDF +!zD A - -xD -xDd! -d!xD - - -zD -R`xDFh0` yDC(CR!xD07 {DB!l' F`
-zD#h`!`! - $P!xDF -"yD -`!FA -B` yD + +\ \);FyDzDP d!xDH + + +b +`;F`'yD +1F" +xD"ϊ!F# +DD\xD + 'yDzD () yD FA -! -#xD}D9hB -3 -IJyDzDIJyDzD -`d![oMO - - - - - - - - - - - - - - - - - - - - - - - - - +! +lXO +xD +zD +2`xDFh0` yDB(BR!xDF + +zD;h`9`! + ,P!xDF +"yD +`9FA +â` yDϊO +AF" +#xD~D)hB +3 +LO +`d!HxD + - - - - - -
xD~O4O - -6I 6J yD + + + + + + + + + + + + + + +
xDO4O + +=I$=J yD +p7IyD`(F5HxD - - + + - - - - - - - - - - - - - - - - - -` - - - - - - - - - - -8 -< -@ -D -H -L -P -T -h -m -r -x -~ - - - - - -$ -( -, -0 -4 -E -k -u -
- - - - - - - -5 -J -_ -i -! - - - - - - - - - -P - - - - -
-# -S -c -} - - - - - -+ - -| - - - - - - -D - -^ - - - - - -9 -? -M@ -SD -VH -]L -fP -mT -pX -q\ -t` -zd -h -l -p -t -x -| - - - - - - - - -% -? -I -G -k -{ - - - - - - - - - - -( -= -R -g - -l - - - - -8 -< -@ -D -H - L -P - T -3X -;\ -M` -Zd -fh -xl -p - - - - - - - -% - -J - -o - - - - - - -. -H -] -n - - - - - -! - - -+ -@ -U - -" -" -g% -| - -' - - - -, - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + +I +. + + + + + + + + + + + +C + + + + +L +M +N +M + + +M + + + + + +{ +{ + + +M +& +M + + + +& +.' + + + + + + + + + + + +.' +d + + + +O8 + + + +tM +t +tb; +t +u +ug; +uq; +w +M + +b; + + +6 ; + + + + + + + + + + + + + + +M +M +M + + + + + + + + + + + + + + + + + + + + + + + + + + + + + A - - - - - - -Q/J 3L - } .Qg -fJ -J + + + + + +O1J 3L +' } .Qg' +fJ +J l -K .K -J}f -J}.JJ -g MiF~J( -j ~.JFf'J6. KJ .!hK~J, -. - - H - / - - - - - -~ - -!0izJN ~J#. g J 3 K{f .
g J |f .
g ~ff
KI
K J}.. K I / - /} .~ ~J}f,~J
K} J ~Jf ~J. ~.
K ~}f
-,+J {J
f J9.. |..5/!J-.!g{J V{X. P |J . |J J |ff |JgV{J J~"J1J |f/. J |f J/ -/g |.. |.~J |Jf |J. |.f |J.{J ~f~f J - /ff
KI
K J|.. K I / - /| .f~ - -}0~ - {JO |fJJ/ -0IJzJEzJzJ"z J -6OK > AJ tzttzXfzfz -}6 -/gz - - - - - - - - - - -) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -w - - -y - -w -x -w - -~ - - -w -} -~ -w -w - -t - - - - -w - - - - -w - - - - - -w - - - -o -| -w -q -w -r -r - -s - -w -r - -s -r - -s -r - -s -r -w -w -w -w -q -w -q -w -r -w -r -r -q -w -w -w -r -r - -| - - -o -| -s -w -p -q -w -| - - -o -| +K .K + +J}f + +J}.JJ +g MiF~J( +j ~.JFf'J6. KJ .!hK~J, +. + + H + / + + + + + +~ + +&{Jf{f .2 Q{J .
/ KvJ . {.. K I / - /i . 0i}f}k' Y.(J~J( .'~.( ~J~f,~J
K}X' J' ~Jf' ~J.' ~.
K' ~X}f
+$+J {J
f{JJ J9.' }.5I.5K!.-5/-!{J V{. P ' |J .' |J J' |ff' |JgV{J' J~"J1J' }f/. J' }f J/ -/g' }..' }.~J' |Jf' |J.' |.f' |..{' J( + +}0~ +) {JO' |fJJ/
0IJzJEzJzJ"z J
6R +K > J tzttzX
fK-/-/J
gzfz +}6 +/ if K fKhz< + + + + + + + + + + + + += + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -w + -p + -| -r -l - -s -m -n - -w -w -r - -s -w -r - -r -r - - -s -s -w -r - - -s -~ - -z -9 - -{ - -x - -w -w - -w - -w -w -w -w - -~ - -~ -w - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1 - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ++ + + + + += + + +C +E + + + ELF D{D diff --git a/audio/rcaudio/audio.bt.remote-arm64.a b/audio/rcaudio/audio.bt.remote-arm64.a index 2b36114..e80167c 100755 --- a/audio/rcaudio/audio.bt.remote-arm64.a +++ b/audio/rcaudio/audio.bt.remote-arm64.a @@ -1,11 +1,9 @@ !<arch> -/ 0 0 0 0 7098 ` - - -YD - -t - +/ 0 0 0 0 7110 ` + +H + +Ҕ decode_indices.o/ decode_parameters.o/ decoder_set_fs.o/ @@ -24,391 +22,282 @@ tables_NLSF_CB_NB_MB.o/ tables_NLSF_CB_WB.o/ tables_pitch_lag.o/ tables_pulses_per_block.o/ -huitong_audio.o/0 0 0 644 111808 ` -ELF -{ V;@ - c -R * -R * - - c -R * - - c - - - -R * - -H -R * - -@y@ -9 +huitong_audio.o/0 0 0 644 128624 ` +ELF +{ V;@ + `@cRRc + + `@cRR +R * + +H +R * + + `@cRRc +R * + `@cRR + `@cRRc +@ 2 +R * +R * + `@cRR + - - -| - - - - - - - - - - - -p -x - - - - - - -h -m -r -x -~ - -( -0 -8 -@ -H -P -X -` -h - - - -
- - - -1 -F -V -k - - - - -1 - - - -7 -g -L - - - - -< -Q - -Z -Z
-t - - - - - - -/ -r - - - - - - -, - -K -o - -z - -8 - - -, -D -Z -9 -? -Mx -S -V -] -f -m -p -q -t -z - - - - - - -% - -% -% -% - - -} - - - - - - - - -- -~ -G - -a - - -8 - - - - - - -Q -V - - -p -x - - - - - - -3 -; -M -Z -f -x - -/ -? -I -c -} - - - - - - - - - -' - -F -w - - - - -j - -' -< -Q -z -s - - - -" -" -% - -( - - + +I +: + + + + + + + + + + + + +C + + + + +L +M +N +e + + +e + + + + + +" + +e + +e + +> +Y +}& + +' + + + + + + + + + + + + +' +: + + + + +8 + + +t +t +t; +t +u +u; +u< +w + + +; + + +6; + + + + + +6; +6; +e +e +e + + + + - - - - - - - - + + + + + + ( -$t} JE +$'t} JC J J -L +L O -JK ,J -J}J x - , -@~b, $ '6JK JL!J -J - -`Jb4 $ G - K - - - - - - - -( MzJJOz8N K# K=u J ~J - -J}J 7O K
K= uJ u
K=u J }$ K JK K ~~~J I K{J -4+J {
J J4J |JJ!KIJ!5J V{tJJ P | I |JKV |<"I1J |J/I JKK |J JL |t |JK |~J ~J~ I K
K JK K F~~J - -}h~ - {J |JJK -,KKIzzEz<z"zJ J -6 A JJ ,,,z(Jz< -40}0 - z$ -OK ,JK -J}J xwJ J J -Lt - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -, - - - - - -2 - - - -8 - - - - - - - - - - - - - - +JK ,J + +J}J x + , +@~b, $ '6JK JL!J +J + +`Jb4 $ G + K + + + + + + + +(1xR{ JN KJ
K=u JKvJ KJ JK K J O}' ^J'( J ~t~$40_<?JNJJ]JmJ-J-J&-ZJ~J
uJ' Et=' CJJ +8+J {
' }J4J4J' }JJ!KIJ5 V<{tJJ P{ J' |JK' |JKV' }' }J"1J' }JJ/ JL' }J JL' }<' |' |JJ' |J~J( J + + +J}J
|($
J'
+ +}h~ +) {J' |JJK
,KKIzzEz<z"zJ J
6 + JJ ,,,z(
JIIKJ
z< +40}0 +$ { +OK ,JK + +J}J x = JK + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +! + +! +9 +; +? + + + +H + + + + + + + + + + + + + + + + + + + ELF diff --git a/audio/rcaudio/huitong_audio.h b/audio/rcaudio/huitong_audio.h index 3e0a5b3..3654925 100644 --- a/audio/rcaudio/huitong_audio.h +++ b/audio/rcaudio/huitong_audio.h @@ -126,15 +126,15 @@ static int receive_index = 0; #define ADPCM_DATA_PART_NUM 5 //five parts as a frame static unsigned char ADPCM_Data_Frame[ADPCM_DATA_PART_NUM*GATT_PDU_LENGTH]; -static OpusDecoder *st; +static OpusDecoder *st = NULL; static struct BV32_Decoder_State bv32_st; static short decode_buf[1024]; -static int hidraw_fd = -1; +static volatile int hidraw_fd = -1; -static int huitong_rc_platform = RC_PLATFORM_UNKOWN; +static volatile int huitong_rc_platform = RC_PLATFORM_UNKOWN; ///////////////////// function prototype definition used in huitong_audio_hw.c //////////////// uint32_t huitong_in_get_sample_rate(const struct audio_stream *stream); |