Manisha Jajoo
0d44c18f72
Encoder: Fix memory uninitialized issue in the encoder am: 2f3d043b17 am: 0e22ebef60
...
Original change: 15870702
2021-10-05 17:35:45 +00:00
Manisha Jajoo
0e22ebef60
Encoder: Fix memory uninitialized issue in the encoder am: 2f3d043b17
...
Original change: 15870702
2021-10-05 17:22:59 +00:00
Manisha Jajoo
2f3d043b17
Encoder: Fix memory uninitialized issue in the encoder
...
Test: atest android.mediav2.cts.CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest
Bug: 193442575
Change-Id: I75475d3bb822fa0e0493ecc2d67c7da26a907d19
(cherry picked from commit c9d7c5cda4
2021-09-20 18:45:52 +00:00
Bill Yi
8526154a0e
[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: 75e53c541e -s ours am: d378c44714 -s ours am: bc53962c32 -s ours am: 07e3a0f1ca -s ours
...
am skip reason: subject contains skip directive
Original change: 1822660
2021-09-09 22:48:36 +00:00
Bill Yi
07e3a0f1ca
[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: 75e53c541e -s ours am: d378c44714 -s ours am: bc53962c32 -s ours
...
am skip reason: subject contains skip directive
Original change: 1822660
2021-09-09 22:29:32 +00:00
Bill Yi
bc53962c32
[automerger skipped] Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE am: 75e53c541e -s ours am: d378c44714 -s ours
...
am skip reason: subject contains skip directive
Original change: 1822660
2021-09-09 22:11:53 +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
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
4496b212a5
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1603a390d9 -s ours am: a29c751c03 -s ours am: f9f37b89bd -s ours
...
am skip reason: Merged-In Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb with SHA-1 1f0a09988e15571685
2021-08-17 20:32:51 +00:00
Xin Li
f9f37b89bd
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1603a390d9 -s ours am: a29c751c03 -s ours
...
am skip reason: Merged-In Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb with SHA-1 1f0a09988e15571685
2021-08-17 19:46:47 +00:00
Xin Li
a29c751c03
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1603a390d9 -s ours
...
am skip reason: Merged-In Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb with SHA-1 1f0a09988e15571685
2021-08-17 18:36:16 +00: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
fb394f2a87
[automerger skipped] Merge RQ3A.210705.001 to aosp-master - DO NOT MERGE am: bac2216679 -s ours am: 2f22097eb3 -s ours am: 1f0a09988e -s ours
...
am skip reason: subject contains skip directive
Original change: 1763607
2021-07-13 01:39:26 +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 aa959b7dc21763607
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 aa959b7dc21763607
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
c4d165cac6
[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 4881f0316c -s ours am: f03dcbc4ee -s ours
...
am skip reason: subject contains skip directive
Original change: 15257334
2021-07-12 13:42:04 +00: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 e6458eaa8415257334
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
09bb278211
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 83583a78db -s ours am: aa959b7dc2 -s ours am: e6458eaa84 -s ours
...
am skip reason: subject contains skip directive
Original change: 1741358
2021-06-21 16:14:29 +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 c0c27ebb881741358
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 c0c27ebb881741358
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
4d61cac1bd
[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c0c27ebb88 -s ours am: fd344b3b9d -s ours
...
am skip reason: subject contains skip directive
Original change: 15024040
2021-06-18 06:34:23 +00: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 afb344009e15024040
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
756b9e76fb
[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: afb344009e -s ours am: 16fdac9558 -s ours
...
am skip reason: subject contains skip directive
Original change: 14974484
2021-06-18 00:57:06 +00: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 3de25bf0bb14974484
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
13be02debc
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 am: 5cef8e7828
...
Original change: 14460944
2021-06-08 06:35:07 +00:00
Ray Essick
78594383b1
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 am: ed79df03af
...
Original change: 14460944
2021-06-08 06:35:01 +00:00
Ray Essick
6865febcc6
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 am: b13890d29c
...
Original change: 14460944
2021-06-08 06:29:27 +00:00
Ray Essick
c1c8bb3903
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 am: 4dd7a92df0
...
Original change: 14460944
2021-06-08 06:29:19 +00:00
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
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
2021-06-08 06:15:36 +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
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
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
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
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
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
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
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
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
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
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
