summaryrefslogtreecommitdiff
authorqi.yuan <qi.yuan@amlogic.com>2018-01-23 06:46:18 (GMT)
committer qi.yuan <qi.yuan@amlogic.com>2018-01-23 07:28:18 (GMT)
commite8f07a7eb40f601c595b70d39d295d2393850c10 (patch)
treee29dc064f027a2ce74c40b681d7d71b7ed6ac61a
parente50095c70e5513a9cd7b7c996df5f423e5650237 (diff)
downloadlibstagefrighthw-e8f07a7eb40f601c595b70d39d295d2393850c10.zip
libstagefrighthw-e8f07a7eb40f601c595b70d39d295d2393850c10.tar.gz
libstagefrighthw-e8f07a7eb40f601c595b70d39d295d2393850c10.tar.bz2
PD#152475
1.audio/ffmpeg changes caused cts encoder configure fail,Change it back here. 2.add libOmxAudio Change-Id: Ica52f1040e40f7f24bba2ce5aa610439d336687d
Diffstat
-rw-r--r--Android.mk12
-rw-r--r--lib/libomx_framework_alt.so318
-rw-r--r--lib64/libOmxAudio.so5
3 files changed, 176 insertions, 159 deletions
diff --git a/Android.mk b/Android.mk
index 9820904..40c770b 100644
--- a/Android.mk
+++ b/Android.mk
@@ -46,6 +46,18 @@ LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
include $(BUILD_PREBUILT)
include $(CLEAR_VARS)
+LOCAL_MODULE := libOmxAudio
+LOCAL_MULTILIB := both
+LOCAL_MODULE_SUFFIX := .so
+LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_CLASS := SHARED_LIBRARIES
+LOCAL_MODULE_PATH_32 := $(OMX_PATH_32)
+LOCAL_MODULE_PATH_64 := $(OMX_PATH_64)
+LOCAL_SRC_FILES_arm := lib/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+LOCAL_SRC_FILES_arm64 := lib64/$(LOCAL_MODULE)$(LOCAL_MODULE_SUFFIX)
+include $(BUILD_PREBUILT)
+
+include $(CLEAR_VARS)
LOCAL_MODULE := libOmxCore
LOCAL_MULTILIB := both
LOCAL_MODULE_SUFFIX := .so
diff --git a/lib/libomx_framework_alt.so b/lib/libomx_framework_alt.so
index 1efce59..f257c77 100644
--- a/lib/libomx_framework_alt.so
+++ b/lib/libomx_framework_alt.so
@@ -1,23 +1,23 @@
-ELF
+ELF
-
-
-
-W
-
-
-
+
+
+
+W
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
Em@`<(
@ ${Da0h
$! (P#A 'YDԞa@I .L!0
@@ -54,36 +54,36 @@ At[Ŋ֚KV6Piz50yA_XM+B7}zb`Av=^_XNE=


-H*FxDh H1!`xD!F@67
+H*FxDh H1!`xD!F@27
03/K
H!
-F
- F@A
-(
+F
+ F@=
+(
FxD
F
-
+
+
-)h<1`hh
+)h<1`hh
(6B
F0F.(
-)I) yDxh m I yDxhImG F
-|
-|
+)I) yDxh m I yDxhImG F
+|
+|
-OF(H FFxD
-G IJ yDzDGHF F HxD
-/3O:FO F?I@ ?
-FO2FI.
+G IJ yDzDGHF F HxD
+/3O:FO F?I@ ?
+FO2FI.
A yD

FO:FI
-zD Lw8F48FA4 
-C0hQ D F"0hQ Dz0hQ Dr H xD
+zD Lw8F48FA4 
+C0hQ D F"0hQ Dz0hQ Dr H xD
-H xD
+H xD
-6Bv0FL0FqJA
+6Bv0FL0FqJA
)F
@@ -93,7 +93,7 @@ D
p@
0Fl(lv0F4p"!F0F(hmLHPxD
h@p 
-(HPxD
+(HPxD
FxD F

@@ -106,40 +106,40 @@ D
(c8F(8Fndd~ F
4

-(c8F(8Fndd F
+(c8F(8Fndd F
1IRyD.
-
+


E
-|F(F F
+|F(F F
л0F
-KyD{D:IKyD{D2
-{
-
-[
-
-
-l
-W
+KyD{D:IKyD{D2
+w
+
+W
+꼰
+
+h
+S
퀽#h;A pG
-+
+'
56
-;
-
+7
+
-
-
+
+
HxD
-
-?
+
+;

 V A zYA,V
zD!OKDNM{D?h~Db}DO
_ Ih
-k+F
-K{Dhhh
+k+F
+K{Dhhh
guAFu`"u@
 gO0tupvpwppp,wgs p
0FE
@@ -148,43 +148,42 @@ K{Dhhh
 E
(`!
-(`!
+(`!

ppF. F0F
`*
-0Fp@ 
+0Fp@ 
H
I
KxDyD{D>
H
-I KxDyD{D6
+I KxDyD{D6
!sssB
sqssA
!ss0Fss
-)((ѝ
-
+)((ѝ
!G$xhh !G%)xhh!G' F.uNd0xhh!G
!GHxhh !GLH0xD
Y(F Y(F긳 &<c@ud(FF
h)F0Fv<1F(FFnF)F0F0<1F(F@
-&i)I) +FyDA
+&i)I) +FyDA
 XF
 F@
P0F@
-T@
+T@
%s
(c0F(
I@_
J
-
-(
+
+(
D
D
-
-!
+
+!
.. yDzDA
O

@@ -192,7 +191,7 @@ D
F
 -yDzD!`
!F`*
-@*8FBT 6xD
+@*8FBT 6xD
(OS0 ,-yD0zD`ι
(Oc
((y(@@wh8F
@@ -213,24 +212,23 @@ yD`'sp@
O`
 $yDzD
-06xD
-
-
+06xD
+
8@wh8FF
$D
- `2IJyD
-JzD0F)F
+ `2IJyD
+JzD0F)F
`*<@@
`@*koI@_coJ
`@
-(h8D)h>)y)=8I h@f0yD
+(h8D)h>)y)=8I h@f0yD
@@
-(h$
-
+(h$
+
єp8P(F4(F8F(
- I.
-
- Uxhh!G FeXH1xD
+ I.
+
+ Uxhh!G FeXH1xD
9F`*
@*0F
Xqa*@
@@ -238,7 +236,7 @@ D*Np`
HSp`
\D
-HxD
+HxD
`*Xp@
[p@*e
@@ -246,67 +244,67 @@ HxD
(hHe
Sp@
(h\
-HxD
+HxD
 fxhh!G FeP
Xp@
 `NpdSecgc@
 Hc8<S=c?cA
-\cL HPSxDQcSc
+\cL HPSxDQcSc
9F`*
@*0F
[p`*
5h@p
Hh@p
\D
- `
+ `
`*Xp@
[p@*;h@p
Np@
0hH"!I#!J
Sp@
-0h\
+0h\
9F`*
-@*0F
+@*0F
 <s@AcCcA*!ccpqccA*!cupccc@
-N
- fxhh!Gxhh!G Fhd"a
+N
+ fxhh!Gxhh!G Fhd"a
O
-eq|sffA*O
-0.,$ yDzDA
+eq|sffA*O
+0.,$ yDzDA
D
- `6
+ `6
D
-
+

(F@
@
-(F3(F
-
-.& yDzD.A
-& dd$yDzD
+(F3(F
+
+.& yDzD2A
+& dd$yDzD
pp!h@
`hBY!iB
jpd'@
-@'dh1B6@p
-DBآDB ٕI p `
+@'dh1B6@p
+ h+a"
+DBآDB ٕI p `
AF`*
-@pai
-
-
-
-
-
-hHF
-
-D& F"F  =h(FF F)F FIF"
+@pai
+
+
+
+
+hHF
+
+D& F"F  =h(FF F)F FIF"
(x
-PFHFJ
-# h S FfhB
-
+PFLFJ
+# h S FfhB
+

-
--
+
+-
Sp@
Op@
4 lc<\p@sAcCc@
@@ -321,23 +319,22 @@ $ c`scc@
zp@
0 `scc@
`@
-( <d8d`tddl`h!@TDtEdGd^ FTtdd FAF Fx
+( <d8d`tddp`h!@TDtEdGdb FTtdd FAF Fx
'JDA`*dH`B
"\$trddB*w0@D!@
- @HdxDT0
+ @HdxDT0
P
-PPPhBxhn!q xhn xhn!
-HxD I  yD
-p
-IyD h hl
-
-
+PPPhBxhn!q xhn xhn!
+HxD I  yDp
+IyD h hl
+
+%HxD
+
@F
-F IcFyD h h
-"F Fr (F
-"FHxD
-` F
-F(F iF F
+F IcFyD h h
+"F Fv (F
+"FHxD
+` F
6A
XFBF
@@ -345,27 +342,28 @@ F IcFyD h h



-FVF
+FVF

-G
-xD
-!F
-(FoBF
-
- GpGF
+G
+xD
+!F
+(FoBF
+
+ GpGF
pR@
p@
- F RR
+ F RR
Nreu h
.,dp .pldpcp .
pJ
pJ
- FoG 
-
- bh^h
-?o/o C02
-@-@
+ FoG 
+
+ bh^h
+?o/o C02
+@-@
+$$$$ %t%% % & &&$''|())+d./
@@ -378,29 +376,31 @@ secure memory not enough. but at least 1
-
+
+
-
+
A 
- "&D7zXZ
-?+ˁ^ӅيSߋ)e%Y$6,!Daەv| id8C$`29S<VBv
-ܳTf:^z&naR#cMB0216FOXoppD6E}M^SYu=ϕ5pR7itNK^:@/adeAZ|ƙusz(%PS
-'Դt|*p!c( G:713vHz۾7dyCأ?zG6"SxTz/=ȭ@WXAd-&KVBj9&7Yy-M`L< ,d,`|(SGb=Q1{mw8"
-&B0m6Tqἒƴ$ pM믻ͻ?= ʹz(wkgZ3
->oSĩX^+?;49G[r0ُR/w"f} fyrtuuv(99y&)Kt2(7%XTrr[H> 'Y몾=HԬDsIŋxF Ƙ]N]ˌ6{ѳ,"@_u_"^/Jb.Q5uuupBƶpD7P]  2y<BB89tcrG^{ \Nu^+~8AScDj!=u%z>Il6]p+F6 x {Yr_|Q=h6TiCis9ƕȯMIwz+tfdKR+D@^J$pP=WMQt˅B*Ehؘ0o޷/͂Bqlyu'
-w7Ҏ'.̺,I]=CE>odiSYTT&Dm 8ϔt[
- wpV0S>ݯgy}N\x͹[bˣ22AC|d' EܲT@Sž\# NmKT))IXC?eee/9ٕ(hr4J(oR1l"(+W(f:1b!aT[P`K@a &Xvj|mV =GWk4.Q :v5~Ǘ@;ҢH[yi?ByY(aCd\>Z,c}!ܤ" PeȓN3sHw,Cr"ߔv{ he֮BX`= •`; " Lu%0'X4ak pJX5wI҂pMX~
- H1klDfj/]$'"7u1A8Lȯa ZA'\+*b@\r᛬h
-`- /D ^&A;y,Q<:eK0,|,EPL*zW9(؟͒>KD/~l\Ŕ{{LbW|P_4@ -h0JŮp!Կ3} VcRBϢO7'Iho:Caȫ*-K%o_AC5y*GԽ
-07ss6 PGPkj1: i~\wb Ke6j8<w JQO: >(1mrG:_\^;RtfR[]<cUb$IZ θbְUbbH
-ǮȳPh)W9xy(3(.}#N#+;*w wxa \!(~wyv2̷zD?G}\zL$!
->$
-XUJZȺuxCO'nR&H=) %5uG=䢇pfbBA.Y 1OP\-mm{[k4/pvȦLS[춢9OO#2L A7hUe~7sWܮU׹ X&
-ŪQOygHx|}I!
-f{;%hFʘFQH/nó]X[|!30ʞ%S88 <=AYD#t?ˮ?
-Z=N<z.
-oJJ8͎"3^խ7v.j3K :o)0+kjr߫Գd'05TB
-;$P0>,ټ;=<0DR]"{Ws6U.*ɽ@~hȆ2;9"QRn:NY<CMkmtiYXoA|` Lþ\#E(Q8J"9fzafz7cQҎM?WFy& Si*bZ> #l'x{z5wbF=MT!Q
-U|=RLrgl&p=EЭ
- TqYCO_fbRAV'L\+:.w+$ga9w%# _07TZZXk7$s+ϸQUvw۰3Y&H
-ppQ-;wtzJ I}`sp<i5JQ2zlt' Cp*lj<Ҟ(Nsf#ԅWm,Z, љ~@*fto֛ٺ|jg g#p;uUtfO|?_Xd701"p\2~Q=,)+zH[_rQHgw3Mj7a`׮bQJZAj"J&LGha'}DYUy2<XG-v+=gGΤH{}\7]׿,fwL2XGwIծ ol+&`TE sWiخ29[XJv.2t
+ "&D7zXZ
+Wo2Q< 0g^RWT!-y7 W Y:8|,IbZ40!|z.r&I~} AzxЊT}Hxoif$%tj&4R`6-2Ϩؠ4oe\7:v{F[Ra1n[lǯ~ s҈Xk N*C]Hɟy&T1QeSr!ľI͟A;ƗQ~jolGK%Ol7e[uGs\eOxOB-O9E?+@2WMw?,Y]@(&23ʢ0+([EσC]=9aTGyܸTެ/+)3QږCZDVE{
+!V-98wJ-Ci1!g.6Be@$ȇ$@Yg|ڈ3viz ۳lrKbP6?#~A`!_f8<i#?)2{Vh5g "?
+~?BKϩ&9ɟnA|^[ې.䕀*T$CL'eoiVwF3R3Ƭh7OlZ3G1 Tl`
+t,Ơ49hvX{BHPyK7pӢT`(;ݴ҅{U*b}3vTSs0P#_xXkUw*!O ݡcƁ
+B|\ۺrP*tN90:.6VA kۛb (YVP+WʁdΤjlbVDΗ6UpSkXc İ UtVȋ~H uvRe3OYѯޤ>5.5rMf-(i hLh7;߀ `J.뜱"O „VTrrF5pb &?i9 \DrW#U̞/^쀮ҮKqʣ{u^V OV'=pGigYGx4<<j=3,q8ʚЁd_W1XոƩ|<FP`f ַg 5}}AF, s)ȵyJjqŘ3lLteegVIÂy"$pHDq tjǮCJ4%x4 4%UfS?p }Kl Ѣ%EnD"%Hxg-^F ,Q@̼@ߟπzohf}Mɡha6'/v2kV9Q޽).:0N2+.92k?uSZ"PZR 8-jjШZ~ d&i(/q(X rI{N/p? 4.s5T繟*a 
+NUcK3ޛ_ǿsp,=kc7p|!L5e=ϚN!w9be(74c7u`b1|ZaveGK5p 󣄘pߛ1
+ PڂBW
+l
+*G9;Ϝ$ 1K\*{mm^T#kAq'(q%;I-y\M\n'Sl4N5.ɏ (OlA$h}#d%%8a=ݟG]:UlĆ^.$k{1[q^ַ'c͵ե 4F)Xl@GΡ@-{Q?¾W7_}~ /jtgy'wpj3_P4<LA P^SH\%E3&I~CʶQ<-fx͜,$h"Z$|>V#lnU@ӫA+4]Ó@ ٚR#mnX:( s!B8L@S1S aPxP2\L呲
+ցIa<*@! q^wPi˓o8^ACD!/fny;5!_~SQu᜿V(Z0hg$dĦ={lW^HTt[]&ERuwZ :\;ܔhR0JL^4ϸi^S"PC3oa`^ i}15z KY8k>mһ `!veT1>뾒"0jGĊ7
+%NBgs\BUW^]ƍ1|( 0}RjȨZѷexD2dGFީNt5 :`d
+ÀulVU&*Ha",!J5sY,l2$;KTK$yճ{iE+DLD&@C /f΅L!-V i'D됄(Q/޿Y'.
+VP!+S|y-
+YT/ H!hVܯ@UPpL+E˵0*kI9XO(+hyZ&jC([ry?YFvi;ɔJ
+a78"9^
+E)iP^
+WDUS8E)+LD,vX//ٻԫl8*ЩR_`o|U%5gIF+BɾV$X
+9QV]ӳQ87\3IV ^9X7+Inb+!kf!p,+T=E^.(>`;*jx045YNW^ϒM;JP@]R|ypm ĊCa}No
+]Ѹ_ YoodFtbZ[֌-Uucڃ 1:lmzs3֊$%M#׹QFB~__:}ޡ\A=VTfX
+#WNpk`qf/fC*Ω,\[/EY ~FX$"ED-[sybLqbnΪV\%ELzI߁Wzz]<ܶNWv jF
+$6—}Z 57$T\\/`/,$Ō$dxs&NZ\D!kryQ>A3V?8z!áڠ`Deaƹ6[Ǘ` 6ߡic VD6v
+ MrNȁhH[$09yިXz2J6> \Wd1
diff --git a/lib64/libOmxAudio.so b/lib64/libOmxAudio.so
new file mode 100644
index 0000000..05d1344
--- a/dev/null
+++ b/lib64/libOmxAudio.so
@@ -0,0 +1,5 @@
+ELF
+
+a]
+Qځ4:UyAz ]}ޟ&͟8)?y;΄))В>Jg*S$ZDfc*qBm\si3}a5:B}/k#\!c`>T ]0*>|'3?W;;n-NS[z
+gf5 9j <Z[0c>o!*6L5]a|M4o~תagUUMz`JuEt|,Vt0)K;wl:>{
generated by cgit at 2024-05-18 20:42:39 (GMT)