Harish Mahendrakar
cd0385dc07
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
2021-11-17 14:06:27 -08:00
Xin Li
42f977c44f
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours am: 1383f9a18f -s ours am: 2de22834e1 -s ours am: 6437b333a6 -s ours am: 60b263baf2 -s ours
...
am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c447141847357
2021-10-08 09:00:11 +00:00
Xin Li
60b263baf2
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours am: 1383f9a18f -s ours am: 2de22834e1 -s ours am: 6437b333a6 -s ours
...
am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c447141847357
2021-10-08 08:30:01 +00:00
Xin Li
6437b333a6
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours am: 1383f9a18f -s ours am: 2de22834e1 -s ours
...
am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c447141847357
2021-10-08 07:57:03 +00:00
Xin Li
2de22834e1
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours am: 1383f9a18f -s ours
...
am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c447141847357
2021-10-08 01:39:47 +00:00
Xin Li
1383f9a18f
[automerger skipped] Merge Android 12 am: 12e23d0f91 -s ours
...
am skip reason: Merged-In I5e6d1f815848beed302adcb643ca9cd9bae5a31e with SHA-1 d378c447141847357
2021-10-08 01:20:22 +00:00
Xin Li
12e23d0f91
Merge Android 12
...
Bug: 202323961
Merged-In: I5e6d1f815848beed302adcb643ca9cd9bae5a31e
Change-Id: I1c294b5bc48af64d9c66a4a6cdac09f7d6c1ff9b
2021-10-06 22:53:10 +00:00
Manisha Jajoo
c84ab80a8b
Encoder: Fix memory uninitialized issue in the encoder am: 2f3d043b17 am: 8d5e23001d am: ab65a588fa
...
Original change: 15870702
2021-10-05 17:48:19 +00:00
Manisha Jajoo
60d2f114ea
Encoder: Fix memory uninitialized issue in the encoder am: 2f3d043b17 am: 0e22ebef60 am: 0d44c18f72
...
Original change: 15870702
2021-10-05 17:48:15 +00:00
Manisha Jajoo
ab65a588fa
Encoder: Fix memory uninitialized issue in the encoder am: 2f3d043b17 am: 8d5e23001d
...
Original change: 15870702
2021-10-05 17:36:22 +00:00
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
8d5e23001d
Encoder: Fix memory uninitialized issue in the encoder am: 2f3d043b17
...
Original change: 15870702
2021-10-05 17:22:59 +00:00
Manisha Jajoo
f81a188e62
Encoder: Fix memory uninitialized issue in the encoder am: bbe80a782f
...
Original change: 15870701
2021-09-23 22:47:20 +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
Manisha Jajoo
bbe80a782f
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:20 +00:00
Manisha Jajoo
c9d7c5cda4
Encoder: Fix memory uninitialized issue in the encoder
...
Test: atest android.mediav2.cts.CodecEncoderTest
Test: atest VtsHalMediaC2V1_0TargetVideoEncTest
Bug: 193442575
Change-Id: I75475d3bb822fa0e0493ecc2d67c7da26a907d19
2021-09-10 17:04:23 -07:00
Bill Yi
938d932465
[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: 8526154a0e -s ours
...
am skip reason: subject contains skip directive
Original change: 1822660
2021-09-09 23:18:40 +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
0f791b8fd8
[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 1603a390d9 -s ours am: a29c751c03 -s ours am: f9f37b89bd -s ours am: 4496b212a5 -s ours
...
am skip reason: Merged-In Iaa58fca12b868b2bcbf80d8c57b1199d3f5906eb with SHA-1 1f0a09988e15571685
2021-08-18 00:24:10 +00: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
07345dcef6
[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: fb394f2a87 -s ours
...
am skip reason: subject contains skip directive
Original change: 1763607
2021-07-13 01:57:03 +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
7cce624d07
[automerger skipped] Merge RQ3A.210705.001 to stage-aosp-master - DO NOT MERGE am: 4881f0316c -s ours am: f03dcbc4ee -s ours am: c4d165cac6 -s ours
...
am skip reason: subject contains skip directive
Original change: 15257334
2021-07-12 13:56:25 +00: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
cbc60d1560
[automerger skipped] DO NOT MERGE - Merge RQ3A.210605.005 am: 83583a78db -s ours am: aa959b7dc2 -s ours am: e6458eaa84 -s ours am: 09bb278211 -s ours
...
am skip reason: subject contains skip directive
Original change: 1741358
2021-06-21 17:22:50 +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
d3e865d7fd
[automerger skipped] DO NOT MERGE - Mark RQ3A.210410.001 as merged am: c0c27ebb88 -s ours am: fd344b3b9d -s ours am: 4d61cac1bd -s ours
...
am skip reason: subject contains skip directive
Original change: 15024040
2021-06-18 06:51:46 +00: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
23a95f3334
[automerger skipped] DO NOT MERGE - Merge ab/7272582 am: afb344009e -s ours am: 16fdac9558 -s ours am: 756b9e76fb -s ours
...
am skip reason: subject contains skip directive
Original change: 14974484
2021-06-18 01:22:51 +00: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
