Jooyung Han
f384c6243d
Set min_sdk_version to be part of mainline modules am: 669c6bb63c
...
Change-Id: Iaf2a2846d41b388062abeac2364f07439c245146
2020-04-24 03:28:57 +00:00
Jooyung Han
669c6bb63c
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
Change-Id: I6cfff21dcaf861392f8b69d97195831cdda4c1be
2020-04-24 10:02:10 +09:00
Xin Li
980478d737
DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master
...
Bug: 151763422
Change-Id: I93894206d44ef7ef16ee5087dd9d7cb2ba9fbf72
2020-04-09 18:41:50 -07:00
TreeHugger Robot
66556bc9a3
Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into qt-qpr1-dev am: 280902e61f
...
Change-Id: I3a0e050d5e7f17f8233dd7203d0a382c86a70971
2020-03-20 02:39:03 +00:00
Harish Mahendrakar
c0215b1b3d
decoder: Fix in detecting dangling fields am: 6dd54b9e18
...
Change-Id: I61076f4526feeb891a5f866d6f965211e9e65edc
2020-03-20 02:38:56 +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
Xin Li
bf906e86b1
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: c239c9df32
...
Change-Id: Ic20b817cec7a999501a0b266bf033b2e99f76f4b
2020-03-19 04:30:20 +00:00
Xin Li
c239c9df32
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
...
Bug: 151763422
Change-Id: Ia3587770e1ba3bf9159d5ee5aa0ac05926127b75
2020-03-18 19:40:37 -07:00
Automerger Merge Worker
379368e2e1
Remove mips workarounds. am: 748aa1e459 am: db13a9728d
...
Change-Id: Iceda6e002ab9622fc5a04d804f33631c4cf95a74
2020-03-10 03:39:20 +00:00
Automerger Merge Worker
db13a9728d
Remove mips workarounds. am: 748aa1e459
...
Change-Id: I3205d9efc01850d06262cd7946d14e5247c93374
2020-03-10 03:21:14 +00:00
Elliott Hughes
748aa1e459
Remove mips workarounds.
...
Test: treehugger
Change-Id: I3396db9548fe941759a6e8f546b81a10b1a7de01
2020-03-06 21:23:46 -08:00
Automerger Merge Worker
987bc27dc2
Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 29fc5cb2f2 am: 091cff7215
...
Change-Id: I4b278e106a4a3a24e7ee55e6353872a2f8d54596
2020-03-06 00:26:57 +00:00
Automerger Merge Worker
091cff7215
Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 29fc5cb2f2
...
Change-Id: Ibcb88b4a2350d371469b758454f0590f86745a82
2020-03-06 00:12:23 +00:00
Bill Yi
29fc5cb2f2
Merge stage-aosp-master to aosp-master - DO NOT MERGE
...
Change-Id: I23687c8b909f4448eedb43242c9366fba6dbe0e9
2020-03-05 09:51:02 -08: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
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
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
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
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
Xin Li
992c9d196f
Merge Android10 QPR1 into AOSP master am: dd964bfe0c
...
am: 1b97c6e8ba
2019-12-04 08:08:13 -08:00
Xin Li
1b97c6e8ba
Merge Android10 QPR1 into AOSP master
...
am: dd964bfe0c
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
e5204d0626
Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb
...
am: 82735c3553
2019-11-14 13:26:56 -08:00
Harish Mahendrakar
82735c3553
Merge "fuzzer: Updates to fuzzer plugin"
...
am: 25e615b9cb
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
942e7f8896
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec
...
am: 474797af3c
2019-11-05 17:11:11 -08:00
Harish Mahendrakar
474797af3c
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177
...
am: 873bac42ec
2019-11-05 17:05:10 -08:00
Harish Mahendrakar
873bac42ec
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88
...
am: 662efee177
2019-11-05 16:58:10 -08:00
Harish Mahendrakar
662efee177
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae am: cce42ea920
...
am: 6c9873af88
2019-11-05 16:52:06 -08:00
Harish Mahendrakar
6c9873af88
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52 am: 41fcd228ae
...
am: cce42ea920
2019-11-05 16:43:04 -08:00
Harish Mahendrakar
cce42ea920
decoder: Move initialization of dbp_mgr entries to init_decoder() am: 01da7b5a52
...
am: 41fcd228ae
2019-11-05 16:31:59 -08:00
Harish Mahendrakar
41fcd228ae
decoder: Move initialization of dbp_mgr entries to init_decoder()
...
am: 01da7b5a52
2019-11-05 16:25:58 -08:00
Chamarthi Kishore
d49fffd5f4
Merge changes I015ebe03,Idc0b0db5 am: 00fa4b6490
...
am: 7684b467b4
2019-10-31 19:05:49 -07:00
Chamarthi Kishore
7684b467b4
Merge changes I015ebe03,Idc0b0db5
...
am: 00fa4b6490
2019-10-31 18:59:50 -07:00
Treehugger Robot
00fa4b6490
Merge changes I015ebe03,Idc0b0db5
...
* changes:
libavc: Handling of Error propagation
libavc: Add MDCV, CLL, CCV and AVE SEI messages
2019-11-01 01:43:17 +00:00
Xin Li
c0891c3904
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
am: a4681ae1f2
2019-10-31 13:14:25 -07:00
Xin Li
a4681ae1f2
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
...
Bug: 142003500
Change-Id: I389ad42476fc31f17978132b3361c344e1a755b3
2019-10-30 11:47:56 -07:00
Harish Mahendrakar
01da7b5a52
decoder: Move initialization of dbp_mgr entries to init_decoder()
...
Earlier these were only initialized during static buffer allocations.
Initializing them in init_decoder() will ensure that these get
initialized to default values during reset() as well. Without this,
in some error cases, there is a possibility of heap-use-after free,
when resolution changes and these pointers point to memory that is freed
Bug: 142602711
Test: poc in bug
Change-Id: Ie39fee0eca56bf32cdc558099bf167d05eb89620
2019-10-29 19:52:49 -07:00
Chamarthi Kishore
95a2113e4b
libavc: Handling of Error propagation
...
This commit has changes to Error return propagation to
the caller functions.
Test: avcenc -c enc.cfg, avcdec -c dec.cfg
Bug: 142545567
Change-Id: I015ebe03e753a0edc1bf8bfc167180ead63193e1
2019-10-24 17:54:31 +05:30
