Commit graph

3298 commits

Author SHA1 Message Date
Treehugger Robot
17a73d60d3 Merge "Free input buffers only when released by encoder in avc_enc_fuzzer" am: f5d0c99fa9 am: 5041b72ca2 am: 264e56a6b7
Original change: 1505471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6afe152559e15a3fb5d48948e029d93dbbda336e
2021-02-14 04:55:07 +00:00
Treehugger Robot
264e56a6b7 Merge "Free input buffers only when released by encoder in avc_enc_fuzzer" am: f5d0c99fa9 am: 5041b72ca2
Original change: 1505471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I77577084cdc2545da84b6a8c8b5c5c3497137aea
2021-02-14 04:13:33 +00:00
Treehugger Robot
5041b72ca2 Merge "Free input buffers only when released by encoder in avc_enc_fuzzer" am: f5d0c99fa9
Original change: 1505471

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3eadf3c6a81f2a4b65ed6110a279341bb58ad52e
2021-02-14 03:47:00 +00:00
Treehugger Robot
f5d0c99fa9 Merge "Free input buffers only when released by encoder in avc_enc_fuzzer" 2021-02-14 03:17:46 +00:00
Bill Yi
a7ccd4f1b7 [automerger skipped] Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE am: bd550e880a -s ours am: b6131b8dca -s ours am: 2c64484c11 -s ours
am skip reason: subject contains skip directive

Original change: 1573483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6683af3b36ab19a8b075d202e32799f0ae90508
2021-02-04 19:22:30 +00:00
Bill Yi
2c64484c11 [automerger skipped] Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE am: bd550e880a -s ours am: b6131b8dca -s ours
am skip reason: Change-Id I91cbfe74165d1a8f7b7d95edabb10be208ec54a2 with SHA-1 65f4f4a371 is in history

Original change: 1573483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibff02bb56026c060b661768e5ae5a8203125baa7
2021-02-04 18:40:33 +00:00
Bill Yi
b6131b8dca [automerger skipped] Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE am: bd550e880a -s ours
am skip reason: Change-Id I91cbfe74165d1a8f7b7d95edabb10be208ec54a2 with SHA-1 65f4f4a371 is in history

Original change: 1573483

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie64c99529aa70f71af9d568b58e4155162ef91a3
2021-02-04 18:19:16 +00:00
Bill Yi
bd550e880a Merge RQ1A.210205.004 to aosp-master - DO NOT MERGE
Merged-In: I91cbfe74165d1a8f7b7d95edabb10be208ec54a2
Merged-In: I88c74ba5e0cce51e7106bf410744afbc74a7cd5c
Change-Id: Iea197441bcaba9503d1bdcb6f3771e76403bb137
2021-02-03 17:01:27 -08:00
Bill Yi
8fb7c5a1df [automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 65f4f4a371 -s ours am: 0494b8ae1c -s ours
am skip reason: subject contains skip directive

Original change: 13461888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf1b60498d2cf80de737a1a81c75ced8e7409638
2021-02-03 02:20:16 +00:00
Bill Yi
0494b8ae1c [automerger skipped] Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE am: 65f4f4a371 -s ours
am skip reason: Change-Id I0acf75c92b04a2f83301410f2001f63c25ecf3c9 with SHA-1 43e3bf110c is in history

Original change: 13461888

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88c74ba5e0cce51e7106bf410744afbc74a7cd5c
2021-02-03 01:34:43 +00:00
Bill Yi
65f4f4a371 Merge RQ1A.210205.004 to stage-aosp-master - DO NOT MERGE
Merged-In: I0acf75c92b04a2f83301410f2001f63c25ecf3c9
Change-Id: I91cbfe74165d1a8f7b7d95edabb10be208ec54a2
2021-02-02 09:44:08 -08:00
Cindy Zhou
7d00b811e1 Libavc remove diag am: bb48f97189 am: a51b27bfea am: 43e3bf110c
Original change: 1549583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc1551275b55ed64ff2a66ce666357074af5c49a
2021-01-21 00:02:07 +00:00
Cindy Zhou
43e3bf110c Libavc remove diag am: bb48f97189 am: a51b27bfea
Original change: 1549583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0acf75c92b04a2f83301410f2001f63c25ecf3c9
2021-01-20 23:43:35 +00:00
Cindy Zhou
a51b27bfea Libavc remove diag am: bb48f97189
Original change: 1549583

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I407b0014f9ac11728bc24492d7937258af1bc5e0
2021-01-20 23:40:09 +00:00
Cindy Zhou
bb48f97189 Libavc remove diag
Removing diag mode since it's only required for debugging purposes.
Bug: 158010610
Test: n/a

Change-Id: I8f87913ab14bcd97ec8e6975893726e3ee92e399
2021-01-13 11:39:38 -08:00
Anuj Joshi
6ce43b0dd7 Free input buffers only when released by encoder in avc_enc_fuzzer
Test: ./avc_enc_fuzzer
Bug: 172952772

Change-Id: I9d2eb407c73e289b7d88d47d87fb36b68b5dfc69
2021-01-12 10:10:48 +05:30
Cindy Zhou
8658c76e13 Enable cfi for libavc am: 91b4a017ed am: 5cba9813db am: 8aaa63a3f6
Original change: 1515689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6c10912a5c9acbe44f921b323439a50ade5008cb
2021-01-08 22:47:21 +00:00
Cindy Zhou
8aaa63a3f6 Enable cfi for libavc am: 91b4a017ed am: 5cba9813db
Original change: 1515689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ee82af75747007b4b934bedcc84f123a56cef65
2021-01-08 22:29:20 +00:00
Cindy Zhou
5cba9813db Enable cfi for libavc am: 91b4a017ed
Original change: 1515689

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2ddcc4085907ea2fe8b77d10335003dcc8dc147d
2021-01-08 22:09:39 +00:00
Ray Essick
5429105538 Revert "Validate input dimensions in process()"
This reverts commit 06c30b33c4.

Reason for revert: buildcop flagged test failure in mediatranscoding
Bug: 176041187
Bug: 172908358

Change-Id: If813107ea7a2c9f3a87886504c7e36b4473c37db
2020-12-21 17:24:42 +00:00
Cindy Zhou
91b4a017ed Enable cfi for libavc
Bug: 158010610
Bug: 173497308
Test: Ran atest with DecoderConformanceTest, ImageReaderDecoderTest,
VideoDecoderPerfTest, VideoEncoderTest. Compare the
before and after enabling CFI results since there was a number of tests
that were initially failing.

Change-Id: Ib6b0871809e89bf26c426c5616dea6238f2a02ce
2020-12-17 05:43:36 -08:00
android-build-team Robot
d31081d8c2 Merge cherrypicks of [13231586, 13231437, 13231588, 13230397, 13230399, 13231350, 13231351, 13231354, 13231356, 13231439, 13231441, 13231358, 13231443, 13231360, 13231030, 13231457, 13230243, 13231032, 13231725, 13230838, 13231034, 13230840, 13230842, 13231361, 13231363, 13231745, 13231458, 13231747, 13231749, 13231751, 13229580, 13229582, 13231589, 13231591, 13231764, 13230400, 13230402, 13231784, 13231786, 13231788, 13231790] into rvc-qpr1-release
Change-Id: I842326d1b914f17abc1b4121999a8bc412da8cad
2020-12-15 21:49:43 +00:00
Harish Mahendrakar
fd7e28588f 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
(cherry picked from commit 7e06940dce)
2020-12-15 21:45:29 +00:00
Harish Mahendrakar
06c30b33c4 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.

Bug: 172908358
Test: Poc in bug
Test: atest android.mediav2.cts
Test: atest android.media.cts

Change-Id: I677049afdd0fc4a7d7975c024d0a5a8d7758dc91
2020-12-14 21:33:30 -08:00
Xin Li
0b52b2f304 [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 01b93dd80c -s ours am: cf872c1060 -s ours am: 00c16d5a34 -s ours
am skip reason: subject contains skip directive

Original change: 1520450

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8d36ef4cd99fb92d0f8a7c37603290991624610b
2020-12-10 03:58:54 +00:00
Xin Li
00c16d5a34 [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 01b93dd80c -s ours am: cf872c1060 -s ours
am skip reason: Change-Id I2e739d3606ba9f0938ebc2363cb9443ec3dec912 with SHA-1 f59c3864fe is in history

Original change: 1520450

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iae4557ec8fdbfe5eea6a6e035374f2a86a2aa775
2020-12-10 03:46:54 +00:00
Xin Li
cf872c1060 [automerger skipped] DO NOT MERGE - Merge Android R QPR1 am: 01b93dd80c -s ours
am skip reason: Change-Id I2e739d3606ba9f0938ebc2363cb9443ec3dec912 with SHA-1 f59c3864fe is in history

Original change: 1520450

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ef527b57f28fac2ab019a2afe5a681030e3f8d8
2020-12-10 03:05:17 +00:00
Xin Li
01b93dd80c DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: I2e739d3606ba9f0938ebc2363cb9443ec3dec912
Change-Id: I2e0af6e3fc539ee2d010d1638a324f8cd33934a1
2020-12-08 23:48:54 -08:00
Harish Mahendrakar
7a766aba54 decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf am: 640eda280b am: d6c30aa7da am: 82e6bc3fd0 am: 35826c6071
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I857f7056df3aaad7c9f242b75526cdbed7a47689
2020-12-09 04:17:04 +00:00
Harish Mahendrakar
35826c6071 decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf am: 640eda280b am: d6c30aa7da am: 82e6bc3fd0
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia1d88ff27097e0fdc9cc7620ffde47cbf44bd2ab
2020-12-09 03:46:12 +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
4f4a5f8c25 decoder: Update check for first mb in slice am: 7e06940dce am: 4fb26568a9 am: 2bf6790f63 am: 5f4f6e2ecf am: 640eda280b am: c74dab7a5a
Original change: 13171299

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic44a332c169f2e25f8239acc10fd166e3fcacc33
2020-12-09 03:15:03 +00:00
Harish Mahendrakar
c74dab7a5a 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: Ia0b4bb57e604986789246f960db871c3178ebed3
2020-12-09 02:53:44 +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
Xin Li
a8fb1c1a55 [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: f59c3864fe -s ours am: 646e0ec119 -s ours
am skip reason: Change-Id I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4 with SHA-1 3fe5adf3ad is in history

Original change: 13121107

Change-Id: I33c4a2e89a226f663d8273c84f18a7e92406cd15
2020-12-03 04:39:45 +00:00
Xin Li
646e0ec119 [automerger skipped] Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855 am: f59c3864fe -s ours
am skip reason: Change-Id I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4 with SHA-1 3fe5adf3ad is in history

Original change: 13121107

Change-Id: Idf35c7c48f2ee6a6da2bc84e56284cb665173896
2020-12-03 04:25:25 +00:00
Xin Li
f59c3864fe Merge rvc-qpr-dev-plus-aosp-without-vendor@6881855
Bug: 172690556
Merged-In: I829eb4215ea9aa15adf66e8bbdb37ec88a9bb6a4
Change-Id: I2e739d3606ba9f0938ebc2363cb9443ec3dec912
2020-11-23 13:14:11 -08:00
Shivaansh Agrawal
e2cfdd19b6 Decoder: Fix integer overflow in parse slice am: 6efeedf063 am: 66aae99b3d am: 628d22ecf6
Original change: 1502384

Change-Id: Id69fcc3518b585c8542c9a7cbc0232d152280179
2020-11-22 03:26:31 +00:00
Shivaansh Agrawal
628d22ecf6 Decoder: Fix integer overflow in parse slice am: 6efeedf063 am: 66aae99b3d
Original change: 1502384

Change-Id: Ida60c7c7e8ba4df36986673cd58d2a9bafec99e8
2020-11-22 03:07:27 +00:00
Shivaansh Agrawal
66aae99b3d Decoder: Fix integer overflow in parse slice am: 6efeedf063
Original change: 1502384

Change-Id: I37f1e14c3e5be35be87b13c7b9c6f0e9416caa9d
2020-11-22 01:55:14 +00:00
Shivaansh Agrawal
6efeedf063 Decoder: Fix integer overflow in parse slice
Bug: 165976727
Test: POC in bug description
Change-Id: Ia2c8ad5fe6e212d3910a9c91cda52c19f3fac120
2020-11-17 23:34:54 +05:30
Ray Essick
f541e53350 Merge "Encoder: Fix in returning recon buffers with smaller IDR interval" am: cf4481b31d am: cc7a15ca99 am: 3fac4a09ad am: 5afb575845
Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/200241

Change-Id: Ia390339b5aae22fcf164e32456e41745d65df745
2020-11-15 23:46:33 +00:00
Ray Essick
5afb575845 Merge "Encoder: Fix in returning recon buffers with smaller IDR interval" am: cf4481b31d am: cc7a15ca99 am: 3fac4a09ad
Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/200241

Change-Id: Iee0115ad2da18a8fcf7e67424b2a8d1c0d574496
2020-11-15 23:32:51 +00:00
Ray Essick
3fac4a09ad Merge "Encoder: Fix in returning recon buffers with smaller IDR interval" am: cf4481b31d am: cc7a15ca99
Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/200241

Change-Id: I0ebf41c57d21f6990858085997bebdf8c7ce6f8c
2020-11-15 23:19:58 +00:00
Ray Essick
cc7a15ca99 Merge "Encoder: Fix in returning recon buffers with smaller IDR interval" am: cf4481b31d
Original change: https://android-review.googlesource.com/c/platform/external/libavc/+/200241

Change-Id: I4fefa0d34b9a077a47d3b54222dfe82ad26cfdec
2020-11-15 23:05:37 +00:00