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
Neelkamal Semwal
3e73f0d562
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
2021-04-30 21:57:10 +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
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
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
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
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
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
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
TreeHugger Robot
9d7a036d7b
Merge "decoder: Fix minimum poc calculation check while adding to display" into oc-dev
2020-01-09 03:32:14 +00:00
Harish Mahendrakar
ffcf2a87d6
decoder: Fix minimum poc calculation check while adding to display
...
While adding the decoded buffer to display queue, allow buffer with
poc set to 0x7FFFFFFF
Bug: 145364230
Test: poc in bug
Change-Id: I2a15f73b8422cfa4fd3360bc21c0cea4542a3375
2020-01-02 10:22:38 -08:00
Dongwon Kang
3716098904
Add a repo upload hook for checking the mainline code change.
...
Test: repo upload w/ and wo/ changes in mainline path.
Change-Id: I35319bfdd673cef855295dcc4821c8db81fe07eb
2019-12-06 12:07:39 -08:00
Automerger Merge Worker
1670387156
Merge Android10 QPR1 into AOSP master am: dd964bfe0c am: 992c9d196f
...
Change-Id: I8bffa7907f69356099028ea4f884c7aea86d3d5b
2019-12-04 16:57:56 +00:00
Xin Li
992c9d196f
Merge Android10 QPR1 into AOSP master am: dd964bfe0c
...
am: 1b97c6e8ba
Change-Id: I15fd5bf6fa3e4cd6b3acc4f2d19a75f8b24a9b2d
2019-12-04 08:08:13 -08:00
Xin Li
1b97c6e8ba
Merge Android10 QPR1 into AOSP master
...
am: dd964bfe0c
Change-Id: Idcb351aa982a5d95a16ec12e4500f68cb5b00e13
2019-12-03 16:08:09 -08:00
Chamarthi Kishore
4bc3e63c30
encoder: Return gracefully from entropy encoding errors
...
Recent error propagation change in encoder introduced a DoS when
output buffer is not large enough to hold the frame encoded.
This commit fixes the DoS seen.
Test: avcenc -c enc.cfg, avcdec -c dec.cfg
Test: revert fix for b/144928581 to reduce the output buffer size
Test: atest android.media.cts.VideoEncoderTest#testGoogH264FlexMaxMax
Test: atest android.media.cts.VideoEncoderTest#testGoogH264Flex1080p
Bug:145019703
Change-Id: I3b3408153a2cb8541a87547d51dd8bde25a33d6c
2019-12-03 15:30:38 +05:30
Xin Li
dd964bfe0c
Merge Android10 QPR1 into AOSP master
...
Bug: 145570283
Change-Id: I3aa82731c599d2e1a92fa9f309aa34c641dd3116
2019-12-02 21:25:05 -08:00
Harish Mahendrakar
86d06a286a
Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb am: 82735c3553
...
am: e5204d0626
Change-Id: I10c81150f7ecd9fbdab94eaa85d0abddd2d850f1
2019-11-14 13:30:11 -08:00
Harish Mahendrakar
e5204d0626
Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb
...
am: 82735c3553
Change-Id: I0678fcfb220e7679bed499738d3bdce0649722f7
2019-11-14 13:26:56 -08:00
Harish Mahendrakar
82735c3553
Merge "fuzzer: Updates to fuzzer plugin"
...
am: 25e615b9cb
Change-Id: Ic4b2c071197abb0b08774f0a4f5f71bf6ad17225
2019-11-14 13:23:04 -08:00
Treehugger Robot
25e615b9cb
Merge "fuzzer: Updates to fuzzer plugin"
2019-11-14 21:12:42 +00:00
Harish Mahendrakar
e40cbbfc51
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec am: 474797af3c
...
am: 942e7f8896
Change-Id: I3fb8acb951bc8043546ab1c8956b664427b16295
2019-11-05 17:20:44 -08:00