Commit graph

3367 commits

Author SHA1 Message Date
Ray Essick
5cef8e7828 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: Ic0dd3497800b1c4f2d896d8d4226a58b0a566fa7
2021-06-08 06:15:42 +00:00
Ray Essick
ed79df03af 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: I9a2aa034a0d167466006d1a1a48171a45b56db90
2021-06-08 06:15:36 +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
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
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
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
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
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
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
Aayush Soni
3a4aac7376 encoder: fix null buffer dereferencing am: 3139d13ccd
Original change: 1663964

Change-Id: I84eb4d89d0726548f765e75e06aee6a3ba98bdf6
2021-04-16 18:04:41 +00:00
Aayush Soni
3139d13ccd 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-15 11:49:29 +05:30
Neelkamal Semwal
490672963f avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b am: 4e4dc6be01 am: 2c9758d16a am: 66997f22b0 am: 8bbc8ab63a
Original change: 13932334

Change-Id: Iacdd9d1763c0a38b5c92ac20380ac3231cb2ab57
2021-03-31 20:56:36 +00:00
Neelkamal Semwal
6f1dae9f0d avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b am: 4e4dc6be01 am: 2c9758d16a am: fd80f537f4
Original change: 13932334

Change-Id: I84e08f61e432a249c6f6e6d36b57536fdc5af93f
2021-03-31 20:56:11 +00:00
Neelkamal Semwal
8bbc8ab63a avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b am: 4e4dc6be01 am: 2c9758d16a am: 66997f22b0
Original change: 13932334

Change-Id: Ifa8df9d2a76df40d313d0d1e35b09cb55ffc1d17
2021-03-31 20:10:03 +00:00
Neelkamal Semwal
fd80f537f4 avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b am: 4e4dc6be01 am: 2c9758d16a
Original change: 13932334

Change-Id: I956a0a57b4aa55e62d561132694cd5fdce60622e
2021-03-31 19:34:53 +00:00
Neelkamal Semwal
66997f22b0 avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b am: 4e4dc6be01 am: 2c9758d16a
Original change: 13932334

Change-Id: Ib9e3a137286a16ebbcd5a38c3a38c0707ada405c
2021-03-31 19:29:59 +00:00
Neelkamal Semwal
2c9758d16a avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b am: 4e4dc6be01
Original change: 13932334

Change-Id: I5c98ae2cae9b4e1d5577f961247ba1fc06f97b58
2021-03-31 19:08:46 +00:00
Harish Mahendrakar
93a866742a Validate input dimensions in process() am: a073696092 am: 1959bc1e12
Original change: 13991496

Change-Id: I8962980285db27b95878528adfd078f4e9ebfc50
2021-03-31 18:32:28 +00:00
Neelkamal Semwal
4e4dc6be01 avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b am: 08e74b410b
Original change: 13932334

Change-Id: I4877c869578404d15754ab1923a273d848592443
2021-03-31 18:27:29 +00:00
Neelkamal Semwal
08e74b410b avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910 am: 51373e847b
Original change: 13932334

Change-Id: I5e70babd452137048665c8181eb7aaa59a9229e3
2021-03-31 17:59:49 +00:00
Harish Mahendrakar
1959bc1e12 Validate input dimensions in process() am: a073696092
Original change: 13991496

Change-Id: I4d391ec76874eb579a439376b1ae972fdb690ffc
2021-03-31 17:55:18 +00:00
Ray Essick
9fe3f85701 Merge "avcenc: Add bitstream overflow check during emulation prevention" into mainline-prod am: 8a0683e292
Original change: 13932333

Change-Id: I28253b7546bc7a8f9128b5d1242d9db5e4819192
2021-03-31 17:35:28 +00:00
Neelkamal Semwal
51373e847b avcenc: Add bitstream overflow check during emulation prevention am: 10910bf910
Original change: 13932334

Change-Id: I53fa66c08c448484d5c0b5457a6e6a726d453095
2021-03-31 17:08:38 +00:00
Ray Essick
8a0683e292 Merge "avcenc: Add bitstream overflow check during emulation prevention" into mainline-prod 2021-03-31 16:31:05 +00:00
Harish Mahendrakar
e72717f0f7 Validate input dimensions in process() am: daa5c36657
Original change: 13987970

Change-Id: I569c4e372b8b0131675d23b76779a52e61c1f3ae
2021-03-25 06:51:22 +00:00
Harish Mahendrakar
a073696092 Validate input dimensions in process()
Input dimensions are checked for supported range in set_dimensions
control call. Encoder returns an error for unsupported values in
this control call. But if the caller ignores this error and proceeds
to call process(), encoder wasn't checking the dimensions again.

Unsupported dimensions are now checked in process() call as well.

Note: This is relanding previously reverted commit
06c30b33c4

Bug: 172908358
Test: Poc in bug
Test: atest android.mediav2.cts
Test: atest android.media.cts
Change-Id: Icf3f296ab24432c680427a82da3505491acca3bd
2021-03-25 03:04:25 +00:00