Commit graph

3385 commits

Author SHA1 Message Date
Bill Yi
f03dcbc4ee [automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 4881f0316c -s ours
am skip reason: Merged-In I1580ad533651c03741c55c625a0e70a614fe111a with SHA-1 e6458eaa84 is already in history

Original change: 15257334

Change-Id: Ib5795370a325ce13313141de48152923d4263858
2021-07-12 13:27:12 +00:00
Bill Yi
4881f0316c Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE
Merged-In: I5792f3e063c896d1375b9bad65ac33e98a41931d
Merged-In: I1580ad533651c03741c55c625a0e70a614fe111a
Change-Id: I0bb255739dcd5ad8c1c76108f55311ebcef87ca0
2021-07-11 22:43:34 -07:00
Xin Li
e6458eaa84 [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 83583a78db -s ours am: aa959b7dc2 -s ours
am skip reason: Merged-In I5a4b8dce759e4ce9ebc4ca1e613fe1dd355e403f with SHA-1 c0c27ebb88 is already in history

Original change: 1741358

Change-Id: I1580ad533651c03741c55c625a0e70a614fe111a
2021-06-21 06:42:40 +00:00
Xin Li
aa959b7dc2 [automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 83583a78db -s ours
am skip reason: Merged-In I5a4b8dce759e4ce9ebc4ca1e613fe1dd355e403f with SHA-1 c0c27ebb88 is already in history

Original change: 1741358

Change-Id: Iba9d4f0b69b7c6bffcc85a4e3f110dea5e48cf8e
2021-06-21 06:10:38 +00:00
Xin Li
83583a78db DO NOT MERGE - Merge RQ3A.210605.005
Bug: 190855093
Merged-In: I5a4b8dce759e4ce9ebc4ca1e613fe1dd355e403f
Change-Id: I6bf96ca42d2496ddb4264ff22b4a0f2861833ac0
2021-06-18 12:24:39 -07:00
Xin Li
fd344b3b9d [automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c0c27ebb88 -s ours
am skip reason: Merged-In I871ae28179ea91f3b4a189148676c335b1e7000b with SHA-1 afb344009e is already in history

Original change: 15024040

Change-Id: Idc398cd43d8a0a155c3238be2f2af2601ececf3a
2021-06-18 06:18:51 +00:00
Xin Li
c0c27ebb88 DO NOT MERGE - Mark RQ3A.210410.001 as merged
Bug: 190855093
Merged-In: I871ae28179ea91f3b4a189148676c335b1e7000b
Change-Id: I5a4b8dce759e4ce9ebc4ca1e613fe1dd355e403f
2021-06-17 22:43:32 -07:00
Xin Li
16fdac9558 [automerger skipped] DO NOT MERGE - Merge ab/7272582 am: afb344009e -s ours
am skip reason: Merged-In Ia83383f9b65cbde8d7a50a1af8a054936daa4d78 with SHA-1 3de25bf0bb is already in history

Original change: 14974484

Change-Id: Ib4a993eea6c96db0610fcfe8d2485ac870608071
2021-06-18 00:51:49 +00:00
Xin Li
afb344009e DO NOT MERGE - Merge ab/7272582
Bug: 190855093
Merged-In: Ia83383f9b65cbde8d7a50a1af8a054936daa4d78
Change-Id: I871ae28179ea91f3b4a189148676c335b1e7000b
2021-06-17 21:45:40 +00:00
Ray Essick
b13890d29c Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df am: aa568c1bb1 am: f738bac1fe am: f9116ab2ac
Original change: 14460944

Change-Id: I00cfbfe2a388499e0bd088a9dc6c823bf91198cc
2021-06-08 06:11:56 +00:00
Ray Essick
4dd7a92df0 Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df am: aa568c1bb1 am: 44a4aa7296 am: 9f23ed028b
Original change: 14460944

Change-Id: Ie3503cd22085be1b62aee958f08a269d225e197f
2021-06-08 06:11:49 +00:00
Ray Essick
f9116ab2ac Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df am: aa568c1bb1 am: f738bac1fe
Original change: 14460944

Change-Id: Iebbe20e7bd832cf1c22ed04fbcee84f88e423269
2021-06-08 05:54:25 +00:00
Ray Essick
9f23ed028b Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df am: aa568c1bb1 am: 44a4aa7296
Original change: 14460944

Change-Id: I88030496347e1223280faf3ed47c052ddeb46fcb
2021-06-08 05:53:48 +00:00
Ray Essick
f738bac1fe Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df am: aa568c1bb1
Original change: 14460944

Change-Id: I5a84016ce81864faa383085c1fbdb8e86ea5a96a
2021-06-08 05:41:46 +00:00
Ray Essick
44a4aa7296 Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df am: aa568c1bb1
Original change: 14460944

Change-Id: I7f518b57c1a38b1e8a8c8ea1aa15abd7b6f6d0d5
2021-06-08 05:41:12 +00:00
Ray Essick
aa568c1bb1 Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9 am: 83c84781df
Original change: 14460944

Change-Id: I8450e2c4b4a096449bcca429bdc125f3a3be3969
2021-06-08 05:20:40 +00:00
Ray Essick
83c84781df Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426 am: a537f15bc9
Original change: 14460944

Change-Id: Iafcffc3094782c99dfe832f4bcfe91324e37a7fc
2021-06-08 04:57:54 +00:00
Ray Essick
a537f15bc9 Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc am: 6ddeb05426
Original change: 14460944

Change-Id: Id3844c9c5eb2c20ad2db75981bb19ff58151be47
2021-06-08 04:41:36 +00:00
Ray Essick
6ddeb05426 Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev am: 6b338befbc
Original change: 14460944

Change-Id: I300cccfd44f15600ae486e39d12fcd9af87bc556
2021-06-08 04:16:50 +00:00
Ray Essick
6b338befbc Merge "Decoder: Update check for increment u2_cur_slice_num" into oc-mr1-dev 2021-06-08 04:02:13 +00:00
android-build-team Robot
f7cf75d0eb Merge cherrypicks of [14651914, 14651880, 14651759, 14652210, 14651594, 14651881, 14651915, 14651882, 14651883, 14651799, 14652154, 14651595, 14651760, 14652271, 14652272, 14652273, 14652056, 14651800, 14651801, 14651802, 14651884, 14651885, 14651886, 14652274, 14652275, 14652276, 14652277, 14652278, 14651894, 14651723, 14652211, 14651895, 14651916, 14651887, 14651888, 14651596, 14651889, 14652212, 14651761, 14652310, 14652311, 14651973, 14651974, 14652312, 14652313, 14651896, 14651803] into rvc-qpr3-release
Change-Id: I0bcf3d487ccd86132146e00dd546a4e90860087a
2021-05-20 00:04:31 +00:00
Neelkamal Semwal
986b1ff02f encoder: fix invalid free of raw buffers
Return current input buffer as buffer to be freed in case
of errors that are seen before picking up the input buffer
to be from the input queue.
Once a buffer is picked up from the queue, that is returned
as the buffer to be freed.

There is no need to return a buffer from ps_proc context

Bug: 180643802

Test: poc in the bug description
Test: atest CtsMediaV2TestCases:CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I1671ca1e82f522004d1f070df89b256b856f75b8
(cherry picked from commit 3e73f0d562)
2021-05-20 00:00:29 +00:00
TreeHugger Robot
e1db05d6f3 Merge "Decoder: Update check for increment u2_cur_slice_num" into sc-dev am: 78eae5772d
Original change: 14457574

Change-Id: I90dd7cb19fedd762512a7d13c7aeaa7dff6ab746
2021-05-12 16:36:04 +00:00
TreeHugger Robot
78eae5772d Merge "Decoder: Update check for increment u2_cur_slice_num" into sc-dev 2021-05-12 16:15:47 +00:00
Neelkamal Semwal
6260b92bcd encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0 am: 777d5a86d5 am: de22cbeceb am: f07c18b1d6
Original change: 14392080

Change-Id: I8f801d6e53ed7a1b9b753916e6db73e682f75454
2021-05-07 05:17:56 +00:00
Neelkamal Semwal
f07c18b1d6 encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0 am: 777d5a86d5 am: de22cbeceb
Original change: 14392080

Change-Id: I92d9c928ae685606386d22bdc16c9122cb571e40
2021-05-07 05:13:14 +00:00
Neelkamal Semwal
e67b2e99e6 encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0 am: a43e8473bb am: 2c0c11c938
Original change: 14392080

Change-Id: Ib054d5a71b2c5d2ba8b506fd9e6b08f631a461c6
2021-05-07 05:11:26 +00:00
Neelkamal Semwal
2c0c11c938 encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0 am: a43e8473bb
Original change: 14392080

Change-Id: I1b4f0308d1c53b675a3eb9dc6048368886e8f4c1
2021-05-07 04:56:26 +00:00
Neelkamal Semwal
de22cbeceb encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0 am: 777d5a86d5
Original change: 14392080

Change-Id: I1d66d3e5d02eebb49b76cdd6d64b7c7dee333621
2021-05-07 04:55:40 +00:00
Neelkamal Semwal
a43e8473bb encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0
Original change: 14392080

Change-Id: I2d23e14a03e173ca382fae98490c671482d435e3
2021-05-07 04:41:20 +00:00
Neelkamal Semwal
777d5a86d5 encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02 am: 353eceeda0
Original change: 14392080

Change-Id: I61530b005937ff4add1d72d8515d2a676a587b5b
2021-05-07 04:39:52 +00:00
Neelkamal Semwal
353eceeda0 encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be am: a45e73ed02
Original change: 14392080

Change-Id: I0de10d4ce0ac4b79c8a9db0b07fd6082fca8a08d
2021-05-07 04:25:00 +00:00
Neelkamal Semwal
a45e73ed02 encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08 am: af5bd177be
Original change: 14392080

Change-Id: I569fb5085ea41e113deab307d7bbe0825e460664
2021-05-07 04:10:06 +00:00
Neelkamal Semwal
af5bd177be encoder: fix invalid free of raw buffers am: 3e73f0d562 am: 39fd5ebf08
Original change: 14392080

Change-Id: I4c62fc5ba6538c598bf5e391c3cfe515f92869bb
2021-05-07 03:36:51 +00:00
Neelkamal Semwal
39fd5ebf08 encoder: fix invalid free of raw buffers am: 3e73f0d562
Original change: 14392080

Change-Id: Ib72ea7316073631d5c2bf0dd350bcb0f3e487386
2021-05-07 03:09:39 +00:00
Rakesh Kumar
a88e0683a4 Decoder: Update check for increment u2_cur_slice_num
Increment u2_cur_slice_num only if current slice had atleast
one MB of memory left.

Test: clusterfuzz generated poc in bug
Bug: b/182152757
Bug: b/179938345
Bug: b/185112718

Change-Id: Ic5eb07e961bccb7fde954bcfd791fd879804e335
2021-05-06 19:51:10 -07:00
Rakesh Kumar
4a22b5d105 Decoder: Update check for increment u2_cur_slice_num
Increment u2_cur_slice_num only if current slice had atleast
one MB of memory left.

Test: clusterfuzz generated poc in bug
Bug: b/182152757
Bug: b/179938345
Bug: b/185112718

Change-Id: Ic5eb07e961bccb7fde954bcfd791fd879804e335
2021-05-06 16:41:46 -07:00
Neelkamal Semwal
ed86ddb56e encoder: fix invalid free of raw buffers am: e1fce24788 am: 7dc37de07b
Original change: 14225445

Change-Id: Ief528399de82d679175e57c4516fb462d47dd0f1
2021-05-04 08:18:41 +00:00
Neelkamal Semwal
7dc37de07b encoder: fix invalid free of raw buffers am: e1fce24788
Original change: 14225445

Change-Id: I967c1f801258dc459aa0596b530a29364ee01c77
2021-05-04 07:26:42 +00:00
Ray Essick
ebd0615fff Merge "encoder: Use intermediate buffer for accessing last MB row" into sc-dev am: e84ea05642
Original change: 14400911

Change-Id: Ieeb6a18f4e4efac5ff1cbf207081c852d02a1e31
2021-05-01 18:44:31 +00:00
Ray Essick
e84ea05642 Merge "encoder: Use intermediate buffer for accessing last MB row" into sc-dev 2021-05-01 18:31:15 +00:00
Neelkamal Semwal
646a58ccf1 encoder: Use intermediate buffer for accessing last MB row
few SIMD modules read few more bytes from the input buffer
at the end of frame. To avoid OOB read, intermediate buffer
is used while processing last MB row.

Bug: 180505809

Test: poc in bug
Test: atest CtsMediaTestCases:VideoEncoderTest
Test: atest CtsMediaV2TestCases:CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I11ca65937c7dfaf623f3535c02158ceec0dcc6ee
2021-05-01 08:42:32 -07:00
Neelkamal Semwal
33198d3dbd encoder: fix invalid free of raw buffers am: 954f023c74
Original change: 14225426

Change-Id: Ife1f00541f8acb17b4414ae50d6afe793981b9c4
2021-04-30 23:40:41 +00:00
Neelkamal Semwal
e1fce24788 encoder: fix invalid free of raw buffers
Return current input buffer as buffer to be freed in case
of errors that are seen before picking up the input buffer
to be from the input queue.
Once a buffer is picked up from the queue, that is returned
as the buffer to be freed.

There is no need to return a buffer from ps_proc context

Bug: 180643802

Test: poc in the bug description
Test: atest CtsMediaV2TestCases:CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I1671ca1e82f522004d1f070df89b256b856f75b8
2021-04-30 21:58:07 +00:00
Neelkamal Semwal
3e73f0d562 encoder: fix invalid free of raw buffers
Return current input buffer as buffer to be freed in case
of errors that are seen before picking up the input buffer
to be from the input queue.
Once a buffer is picked up from the queue, that is returned
as the buffer to be freed.

There is no need to return a buffer from ps_proc context

Bug: 180643802

Test: poc in the bug description
Test: atest CtsMediaV2TestCases:CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I1671ca1e82f522004d1f070df89b256b856f75b8
2021-04-30 21:57:10 +00:00
Neelkamal Semwal
954f023c74 encoder: fix invalid free of raw buffers
Return current input buffer as buffer to be freed in case
of errors that are seen before picking up the input buffer
to be from the input queue.
Once a buffer is picked up from the queue, that is returned
as the buffer to be freed.

There is no need to return a buffer from ps_proc context

Bug: 180643802

Test: poc in the bug description
Test: atest CtsMediaV2TestCases:CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I1671ca1e82f522004d1f070df89b256b856f75b8
2021-04-30 14:49:41 -07:00
Aayush Soni
19020d35b5 encoder: fix null buffer dereferencing am: e88c22c34c
Original change: 14225305

Change-Id: If54570dbba8b935754520bf887e2ec8d08429ac7
2021-04-22 17:11:33 +00:00
Aayush Soni
e88c22c34c encoder: fix null buffer dereferencing
Do not set the picture type as NA for the last frame in encoding
order.

Bug: 180219345

Test: POC in bug descriptions
Test: atest CtsMediaV2TestCases:CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest

Change-Id: I57ee7db9e2e55fba2666a6aaa4002ef31276e4b9
2021-04-17 12:27:40 -07:00
Aayush Soni
528bff6aa4 encoder: fix null buffer dereferencing am: 3139d13ccd am: 3a4aac7376 am: 29b671c12b
Original change: 1663964

Change-Id: I62ccf1fb1d592b4e50ca90ce88cfb47628249ad0
2021-04-16 18:53:21 +00:00
Aayush Soni
29b671c12b encoder: fix null buffer dereferencing am: 3139d13ccd am: 3a4aac7376
Original change: 1663964

Change-Id: I61881dbaabbc24871883557486d0b8c1d8b3ce1a
2021-04-16 18:25:06 +00:00