Xin Li
0de71dd7a4
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 7ac13ae4aa
-s ours am: b3537f907a
-s ours
...
am: 9d138bd1e3
-s ours
am skip reason: subject contains skip directive
Change-Id: I241eff03f8e88fb2cef002ade4f415d42759b1fd
2019-02-20 10:09:38 -08:00
Xin Li
2ef1b029ce
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master" am: d5724aefe9
-s ours
...
am: 2dd3e2e6c9
-s ours
am skip reason: subject contains skip directive
Change-Id: I33bcb484a7e06e1f38cbd7dc9e25faccdc7feede
2019-02-20 10:05:48 -08:00
Xin Li
2dd3e2e6c9
[automerger skipped] Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
...
am: d5724aefe9
-s ours
am skip reason: subject contains skip directive
Change-Id: I2b7fecb7f6abba1645b3a201c9ae9bf57b22882e
2019-02-20 09:59:47 -08:00
Xin Li
9d138bd1e3
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master am: 7ac13ae4aa
-s ours
...
am: b3537f907a
-s ours
am skip reason: subject contains skip directive
Change-Id: Icc01260ec9ce2a2c3b5122327293ca2dc69976ce
2019-02-20 09:18:20 -08:00
Xin Li
b3537f907a
[automerger skipped] DO NOT MERGE - Merge PPRL.190205.001 into master
...
am: 7ac13ae4aa
-s ours
am skip reason: subject contains skip directive
Change-Id: Iadf52d35e2cf2a963d0a9b78cbcf7a8320d3b27d
2019-02-20 08:40:25 -08:00
Xin Li
d5724aefe9
Merge "DO NOT MERGE - Merge PPRL.190205.001 into master"
2019-02-20 16:25:58 +00:00
Xin Li
7ac13ae4aa
DO NOT MERGE - Merge PPRL.190205.001 into master
...
Bug: 124234733
Change-Id: Ib53d396a2651013248e3f1a9f0bc68556f747274
2019-02-18 15:58:24 -08:00
Xin Li
5edfde47c5
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master am: 8e6b62378b
-s ours
...
am: 1e76f33d25
-s ours
am skip reason: subject contains skip directive
Change-Id: I20b3c6186d964c2111c32e98032f988563459517
2019-02-14 20:57:54 -08:00
Xin Li
1e76f33d25
[automerger skipped] DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
am: 8e6b62378b
-s ours
am skip reason: subject contains skip directive
Change-Id: I0bc5b47403e54076c6d7096ec3108000188660dd
2019-02-14 14:28:25 -08:00
Xin Li
8e6b62378b
DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
...
Bug: 124234733
Change-Id: I7ed72a237fd7f0aa984b8077a369a1ddb5ba253b
2019-02-12 09:53:34 -08:00
android-build-team Robot
44e7ae4d1e
Snap for 5180536 from 75987acc79
to pi-platform-release
...
Change-Id: I5ebe5584689c6ac68fa82bef53068d114d4fc91f
2019-02-09 02:17:39 +00:00
Jean-Michel Trivi
169e4207a3
Merge "Add QMF analysis band sanity check" am: b30e02cfd3
am: db4a1deb28
...
am: 6ff2d3cf8e
Change-Id: I12bc58a0ed01daba0295a4a8feab853b6cc3f0f0
2019-02-01 07:54:00 -08:00
Jean-Michel Trivi
6ff2d3cf8e
Merge "Add QMF analysis band sanity check" am: b30e02cfd3
...
am: db4a1deb28
Change-Id: I0b4b5de02becd0a105e9958231ef2e58000d2cc8
2019-02-01 07:49:57 -08:00
Jean-Michel Trivi
db4a1deb28
Merge "Add QMF analysis band sanity check"
...
am: b30e02cfd3
Change-Id: I6f21f18ac59f27eecdddb37d81bdfacf34cbae38
2019-02-01 07:45:59 -08:00
Jean-Michel Trivi
b30e02cfd3
Merge "Add QMF analysis band sanity check"
2019-02-01 15:34:03 +00:00
Harish Mahendrakar
6a39cdb6ee
Don't explicitly enable CFI in libFraunhoferAAC
...
Since libFraunhoferAAC is a static library, both CFI and non-CFI variants will
be built and linked accordingly.
If it is used as a shared library in the future, we'll need to
explicitly re-enable CFI in the build file.
Bug: 117994055
Change-Id: I825c53b5f895e00c1fb9357c573b6b5c2261c743
2019-01-18 16:37:25 -08:00
Jean-Michel Trivi
2a2c62fbed
Merge "Do not support channel configuration change within PCE" am: ed56e77acb
am: a82589476a
...
am: 7ca245e21e
Change-Id: Ic339d07a62ddbecdc6c2efcd5834e5758c90f70f
2019-01-15 11:29:03 -08:00
Jean-Michel Trivi
7ca245e21e
Merge "Do not support channel configuration change within PCE" am: ed56e77acb
...
am: a82589476a
Change-Id: Ie9de704ba4aee6954e9ca82df8c56bc81a482c32
2019-01-15 11:19:49 -08:00
Jean-Michel Trivi
a82589476a
Merge "Do not support channel configuration change within PCE"
...
am: ed56e77acb
Change-Id: I46123b5bebaf9418a6033a1a88d5d2542f6ade6d
2019-01-15 11:10:33 -08:00
Jean-Michel Trivi
ed56e77acb
Merge "Do not support channel configuration change within PCE"
2019-01-15 18:46:27 +00:00
Fraunhofer IIS FDK
c47066df27
Add QMF analysis band sanity check
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I0001e0996a970e91a21bfe8ba051fdba0c06c219
2019-01-15 12:19:05 -05:00
Fraunhofer IIS FDK
9dc118a7d1
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()" am: bcda185d56
am: 4ab4454f29
...
am: 6d1247f2e2
Change-Id: I1552fb42268ad2b019b728a8d61561a9028a60ad
2019-01-03 17:10:27 -08:00
Fraunhofer IIS FDK
455d57b7e6
Merge "Integer overflow fix in _compressorIO_sigmoid()" am: 7c908b13b9
am: 195d913e65
...
am: 1ce3f9e135
Change-Id: I91b0c2eb123c2fce1039f942b1bc4e0137d2980e
2019-01-03 17:09:17 -08:00
Fraunhofer IIS FDK
6d1247f2e2
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()" am: bcda185d56
...
am: 4ab4454f29
Change-Id: I0ac3055487ce17f6218e3a0644778a0d8da27119
2019-01-03 17:05:25 -08:00
Fraunhofer IIS FDK
1ce3f9e135
Merge "Integer overflow fix in _compressorIO_sigmoid()" am: 7c908b13b9
...
am: 195d913e65
Change-Id: I7482706e761f2faeeb0fa42ec7f58427409d3519
2019-01-03 17:04:12 -08:00
Fraunhofer IIS FDK
4ab4454f29
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()"
...
am: bcda185d56
Change-Id: I0717e1ac3818b2516b3a57b929e2d84f4384dbce
2019-01-03 16:58:03 -08:00
Fraunhofer IIS FDK
195d913e65
Merge "Integer overflow fix in _compressorIO_sigmoid()"
...
am: 7c908b13b9
Change-Id: I8265838085c3db1931a4ccb614ec7e4cdcca63e5
2019-01-03 16:57:10 -08:00
Treehugger Robot
bcda185d56
Merge "Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()"
2019-01-04 00:48:28 +00:00
Treehugger Robot
7c908b13b9
Merge "Integer overflow fix in _compressorIO_sigmoid()"
2019-01-04 00:46:36 +00:00
Fraunhofer IIS FDK
691d00e6fa
Integer overflow fix in _compressorIO_sigmoid()
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I3b7c72a85fc735469cc785ca5aa0545485b91532
2019-01-03 10:32:39 -05:00
Fraunhofer IIS FDK
5c54fa5387
Add AOT specific number of qmf bands sanity check in SpatialSpecificConfig()
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: Ic106c4371c5ac17cb832c7d9db042bcc9d1e7a09
2019-01-03 10:25:40 -05:00
Jean-Michel Trivi
e9159da7c9
Merge "Return transport decoder error in case of invalid ELD configuration" am: 7884aefc84
am: 81b04be9ba
...
am: 9cc8070883
Change-Id: Ic870a0c4b7f796da18eb8ed2da533214d1e200eb
2019-01-02 12:54:32 -08:00
Jean-Michel Trivi
e656165e17
Merge "Add sanity check in huff_decode()" am: 3942213f19
am: 8d06f35f31
...
am: 04b22fae53
Change-Id: Id8704b2df146ed63947f3a9c4680c01f38d8f1e4
2019-01-02 12:54:17 -08:00
Fraunhofer IIS FDK
37492f80b1
Merge changes I7add6dff,I0249f758 am: b42dfa745b
am: 8bdeed59aa
...
am: e8d354305f
Change-Id: I7a8cf34b4af1234e412c346ba1c0610f047360d9
2019-01-02 12:54:01 -08:00
Jean-Michel Trivi
9cc8070883
Merge "Return transport decoder error in case of invalid ELD configuration" am: 7884aefc84
...
am: 81b04be9ba
Change-Id: Iab2c9ead062dd99dc441f7765bf02fb72736e37f
2019-01-02 12:50:22 -08:00
Jean-Michel Trivi
04b22fae53
Merge "Add sanity check in huff_decode()" am: 3942213f19
...
am: 8d06f35f31
Change-Id: I387be28f72d64ea61a1628d296d9abcdf361e54b
2019-01-02 12:50:10 -08:00
Fraunhofer IIS FDK
e8d354305f
Merge changes I7add6dff,I0249f758 am: b42dfa745b
...
am: 8bdeed59aa
Change-Id: I335f3e5f617add8bdbfc6e5c0bb6a0eab80f4f9a
2019-01-02 12:49:57 -08:00
Jean-Michel Trivi
81b04be9ba
Merge "Return transport decoder error in case of invalid ELD configuration"
...
am: 7884aefc84
Change-Id: Iff226ac091d4dffb5d94033c0afcfb0af4c5bfd2
2019-01-02 12:46:39 -08:00
Jean-Michel Trivi
8d06f35f31
Merge "Add sanity check in huff_decode()"
...
am: 3942213f19
Change-Id: I33db3f469583b7490860fb5f79189da6c5519085
2019-01-02 12:46:23 -08:00
Fraunhofer IIS FDK
8bdeed59aa
Merge changes I7add6dff,I0249f758
...
am: b42dfa745b
Change-Id: I7c8544215b13db8440c4a72671996da0fac3be2e
2019-01-02 12:46:02 -08:00
Jean-Michel Trivi
7884aefc84
Merge "Return transport decoder error in case of invalid ELD configuration"
2019-01-02 20:35:07 +00:00
Jean-Michel Trivi
3942213f19
Merge "Add sanity check in huff_decode()"
2019-01-02 20:34:44 +00:00
Treehugger Robot
b42dfa745b
Merge changes I7add6dff,I0249f758
...
* changes:
Return SpatialDecDecodeFrame() parse error in case extended frame does not match the spatial frame
Add sanity check in SpatialDecParseSpecificConfig()
2019-01-02 20:33:56 +00:00
Fraunhofer IIS FDK
e81e8c2cc0
Do not support channel configuration change within PCE
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I94bddad6c88148dd01fff0850e261d98ef691793
2019-01-02 14:01:25 -05:00
Fraunhofer IIS FDK
5174d33de0
Return transport decoder error in case of invalid ELD configuration
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I65c98830d361a82c9d173eadb44ff245cd076fdf
2019-01-02 13:58:02 -05:00
Fraunhofer IIS FDK
443d32ea7f
Add sanity check in huff_decode()
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I33e99629665df9aa6262c90dd7ebdde4b4b9d773
2019-01-02 13:48:42 -05:00
Fraunhofer IIS FDK
f440f28aa3
Return SpatialDecDecodeFrame() parse error in case extended frame does not match the spatial frame
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I7add6dff3b60ba0b36e5c83cee8031b37e970890
2019-01-02 13:36:02 -05:00
Fraunhofer IIS FDK
4a22282fe0
Add sanity check in SpatialDecParseSpecificConfig()
...
Test: atest DecoderTestXheAac ; atest DecoderTestAacDrc
Change-Id: I0249f75839829fdbc96218425e59ad914f9dfeda
2019-01-02 13:28:34 -05:00
Fraunhofer IIS FDK
907ffbf69d
Merge "Clear spatial specific config struct at the beginning of parse routines" am: 0142f38904
am: 0ef6247c4f
...
am: dedce44ca8
Change-Id: Icc705d54048e3edf07ec658b247d2291a78695ed
2018-12-29 06:31:58 -08:00
Fraunhofer IIS FDK
76b3d662bf
Merge "Free whole QMF domain in case of an error in FDK_QmfDomain_Configure()" am: f8881d4bfe
am: 005d5690b6
...
am: a556a32eae
Change-Id: I9969e394bc53319616246788b96c77193f61fa1f
2018-12-29 06:31:46 -08:00