fenix
/
fdk-aac
mirror of https://github.com/mstorsjo/fdk-aac.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,029 Commits 10 Branches 11 Tags 11 MiB
Commit Graph

1029 Commits

Author SHA1 Message Date
Xin Li c0dbde6b33 [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours am: 26a0396347 -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: I1713993ae0e8fb75c4e27fdad6c8e263b7391a03
 2020-09-11 02:02:53 +00:00
Xin Li 26a0396347 [automerger skipped] Merge "Merge Android R" am: 89b6626d5d -s ours 
am skip reason: Change-Id Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77 with SHA-1 7a0dde5d5d is in history

Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1421866

Change-Id: I6d537ca8862ea4f0409b2f173ab9d7e9cafc70ae
 2020-09-11 00:40:34 +00:00
Xin Li 89b6626d5d Merge "Merge Android R" 2020-09-10 17:22:12 +00:00
Fraunhofer IIS FDK 846f899a2f [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours am: a3d45a6804 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Icfcbfe06d528323ba83366db8bae197082329037
 2020-09-09 23:17:24 +00:00
Fraunhofer IIS FDK e82257ae36 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours am: 971b630c47 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I26b8dd96bf69eadd2fbee7487516667598ba546a
 2020-09-09 23:17:18 +00:00
Fraunhofer IIS FDK a3d45a6804 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 am: ce38f54339 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Ie337579b14a76c90016c6866d58422816d61ea0a
 2020-09-09 23:00:01 +00:00
Fraunhofer IIS FDK 971b630c47 [automerger skipped] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 am: 8336b89345 -s ours 
am skip reason: Change-Id I0150ac6d5a47ffce883010f531928656eebc619e with SHA-1 bb8f983bf3 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I5c2fc3f0ac04e75766a7f7141a6900f167023088
 2020-09-09 22:59:55 +00:00
Fraunhofer IIS FDK ce38f54339 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours am: 035cf671b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I8be6b18443220d62f6f0241003080db5da857e61
 2020-09-09 22:32:10 +00:00
Fraunhofer IIS FDK 8336b89345 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 am: 17dd8dfad9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I6162868554166db622bc72fb47a9cc61aaa51881
 2020-09-09 22:32:05 +00:00
Fraunhofer IIS FDK 035cf671b8 [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours am: 80ebc985fb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I9a57636513443249a25c6789ed2eb975cf91b45c
 2020-09-09 22:02:20 +00:00
Fraunhofer IIS FDK 17dd8dfad9 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: c516539a20 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12091300

Change-Id: I41058bf1a076509c564defa70247dcbfa91c64d0
 2020-09-09 22:02:14 +00:00
Fraunhofer IIS FDK 80ebc985fb [automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b am: d20df7ee14 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: Iad32917ed1a93b0a8749e6cad3555481a570943d
 2020-09-09 21:55:03 +00:00
Fraunhofer IIS FDK d20df7ee14 [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 am: 0468e02e5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I0f5863139bc848401b905625fdc572793755b8cf
 2020-09-09 21:44:15 +00:00
Fraunhofer IIS FDK 0468e02e5b [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: 50aa5be388 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12088847

Change-Id: I40c07a02e1528540b24a5380cff1249ed5076193
 2020-09-09 21:29:48 +00:00
Fraunhofer IIS FDK 33ea26a8d9 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). am: bb8f983bf3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12087395

Change-Id: Iddc8a0642d6a5bf1f84edb74f943b5dddd1fb7fd
 2020-09-09 21:09:55 +00:00
Fraunhofer IIS FDK bb8f983bf3 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). 
In the bug the SBR decoder has already set up 9 channels and tries to
allocate one more channel. The assignment of the QMF channels to SBR
channels fails since the QMF domain manages only 8+1 channels instead
of 10 channels as reqeusted by SBR.
Here we have added a check in sbrDecoder_InitElement() which will
return with a parse error in case additional SBR channels would exceed
the maximum number of SBR channels. This solves the potential heap
buffer overflow.

Bug: 158762825
Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac
Change-Id: I0150ac6d5a47ffce883010f531928656eebc619e
Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
 2020-09-09 19:01:09 +00:00
Xin Li 7f7e67fe02 Merge Android R 
Bug: 168057903
Merged-In: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
Change-Id: I29b7ae1003fb72aeb5fbf1fdfdceea849c1c12b8
 2020-09-08 16:53:57 -07:00
Xin Li 389ba21eed [automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 7a0dde5d5d -s ours 
am skip reason: Change-Id I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f with SHA-1 e0624f4c05 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/aac/+/12470067

Change-Id: I96f0085bd119bdb9733ac647ffb40ee40893e931
 2020-09-01 20:37:20 +00:00
Xin Li 7a0dde5d5d Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f
Change-Id: Idcdb13a8c37b0b4b5446169c3e80dfe55586bc77
 2020-08-27 10:16:06 -07:00
Jean-Michel Trivi e0624f4c05 Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 am: 946a672b0f 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: I9bd31724ae68b9a0b3eb4bb5be3782359824aa1f
 2020-07-10 17:56:32 +00:00
Jean-Michel Trivi 946a672b0f Merge "Improve code coverage for aac_dec_fuzzer" am: 760e8921c2 
Original change: https://android-review.googlesource.com/c/platform/external/aac/+/1324135

Change-Id: I49925ff2d6e55f0def55bf012f7ff3f33cacea4e
 2020-07-10 17:45:08 +00:00
Jean-Michel Trivi 760e8921c2 Merge "Improve code coverage for aac_dec_fuzzer" 2020-07-10 17:33:20 +00:00
Fraunhofer IIS FDK c516539a20 Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). 
In the bug the SBR decoder has already set up 9 channels and tries to
allocate one more channel. The assignment of the QMF channels to SBR
channels fails since the QMF domain manages only 8+1 channels instead
of 10 channels as reqeusted by SBR.
Here we have added a check in sbrDecoder_InitElement() which will
return with a parse error in case additional SBR channels would exceed
the maximum number of SBR channels. This solves the potential heap
buffer overflow.

Bug: 158762825
Test: atest DecoderTestAacDrc DecoderTestAacFormat DecoderTestXheAac
Merged-In: I0150ac6d5a47ffce883010f531928656eebc619e
Change-Id: I8569a15214707ab622e986b34b4b917251495662
 2020-07-09 08:56:14 -07:00
Fraunhofer IIS FDK 50aa5be388 [DO NOT MERGE] Fix heap buffer overflow in sbrDecoder_AssignQmfChannels2SbrChannels(). 
In the bug the SBR decoder has already set up 9 channels and tries to
allocate one more channel. The assignment of the QMF channels to SBR
channels fails since the QMF domain manages only 8+1 channels instead
of 10 channels as reqeusted by SBR.
Here we have added a check in sbrDecoder_InitElement() which will
return with a parse error in case additional SBR channels would exceed
the maximum number of SBR channels. This solves the potential heap
buffer overflow.

Bug: 158762825
Test: atest DecoderTestAacDrc DecoderTestXheAac
Change-Id: I741f49ab3b675fa3d3217ee72e1db66b0114f7ee
 2020-07-06 21:42:07 +00:00
S Vasudev Prasad c1a75279a1 Improve code coverage for aac_dec_fuzzer 
Test: ./aac_dec_fuzzer
Bug: 158206619

Change-Id: I42d57ec832dbd273f66ce149ce81bfcb1c514add
 2020-06-19 10:57:18 +05:30
Ray Essick 251785c993 point to new repo hooks for mainline uploads am: ebc1030f65 
Change-Id: Ibaae6c3cebad3d20b19447824bc5433601081968
 2020-05-29 23:49:26 +00:00
Ray Essick ebc1030f65 point to new repo hooks for mainline uploads 
Bug: 157501573
Test: upload
Change-Id: I0e4764db6516d17a81dc5a31bf9d9427b2c570d6
 2020-05-26 16:29:58 -07:00
Treehugger Robot 6d5490018a Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 am: e76ca4d9ac 
Change-Id: Ia1d49e25596031c732021bccb2a86a03f3ad874c
 2020-05-21 22:41:14 +00:00
Treehugger Robot e76ca4d9ac Merge "Fix license type s/b BY_EXCEPTION_ONLY" am: 86bd192796 
Change-Id: If0646e3c2b9b9927a58811606fff28e432e6d303
 2020-05-21 22:28:36 +00:00
Treehugger Robot 86bd192796 Merge "Fix license type s/b BY_EXCEPTION_ONLY" 2020-05-21 22:16:18 +00:00
Kris Alder f60530f491 Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 am: f96c6f3a30 
Change-Id: I4104bd7b4964dbd270cb614a164d426ecd24e0bf
 2020-05-21 20:10:40 +00:00
Kris Alder f96c6f3a30 Merge "Added fuzz_config field in aac_dec_fuzzer" am: 43fb529e06 
Change-Id: I9cc973e862cfa58047cd1056488f64de4bf07abb
 2020-05-21 19:54:30 +00:00
Bob Badour 92c9b7ea9a Fix license type s/b BY_EXCEPTION_ONLY 
The Fraunhofer license has special requirements.

Test: no code change
Change-Id: I439354498c0a28d6ff078cea9a4f8e9bfc02145f
 2020-05-21 12:49:18 -07:00
Kris Alder 43fb529e06 Merge "Added fuzz_config field in aac_dec_fuzzer" 2020-05-21 19:37:30 +00:00
Ayushi Khopkar 64e4f25b29 Added fuzz_config field in aac_dec_fuzzer 
Test: ./aac_dec_fuzzer
Bug: 156871294

Change-Id: Idfc93a6f6c71a78c2b7759443161d8e75dfc4670
 2020-05-19 11:59:34 +05:30
Jooyung Han d4b4152be0 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 71c477bae4 -s ours 
am skip reason: Change-Id I662ad951a3221f967b53e7af65cb203a4b4a5e5d with SHA-1 d40f05a618 is in history

Change-Id: Ib442bb5ad9e4d17b8c900e1afab96aca86d09c52
 2020-05-11 08:21:30 +00:00
Jooyung Han 71c477bae4 Set min_sdk_version to be part of mainline modules 
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Exempt-From-Owner-Approval: cherry-pick from aosp

Bug: 152655956
Test: m
Merged-In: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
(cherry picked from commit d40f05a618)
 2020-05-11 07:01:25 +00:00
Treehugger Robot 33de11d223 Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a am: 1f88875235 
Change-Id: If7805235d362630a3cd22e16d5d7a52bfae10157
 2020-05-04 19:33:36 +00:00
Treehugger Robot 1f88875235 Merge "Add METADATA to aac: Apache2=NOTICE" am: 49a9939e4a 
Change-Id: Ie009da3fed10417d87afd65c4097d8ac58954ec6
 2020-05-04 19:19:30 +00:00
Treehugger Robot 49a9939e4a Merge "Add METADATA to aac: Apache2=NOTICE" 2020-05-04 19:04:45 +00:00
Bob Badour 4f10c70ca2 Add METADATA to aac: Apache2=NOTICE 
Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I71f5c419c31c1758d4ee49158d40a50aef6abf5d
 2020-04-28 09:39:28 -07:00
Treehugger Robot fd16a67308 Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d am: 25647c87aa 
Change-Id: Id09d8cf7f25b3a6aaffc1a3414db290058921ff2
 2020-04-22 17:46:09 +00:00
Treehugger Robot 25647c87aa Merge "Set min_sdk_version to be part of mainline modules" am: 2611a48c1d 
Change-Id: I9e18b0e6a5e919b0346d0edad0c4e12e763c49fa
 2020-04-22 17:28:31 +00:00
Treehugger Robot 2611a48c1d Merge "Set min_sdk_version to be part of mainline modules" 2020-04-22 17:12:27 +00:00
Jooyung Han d40f05a618 Set min_sdk_version to be part of mainline modules 
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Change-Id: I662ad951a3221f967b53e7af65cb203a4b4a5e5d
 2020-04-23 01:01:46 +09:00
Xin Li 51993fe7bc [automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 920b807e1d -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie9cc74b29545a74070e39ce3b0d66a85a4e87011
 2020-04-10 02:29:13 +00:00
Xin Li 920b807e1d DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master 
Bug: 151763422
Change-Id: I15ed3fefee5678a9ab83f52fc0c4d4d3dd9dbcaf
 2020-04-09 17:50:34 -07:00
Kris Alder 0699408153 Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f 
Change-Id: I102fd257b225a51cd4d4c9e3205b12bb21a2e532
 2020-04-09 16:47:36 +00:00
Kris Alder 0f130d51b8 Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 am: 0b8c6e731f 
Change-Id: Ie5c84f6923184c564793de5e5f0007bc197415e7
 2020-04-09 16:47:26 +00:00
Kris Alder 0b8c6e731f Merge changes Iad37ae76,I4870251b,Icd937cad am: 662d974400 
Change-Id: Id2c7f9213d42db6897c3d8cc1fd14c0126fb8bb1
 2020-04-09 16:35:10 +00:00