wrapper/libavc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3052 commits 1 branch 10 tags 7 MiB
Commit graph

3052 commits

This branch
This branch
All branches
Author SHA1 Message Date
Harish Mahendrakar
eff1d4e7cb Move slice increments after completing header parsing am: dc110841d6 am: 9ab629f2b2 am: 2a1fd9a360 am: d2fa8b5c63 
Original change: 16407185

Change-Id: Ie41c10625378079aea94bd63438150a848d50943
 2021-12-08 23:56:17 +00:00
Harish Mahendrakar
d2fa8b5c63 Move slice increments after completing header parsing am: dc110841d6 am: 9ab629f2b2 am: 2a1fd9a360 
Original change: 16407185

Change-Id: Ibc61ef92e48f8b6ba0587c9b4609b9195729ed5f
 2021-12-08 23:30:20 +00:00
Harish Mahendrakar
2a1fd9a360 Move slice increments after completing header parsing am: dc110841d6 am: 9ab629f2b2 
Original change: 16407185

Change-Id: I9cd1d17bd3f60e717c9c728e6819befff5bf2eae
 2021-12-08 23:14:56 +00:00
Harish Mahendrakar
9ab629f2b2 Move slice increments after completing header parsing am: dc110841d6 
Original change: 16407185

Change-Id: I64bc47c5e09ef577c7a9a7686ddd3e5e6c63936a
 2021-12-08 23:00:15 +00:00
Harish Mahendrakar
dc110841d6 Move slice increments after completing header parsing 
Slice increments are now done after completing header parse.
Earlier this was done before validating mmco related parameters
and calculating poc. In case there were errors that were detected
at this stage, slice increments were incorrect.

Bug: 199536974
Bug: 199733300
Bug: 205702093
Bug: oss-fuzz#38387
Bug: oss-fuzz#38482
Bug: oss-fuzz#40851
Test: ossfuzz generated poc in bug

Change-Id: I8569e9369e4ab6f6c69c81b937f111c299b7a134
(cherry picked from commit cd0385dc07)
 2021-12-06 21:55:35 +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
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
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
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
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
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
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
Neelkamal Semwal
10910bf910 avcenc: Add bitstream overflow check during emulation prevention 
Bug: 176533109

Test: poc in the bug description

Change-Id: Ia83383f9b65cbde8d7a50a1af8a054936daa4d78
(cherry picked from commit b59de5a25f)
 2021-03-20 15:36:08 +00:00
Harish Mahendrakar
82e6bc3fd0 decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf am: 640eda280b am: d6c30aa7da 
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I02be4ad3b7142d81f9513539746984e0f4b64909
 2020-12-09 03:15:39 +00:00
Harish Mahendrakar
d6c30aa7da decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf am: 640eda280b 
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia84130799a88703801bc81f64a7456a8708df2a2
 2020-12-09 02:52:54 +00:00
Harish Mahendrakar
640eda280b decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf 
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I255ad3b9709afceb4cc8b31298bf3a9071ef4b3a
 2020-12-09 02:21:19 +00:00
Harish Mahendrakar
5f4f6e2ecf decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99b30e4b2ac5f7b0fdeac9adbce15e92d2b36c8f
 2020-12-09 01:48:37 +00:00
Harish Mahendrakar
2bf6790f63 decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I062c47998e23df0fe4d9c18ad9622aa55eb7ec96
 2020-12-09 01:33:06 +00:00
Harish Mahendrakar
4fb26568a9 decoder: Update check for first mb in slice am: 7e06940dce 
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0c8a04ddea6fc1a08fcde807f7c78c8810a5ce81
 2020-12-09 01:02:10 +00:00
Harish Mahendrakar
7e06940dce decoder: Update check for first mb in slice 
first_mb_in_slice shouldn't be >= mbs in the picture.

Test: poc in bugs
Bug: b/174238784
Bug: b/174507022
Bug: oss-fuzz:27856
Bug: oss-fuzz:28039
Change-Id: Id3a41c8c2ddf814910fc2d5dd4f57bdd84d28fec
 2020-12-04 16:09:10 -08:00
Hamsalekha S
0b601e1a4f Decoder: Fix heap buffer overflow. 
Fix bitstream buffer overflow in the function
ih264d_parse_sei_message

Bug: 152895390

Test: POC in bug

Change-Id: I41ff1f7b2834c2d09e546b8e3d37e4cd4abfa28d
 2020-07-29 23:47:11 +00:00
Ray Essick
7bddf4b15a point to new repo hooks for mainline uploads am: 6129152b6f am: dd444fd8db 
Change-Id: Ice835d5eed0a38dcf975fa60f86109264ae71f9e
 2020-05-30 00:03:06 +00:00
Ray Essick
dd444fd8db point to new repo hooks for mainline uploads am: 6129152b6f 
Change-Id: I6e8d79723ec4eb2dfdf158e698e716c021db3b13
 2020-05-29 23:49:24 +00:00
Ray Essick
6129152b6f point to new repo hooks for mainline uploads 
Bug: 157501573
Test: upload
Change-Id: If1f024379589f420fd23e4f25e0d178a10b84f11
 2020-05-26 15:16:18 -07:00
Jooyung Han
e35ceba888 Set min_sdk_version to be part of mainline modules am: e8d70076de am: 3fc114c0c7 
Change-Id: I525107dc800390154aae1ef08baf5fdd4958bac8
 2020-05-01 16:12:09 +00:00
Jooyung Han
3fc114c0c7 Set min_sdk_version to be part of mainline modules am: e8d70076de 
Change-Id: I01e42e538d26cf16878500fa34a951424ef1cd26
 2020-05-01 16:03:35 +00:00
Jooyung Han
e8d70076de 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
Merged-In: Ib206ae858601b0dca6dccb09e8c53028feef0362
Merged-In: I6cfff21dcaf861392f8b69d97195831cdda4c1be
Change-Id: I6cfff21dcaf861392f8b69d97195831cdda4c1be
(cherry picked from commit 669c6bb63c)
 2020-05-01 23:11:53 +09:00
Harish Mahendrakar
a5a03d8967 Revert "decoder: set u4_frame_decoded to true only after both fields are decoded" am: e0ad0016f0 am: 5ddd1567f9 
Change-Id: I5e9dc3e671df6a4597828591f32aa16f34d69dbd
 2020-04-07 21:00:46 +00:00
Harish Mahendrakar
5ddd1567f9 Revert "decoder: set u4_frame_decoded to true only after both fields are decoded" am: e0ad0016f0 
Change-Id: I94dd473b5afb7b9f5e155b0ed081d312187a135e
 2020-04-07 20:19:02 +00:00
Harish Mahendrakar
e0ad0016f0 Revert "decoder: set u4_frame_decoded to true only after both fields are decoded" 
This reverts commit f76370c671.

Reason: This breaks interlaced clips which are sent one field at a time

C2 plugin for avc decoder is now updated to appropriately handle both
types of interlaced content, i.e. sent as one field per one input buffer
and sent as two fields per one input

Bug: 135146280
Bug: 152087140
Test: poc in bugs
Test: atest android.media.cts.DecoderTest

Change-Id: Ic79d13a4bd93573767c86ed31264e8780da8d9a5
 2020-04-06 15:33:53 -07:00
TreeHugger Robot
5bb9f6d260 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f am: 7286f5f021 am: b51f786034 
Change-Id: I97e5a4ac75d927f615ce91abd6c47f63f18a154f
 2020-03-20 03:20:05 +00:00
Harish Mahendrakar
6f0ef308c3 decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621 am: 9157866b2b 
Change-Id: I3b62e821e1133034944e9a6747b3943fe997338e
 2020-03-20 03:19:45 +00:00
TreeHugger Robot
b51f786034 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f am: 7286f5f021 
Change-Id: Id436aee0eaf0f45794186713cec5ec6e463da5c5
 2020-03-20 03:03:14 +00:00
Harish Mahendrakar
9157866b2b decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621 
Change-Id: I24f0868f85ec1eb081d50e2da07606ecb58f3e90
 2020-03-20 03:02:55 +00:00
TreeHugger Robot
7286f5f021 Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f 
Change-Id: I3f9e5f1019b7759e83a2cc7f2848766f52bcdfed
 2020-03-20 02:38:53 +00:00
Harish Mahendrakar
7e44189621 decoder: Fix in detecting dangling fields am: 6dd54b9e18 
Change-Id: Ia546016131ba894365e90089a6644383c76bf325
 2020-03-20 02:38:43 +00:00
TreeHugger Robot
280902e61f Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev 2020-03-20 02:24:36 +00:00
Harish Mahendrakar
f80afe5b98 decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb 
When removing common nodes from short term list if it present in long
term reference list, number of long term buffers was wrongly
incremented. Only decrement of short term buffer count is needed in
such a case.

Bug: 140561484
Bug: 140566606
Bug: 140699853
Bug: 144980954
Bug: 145859214

Test: poc in bug
Change-Id: Iebf7ee7ed65e7b2097a899577982806b03fc6e5d
 2020-02-11 16:29:24 -08:00