Commit graph

609 commits

Author SHA1 Message Date
Rajat Kumar
86d7dd791e Fix for oob in ia_drc_instructions_struct
drc_config->drc_instructions_uni_drc_count
+ drc_config->dwnmix_instructions_count is
used as index in the function
impd_drc_gen_instructions_for_drc_off,
without checked for bounds.

Hence the check has been added here.

Bug:143517852
Test: poc in bug

Change-Id: I1134236b421d97097a5deb25dbf889f25e7a29ef
2020-01-11 16:50:54 -08:00
Rajat Kumar
0e6ba25314 Fix for array out of bound esbr_envcalc file.
Added bound checks before access

Bug:131878685
Test: poc in bug

Change-Id: Ibd8dec7875509fc98f7c57d000bcc3635f36f297
2020-01-09 14:24:30 -08:00
Sushanth Patil
da82edd619 Fix for int-oveflow in ixheaacd_sub32
Added check for subtraction overflow.

Bug:144813972
Test: poc in bug
Change-Id: Ic923f0b0f155f196aca85128d7993d7f355d0e13
2020-01-07 15:24:37 -08:00
Dongwon Kang
eb92e0405b Add a repo upload hook for checking the mainline code change.
Test: repo upload w/ and wo/ changes in mainline path.
Change-Id: I7a0c71b2245a903c998bac1dcb24fba3cc3198f9
2019-12-06 12:14:34 -08:00
TreeHugger Robot
e57f919f8a Merge "Fix to add few bound checks in DRC, based on code review" 2019-11-14 01:43:53 +00:00
TreeHugger Robot
86f50803ba Merge "CMakeLists: Remove deleted files from CMakeLists.txt" 2019-11-14 01:17:55 +00:00
TreeHugger Robot
52ca260630 Merge "Fix for array out of bound in drc dynamic payload." 2019-11-14 01:09:15 +00:00
Rajat Kumar
c2cb9c2424 Fix to add few bound checks in DRC, based on code review
Added few checks to avoid out of bound access and
and remove few redundant checks based on review.

Bug:130279444
Test: atest android.media.cts.DecoderTestXheAac
Test: atest android.media.cts.DecoderTestAacDrc

Change-Id: If9a7917eea5d68d4c484d02fca4c755ffa6a9123
2019-11-13 14:23:08 -08:00
Harish Mahendrakar
7c4a23e58f CMakeLists: Remove deleted files from CMakeLists.txt
7bee3616b8 deleted few unused files from
DRC folder. These files are now removed from CMakeLists.txt

Bug:130262151
Test: build with cmake
Change-Id: Idd1af47b80faec5509ad608485099215706c8fb2
2019-11-13 14:17:05 -08:00
Rajat Kumar
dc6af3edb4 Fix for array out of bound in drc dynamic payload.
str_spline_nodes->num_nodes was not checked for bound,
before using as index. Added bound check before access.

Bug:141215451
Test: poc in bug

Change-Id: I9cd78035521731a3f338dc52ebf0afc3a3e5d3ff
2019-11-13 14:12:14 -08:00
Rajat Kumar
deb3f00a38 Fix for array out of bound in api file
Removed the redundant part of code which initilizes
an array with -1 and uses it as index.

Bug:141524696
Test: poc in bug

Change-Id: Ie126ca257dc0f7276c46733b043a84d5a88a062d
2019-11-07 14:32:42 -08:00
TreeHugger Robot
e96e08da90 Merge "Fix for array out of bound in impd_drc_static_payload.c" 2019-11-04 20:45:18 +00:00
TreeHugger Robot
8d515ccd85 Merge "Fix for array out of bound access in envelop calc func." 2019-11-04 17:43:40 +00:00
Rajat Kumar
8410947cb1 Fix for array out of bound access in envelop calc func.
Added check before accessing index.

Bug:141290158
Test: poc in bug

Change-Id: Ia761cf76344e2d0008d73813c2017f0471f734a9
2019-11-02 09:21:04 -07:00
Rajat Kumar
fb6a48906e Fix for array out of bound in impd_drc_static_payload.c
channel_layout->base_channel_count was not checked
for bounds after it is read from bit stream.
Corresponding check has been added here.

Bug:140979418
Test: poc in bug

Change-Id: I57e6a4ea9a39c64e82c3add0d20a85716ad20cc1
2019-11-02 07:03:49 -07:00
Xin Li
c87d5a1f8a [automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: b0e1293b6e
am: 96e1aea606 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie854ad9391838a4191bfa5e242d9249c4b4488cb
2019-10-30 14:21:03 -07:00
Xin Li
96e1aea606 DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: b0e1293b6e

Change-Id: I7f41b40c8b393ebb8a22efe7111b2ddf75a88368
2019-10-30 13:57:06 -07:00
Xin Li
b0e1293b6e DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Bug: 142003500
Change-Id: I2f989009a25486a226f783d9da823d267ab45a5c
2019-10-30 11:48:07 -07:00
Rajat Kumar
4c2758690d Fix to handle infinite loop in reset hf generator function
Added break condition when no indexes are modified and
while loop enters infinite iterations.

Bug:140986186
Test: poc in bug

Change-Id: Ibf5953c0af7a0b96c50e3a2f1095b5cc30825711
2019-10-21 10:11:26 -07:00
TreeHugger Robot
2377d605cd Merge "Fix for non-handling of fatal error returned during init." 2019-10-14 16:42:40 +00:00
Rajat Kumar
8d9d3d1d58 Fix for non-handling of fatal error returned during init.
Fatal error returned from previous init call was not handled
during subsequent init calls. This check has been added here.

Bug:140984035
Bug:140988475
Bug:140986175
Test: poc in bug

Change-Id: I37599ba304bbf137b1a590c1fec7e0da236f7308
2019-10-12 16:28:30 -07:00
Ray Essick
2d4ecb17a5 fix comments that said hevc instead of xaac
Bug: 142597779
Test: compilation
Change-Id: I84812cfaf1978aaa5410670618448aa31501a34f
2019-10-12 16:10:21 -07:00
Ray Essick
d046f7b5e4 Merge "Added CMakeLists.txt for x86/x64 build" am: 2f018c0603 am: bb660489b2 am: 8932a17cfb
am: a4f18c83c7

Change-Id: Ic0735f56c5f7a99cb2ba514a8039c8241aa874fd
2019-09-30 12:46:58 -07:00
Harish Mahendrakar
f643e70ba6 Added xaac_dec_fuzzer am: 36ea868b5e am: 8654a3cb26 am: 9a3c1434af
am: dd8aed82c9

Change-Id: I228a43b1c60884283f716e0e3fa85ccd4b5822ab
2019-09-30 12:46:52 -07:00
Ray Essick
a4f18c83c7 Merge "Added CMakeLists.txt for x86/x64 build" am: 2f018c0603 am: bb660489b2
am: 8932a17cfb

Change-Id: I3ae46fa3bdcae1cb026641dd96707d4c73c12a41
2019-09-30 12:40:43 -07:00
Harish Mahendrakar
dd8aed82c9 Added xaac_dec_fuzzer am: 36ea868b5e am: 8654a3cb26
am: 9a3c1434af

Change-Id: Ib3c3f5ea7bf1e4c09a66c2dee08820527f42b9df
2019-09-30 12:40:37 -07:00
Ray Essick
8932a17cfb Merge "Added CMakeLists.txt for x86/x64 build" am: 2f018c0603
am: bb660489b2

Change-Id: I26bc405a95db2953fddf6098fd59df731191a3d0
2019-09-30 12:36:44 -07:00
Harish Mahendrakar
9a3c1434af Added xaac_dec_fuzzer am: 36ea868b5e
am: 8654a3cb26

Change-Id: Ifd2499b96e6e3c87bc9a6d31fbc7f70e90b5385b
2019-09-30 12:36:39 -07:00
Ray Essick
bb660489b2 Merge "Added CMakeLists.txt for x86/x64 build"
am: 2f018c0603

Change-Id: I37416cdb199055382460e5a9e7595f397e544d1c
2019-09-30 12:28:38 -07:00
Harish Mahendrakar
8654a3cb26 Added xaac_dec_fuzzer
am: 36ea868b5e

Change-Id: Ic499a5ab86b8743eae69db9dcc55a3328890e376
2019-09-30 12:28:33 -07:00
Ray Essick
2f018c0603 Merge "Added CMakeLists.txt for x86/x64 build" 2019-09-30 17:54:45 +00:00
Harish Mahendrakar
36ea868b5e Added xaac_dec_fuzzer
Test: ./xaac_dec_fuzzer
Bug: 135629873
Change-Id: I4f727f7ac90090700b6848f6860382d3786a4312
2019-09-23 15:50:57 -07:00
Harish Mahendrakar
facc3c62f3 xaacdec: Add host support am: f6ce5d9483 am: b31bec889e am: 2d6690e9d6
am: f063ce82e1

Change-Id: I94195a6d8f2919e68d2ae00d8545fbae5360e9a0
2019-09-11 09:47:03 -07:00
Harish Mahendrakar
f063ce82e1 xaacdec: Add host support am: f6ce5d9483 am: b31bec889e
am: 2d6690e9d6

Change-Id: I47e13dfdd55915d662a3253c2fe4fc6d41737627
2019-09-11 09:40:02 -07:00
Harish Mahendrakar
2d6690e9d6 xaacdec: Add host support am: f6ce5d9483
am: b31bec889e

Change-Id: I7bedbc8055a3a19394f69bcceed645ef079b2961
2019-09-11 09:33:01 -07:00
Harish Mahendrakar
b31bec889e xaacdec: Add host support
am: f6ce5d9483

Change-Id: I131ed997d1497d504d727f86241a15e52414f633
2019-09-11 09:27:00 -07:00
Xin Li
dee1061c95 [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6e4ebc8b30 -s ours am: 589cea9c4c -s ours
am: 21592dc35d -s ours
am skip reason: change_id Id59b59f4e91e6f7e140bd74863345a51d7f8feef with SHA1 d4372873b6 is in history

Change-Id: Id0395d794a6dc0cb1bda9ac925176e6d1c039963
2019-09-08 15:13:33 -07:00
Xin Li
21592dc35d [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master am: 6e4ebc8b30 -s ours
am: 589cea9c4c -s ours
am skip reason: change_id Id59b59f4e91e6f7e140bd74863345a51d7f8feef with SHA1 d4372873b6 is in history

Change-Id: I6bb6f152c88354ef83c66182714f8195cd7e7ff8
2019-09-08 14:52:27 -07:00
Xin Li
589cea9c4c [automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
am: 6e4ebc8b30 -s ours
am skip reason: change_id Id59b59f4e91e6f7e140bd74863345a51d7f8feef with SHA1 d4372873b6 is in history

Change-Id: I7e91e3e9425ffa3ac93d566dde269085dd2a8a32
2019-09-08 14:32:04 -07:00
Xin Li
6e4ebc8b30 Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-master
No content change.

Bug: 135460123
Change-Id: I7a7d5c8c13a0d1fec05447f07e8ba1712cf3e69c
Merged-In: Id59b59f4e91e6f7e140bd74863345a51d7f8feef
2019-09-08 12:43:55 -07:00
Xin Li
840641d17f [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d4372873b6 -s ours am: 6941d3bf81 am: 8f3d6bffc8
am: 19842f851d -s ours
am skip reason: subject contains skip directive

Change-Id: I5c88f5ccf52dc1416ac5cc14a85de45e7e798b91
2019-09-05 13:17:12 -07:00
Xin Li
19842f851d [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d4372873b6 -s ours am: 6941d3bf81
am: 8f3d6bffc8

Change-Id: Ic4e3e1d95e1807e64a6004a0f15dc6c56742317a
2019-09-05 12:54:27 -07:00
Xin Li
8f3d6bffc8 [automerger skipped] DO NOT MERGE - Merge Android 10 into master am: d4372873b6 -s ours
am: 6941d3bf81

Change-Id: I715767e6aaae1cf1b37ab7b85e73cf31c9d39d31
2019-09-05 12:29:36 -07:00
Xin Li
6941d3bf81 [automerger skipped] DO NOT MERGE - Merge Android 10 into master
am: d4372873b6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibff00d87c8486bec015eec9935bcf6dcc5f79191
2019-09-05 11:43:10 -07:00
Harish Mahendrakar
f6ce5d9483 xaacdec: Add host support
Test: Build xaacdec on host
Bug: 139379050
Change-Id: I2cfb401b71240dd0966b80cc208e9a9798c8a51e
2019-09-05 11:27:29 -07:00
Harish Mahendrakar
cda3e01472 Added CMakeLists.txt for x86/x64 build
Bug: 135629873
Test: cmake && make
Change-Id: Idb0747e359b305fc37b41d09ba33e2dbadfb8d6b
2019-09-05 17:11:36 +00:00
Xin Li
d4372873b6 DO NOT MERGE - Merge Android 10 into master
Bug: 139893257
Change-Id: Id59b59f4e91e6f7e140bd74863345a51d7f8feef
2019-09-04 13:33:46 -07:00
TreeHugger Robot
58aa3e2ad5 Merge "Fix for unitialized memory access at ixheaacd_add32_sat3" 2019-08-27 22:05:45 +00:00
TreeHugger Robot
7c44e0aac5 Merge "Adding bound checks in USAC config bit stream parsing" 2019-08-27 20:13:53 +00:00
Ray Essick
65a3c3bb70 Merge "Fix for signed integer overflow at ixheaacd_mps_hyb_filt_type1" 2019-08-26 22:46:32 +00:00