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
android-build-team Robot
97883bc82b
Snap for 7249461 from 66997f22b0 to rvc-qpr3-release
...
Change-Id: I9b4470c936355adfc48fa521c69b8153152b5d4f
2021-03-31 22:02:40 +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
Harish Mahendrakar
6dd54b9e18
decoder: Fix in detecting dangling fields
...
When decoder is expecting to decode a field, ensure current slice
being decoded is a field and frame number matches with previous slice's
frame number.
Bug: 144687080
Test: poc in bug
Change-Id: I89d9d7b6fc26797de0420ecb0ca7e66b066aa908
2020-02-11 16:03:29 -08:00
Automerger Merge Worker
93a6f1db82
Merge "encoder: Return gracefully from entropy encoding errors" am: 94f5d3f0f7 am: 7be9fe31f8 am: 0b545cc625
...
Change-Id: Ia99a4e1a024310153d372cca66fa97aeb1e5b2bd
2020-01-22 20:37:55 +00:00
Automerger Merge Worker
0b545cc625
Merge "encoder: Return gracefully from entropy encoding errors" am: 94f5d3f0f7 am: 7be9fe31f8
...
Change-Id: Ib74b095ac162196e549f41e9d8b7d2d42333e964
2020-01-22 20:20:31 +00:00
Chamarthi Kishore
7be9fe31f8
Merge "encoder: Return gracefully from entropy encoding errors"
...
am: 94f5d3f0f7
Change-Id: I460d6eb6afa66a5b40e9d34dc2f49e0030f11239
2020-01-22 12:11:17 -08:00
Treehugger Robot
94f5d3f0f7
Merge "encoder: Return gracefully from entropy encoding errors"
2020-01-22 19:49:30 +00:00
Automerger Merge Worker
22d5c95471
[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 2f6efb8050 am: b816a9c21d -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia9cc33c2d7affffef667b3f0f059ad35003333fc
2020-01-16 19:00:59 +00:00
Automerger Merge Worker
b816a9c21d
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 2f6efb8050
...
Change-Id: I48146badcf8fbb820c0ea20d8ef53065135f84be
2020-01-16 18:34:38 +00:00
Xin Li
2f6efb8050
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master
...
Bug: 146167222
Change-Id: I0bfd5bcbdfc87b371efb7ab5611ec505a10fa0f6
2020-01-15 15:57:01 -08:00
Automerger Merge Worker
2f6f64e1c1
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b am: 826a705863
...
Change-Id: Ife6f6d0a5231076a9fec4cbf9a449f1fd67abc08
2020-01-09 05:21:04 +00:00
Automerger Merge Worker
826a705863
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b
...
Change-Id: Idf10b1ae11ad8f376d0b3f2587bebeeece6126f1
2020-01-09 05:04:07 +00:00
Automerger Merge Worker
8c2ee3ea8b
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681
...
Change-Id: I0966eed6f66382e3fa7ccc19558734cc202ed0f3
2020-01-09 04:51:33 +00:00
Automerger Merge Worker
4b7a562681
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989
...
Change-Id: I7feff45df303f49d95b4d5b07019929dead2810c
2020-01-09 04:38:27 +00:00
Automerger Merge Worker
ed2b83d989
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f
...
Change-Id: I7bd7ba5f8adb66af75ef92257576bef227507f15
2020-01-09 04:21:17 +00:00
Automerger Merge Worker
f64194a96f
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b am: cebf26ab4d
...
Change-Id: Ib8872212d43d41ae25f28992b6c02ab15cb72b26
2020-01-09 04:06:39 +00:00
Automerger Merge Worker
cebf26ab4d
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev am: 9d7a036d7b
...
Change-Id: I8d4b3415dfe5d2148f3211de258798de214559d0
2020-01-09 03:49:11 +00:00