Manisha Jajoo
d1e64cc366
Decoder: add support for KEEP_THREADS_ACTIVE
...
Current design of AVC Decoder creates new threads
to process each frame. This CL adds support to reuse
the threads across frames.
Test: avcdec -c dec.cfg
Bug: 191124963
Change-Id: I087699c4c7ce6aa59a1d8b078ae196a50dcf889c
2022-02-09 17:59:29 +05:30
Xin Li
12e23d0f91
Merge Android 12
...
Bug: 202323961
Merged-In: I5e6d1f815848beed302adcb643ca9cd9bae5a31e
Change-Id: I1c294b5bc48af64d9c66a4a6cdac09f7d6c1ff9b
2021-10-06 22:53:10 +00:00
Bill Yi
d378c44714
[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: 75e53c541e -s ours
...
am skip reason: subject contains skip directive
Original change: 1822660
Change-Id: I5e6d1f815848beed302adcb643ca9cd9bae5a31e
2021-09-09 21:39:31 +00:00
Bill Yi
75e53c541e
Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE
...
Merged-In: I52a5f915b9bb31f432c4ad55ae4117ff4ddceb54
Merged-In: If80dcc5d1e0a057c965631fc2d33e4e642d7eab9
Merged-In: If80dcc5d1e0a057c965631fc2d33e4e642d7eab9
Change-Id: Ia67df08355cf08f479df3c683a7f981402d27dcd
2021-09-08 17:57:06 -07:00
Xin Li
1603a390d9
Merge sc-dev-plus-aosp-without-vendor@7634622
...
Merged-In: Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb
Change-Id: I52a5f915b9bb31f432c4ad55ae4117ff4ddceb54
2021-08-14 06:30:56 +00:00
Bill Yi
1f0a09988e
[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: bac2216679 -s ours am: 2f22097eb3 -s ours
...
am skip reason: Merged-In Iba9d4f0b69b7c6bffcc85a4e3f110dea5e48cf8e with SHA-1 aa959b7dc2 is already in history
Original change: 1763607
Change-Id: Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb
2021-07-13 01:21:31 +00:00
Bill Yi
2f22097eb3
[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: bac2216679 -s ours
...
am skip reason: Merged-In Iba9d4f0b69b7c6bffcc85a4e3f110dea5e48cf8e with SHA-1 aa959b7dc2 is already in history
Original change: 1763607
Change-Id: Ia97653f9fec517f4c8acbac23d2d80ce6538664a
2021-07-13 01:02:56 +00:00
Bill Yi
bac2216679
Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE
...
Merged-In: Iba9d4f0b69b7c6bffcc85a4e3f110dea5e48cf8e
Merged-In: I5792f3e063c896d1375b9bad65ac33e98a41931d
Merged-In: I5792f3e063c896d1375b9bad65ac33e98a41931d
Change-Id: Iec2ee9505a209b3a6caca2cd58b37d544ef8adca
2021-07-12 11:08:22 -07:00
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
Android Build Coastguard Worker
60ba588853
Merge cherrypicks of [15164514, 15164515, 15164096, 15164078, 15163495, 15164068, 15164480, 15164097, 15164098, 15164482, 15164698, 15164375, 15164485, 15164469, 15164730, 15164731, 15164732, 15164733, 15164734, 15164735, 15164736, 15164737, 15164738, 15163662, 15164486, 15164519, 15164699, 15164700, 15164487, 15164099] into rvc-qpr3-release
...
Change-Id: I5db23b99b5af9ec23d39ff98e99514e71f916049
2021-07-01 00:00:53 +00:00
Rakesh Kumar
fa13b30876
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
(cherry picked from commit a88e0683a4 )
2021-06-30 23:58:27 +00: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