summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Snap for 6544675 from 6129152b6fa231665297ef6587efcd3f35d3b7c0 to rvc-releaseandroid-vts-11.0_r1android-cts-11.0_r1android-11.0.0_r3android-11.0.0_r2android-11.0.0_r17android-11.0.0_r1android11-tests-releaseandroid11-releaseandroid-build-team Robot2020-05-301-1/+1
|\ | | | | | | Change-Id: I5ed7baf49836753820ad474405d85d6d19289708
| * point to new repo hooks for mainline uploadsandroid11-devRay Essick2020-05-261-1/+1
| | | | | | | | | | | | Bug: 157501573 Test: upload Change-Id: If1f024379589f420fd23e4f25e0d178a10b84f11
* | Snap for 6453963 from e8d70076de07ecf3f31de9a8ce7affde9b5e0dda to rvc-releaseandroid-build-team Robot2020-05-021-3/+19
|\| | | | | | | Change-Id: I75bd41f759ae9b985f6496964cc20334b0d6220c
| * Set min_sdk_version to be part of mainline modulesJooyung Han2020-05-011-3/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 669c6bb63c1b9f3b65100170d880af9695f055dd)
* | Snap for 6374687 from e0ad0016f0f545ab1c15c3769b5e69a80a8b4c0e to rvc-releaseandroid-build-team Robot2020-04-081-5/+5
|\| | | | | | | Change-Id: Id3aeaaa76fb579db1c6860b9aaf08d193a54524d
| * Revert "decoder: set u4_frame_decoded to true only after both fields are ↵Harish Mahendrakar2020-04-061-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | decoded" This reverts commit f76370c67166496742be22568b27e3d4e01b6267. 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
* | Snap for 6318458 from 7286f5f02166585585ba6d31916f802a64ad8b31 to rvc-releaseandroid-build-team Robot2020-03-211-2/+6
|\| | | | | | | Change-Id: I0179f9358a1898111f573baf0f971d5f12097a95
| * Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot2020-03-201-1/+0
| |\ | | | | | | | | | | | | | | | qt-qpr1-dev am: 280902e61f Change-Id: I3f9e5f1019b7759e83a2cc7f2848766f52bcdfed
| | * Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot2020-03-201-1/+0
| | |\ | | | | | | | | | | | | qt-qpr1-dev
| | | * decoder: Fix lt_ref increment in ih264d_fix_error_in_dpbHarish Mahendrakar2020-02-111-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | decoder: Fix in detecting dangling fields am: 6dd54b9e18Harish Mahendrakar2020-03-201-1/+6
| |\| | | | | | | | | | | | | | Change-Id: Ia546016131ba894365e90089a6644383c76bf325
| | * | decoder: Fix in detecting dangling fieldsHarish Mahendrakar2020-02-111-1/+6
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Snap for 6154573 from 93a6f1db82a65d9fe8f64b6971a489f6267291d2 to rvc-releaseandroid-build-team Robot2020-01-232-38/+29
|\| | | | | | | | | | | Change-Id: Ibfcdc935c5e8b60dc9f8a6daf83b696a06d24fe9
| * | Merge "encoder: Return gracefully from entropy encoding errors" am: ↵Automerger Merge Worker2020-01-222-38/+29
| |\ \ | | | | | | | | | | | | | | | | | | | | 94f5d3f0f7 am: 7be9fe31f8 am: 0b545cc625 Change-Id: Ia99a4e1a024310153d372cca66fa97aeb1e5b2bd
| | * \ Merge "encoder: Return gracefully from entropy encoding errors" am: ↵Automerger Merge Worker2020-01-222-38/+29
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | 94f5d3f0f7 am: 7be9fe31f8 Change-Id: Ib74b095ac162196e549f41e9d8b7d2d42333e964
| | | * \ Merge "encoder: Return gracefully from entropy encoding errors"android10-sidebranchChamarthi Kishore2020-01-222-38/+29
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 94f5d3f0f7 Change-Id: I460d6eb6afa66a5b40e9d34dc2f49e0030f11239
| | | | * \ Merge "encoder: Return gracefully from entropy encoding errors"android-r-preview-1Treehugger Robot2020-01-222-38/+29
| | | | |\ \
| | | | | * | encoder: Return gracefully from entropy encoding errorsChamarthi Kishore2019-12-032-38/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Snap for 6142138 from 22d5c95471a4fedf45782ecf0b60bd4550579760 to rvc-releaseandroid-build-team Robot2020-01-170-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3088cc6548f03ca9cfaee904df06511e6a583b9f
| * | | | | | [automerger skipped] DO NOT MERGE - Merge ↵Automerger Merge Worker2020-01-160-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Automerger Merge Worker2020-01-160-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master am: 2f6efb8050 Change-Id: I48146badcf8fbb820c0ea20d8ef53065135f84be
| | | * | | | DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Xin Li2020-01-152-27/+32
| | | |\ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master Bug: 146167222 Change-Id: I0bfd5bcbdfc87b371efb7ab5611ec505a10fa0f6
* | | | | | | Snap for 6123763 from 2f6f64e1c14c0a2903d313972d4878ebd0c1a8c1 to rvc-releaseandroid-build-team Robot2020-01-101-4/+8
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I003d5ad3446761c1c503c1883e6897231c36cd75
| * | | | | | Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b am: 826a705863 Change-Id: Ife6f6d0a5231076a9fec4cbf9a449f1fd67abc08
| | * | | | | Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b Change-Id: Idf10b1ae11ad8f376d0b3f2587bebeeece6126f1
| | | * | | | Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 Change-Id: I0966eed6f66382e3fa7ccc19558734cc202ed0f3
| | | | * \ \ \ Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 Change-Id: I7feff45df303f49d95b4d5b07019929dead2810c
| | | | | * \ \ \ Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f Change-Id: I7bd7ba5f8adb66af75ef92257576bef227507f15
| | | | | | * \ \ \ Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b am: cebf26ab4d Change-Id: Ib8872212d43d41ae25f28992b6c02ab15cb72b26
| | | | | | | * \ \ \ Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker2020-01-091-4/+8
| | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev am: 9d7a036d7b Change-Id: I8d4b3415dfe5d2148f3211de258798de214559d0
| | | | | | | | * \ \ \ Merge "decoder: Fix minimum poc calculation check while adding to display" ↵TreeHugger Robot2020-01-091-4/+8
| | | | | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into oc-dev
| | | | | | | | | * | | | decoder: Fix minimum poc calculation check while adding to displayHarish Mahendrakar2020-01-021-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While adding the decoded buffer to display queue, allow buffer with poc set to 0x7FFFFFFF Bug: 145364230 Test: poc in bug Change-Id: I2a15f73b8422cfa4fd3360bc21c0cea4542a3375
* | | | | | | | | | | | | Snap for 6066770 from 3716098904f682e57e77df98c1ed64bd33ecaf78 to rvc-releaseandroid-build-team Robot2019-12-121-0/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6012fa9df1d8bc9e47ac889b40fa3900d52206b
| * | | | | | | | | | | | Add a repo upload hook for checking the mainline code change.Dongwon Kang2019-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: repo upload w/ and wo/ changes in mainline path. Change-Id: I35319bfdd673cef855295dcc4821c8db81fe07eb
* | | | | | | | | | | | | Snap for 6050516 from 1670387156fa7d8d605c5ca8dae9824e1ee2ce0a to rvc-releaseandroid-build-team Robot2019-12-050-0/+0
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib25173441efa5f82acf7c377ba44841f02947569
| * | | | | | | | | | | | Merge Android10 QPR1 into AOSP master am: dd964bfe0c am: 992c9d196fAutomerger Merge Worker2019-12-040-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8bffa7907f69356099028ea4f884c7aea86d3d5b
| | * | | | | | | | | | | Merge Android10 QPR1 into AOSP master am: dd964bfe0cXin Li2019-12-040-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 1b97c6e8ba Change-Id: I15fd5bf6fa3e4cd6b3acc4f2d19a75f8b24a9b2d
| | | * | | | | | | | | | Merge Android10 QPR1 into AOSP masterXin Li2019-12-030-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: dd964bfe0c Change-Id: Idcb351aa982a5d95a16ec12e4500f68cb5b00e13
| | | | * | | | | | | | | Merge Android10 QPR1 into AOSP masterXin Li2019-12-024-2/+24
| | | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / | | | |/| | | | | | | | / | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | | Bug: 145570283 Change-Id: I3aa82731c599d2e1a92fa9f309aa34c641dd3116
* | | | | | | | | | | | Snap for 6013487 from 86d06a286a56255fac65dde8e9b5ba55e6cc4edf to rvc-releaseandroid-build-team Robot2019-11-171-3/+34
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0b0e6a167c4315e19fec0b79ebeb64c0e6f7e04b
| * | | | | | | | | | | Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cb am: 82735c3553Harish Mahendrakar2019-11-141-3/+34
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: e5204d0626 Change-Id: I10c81150f7ecd9fbdab94eaa85d0abddd2d850f1
| | * | | | | | | | | | Merge "fuzzer: Updates to fuzzer plugin" am: 25e615b9cbHarish Mahendrakar2019-11-141-3/+34
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 82735c3553 Change-Id: I0678fcfb220e7679bed499738d3bdce0649722f7
| | | * | | | | | | | | Merge "fuzzer: Updates to fuzzer plugin"Harish Mahendrakar2019-11-141-3/+34
| | | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 25e615b9cb Change-Id: Ic4b2c071197abb0b08774f0a4f5f71bf6ad17225
| | | | * | | | | | | | Merge "fuzzer: Updates to fuzzer plugin"Treehugger Robot2019-11-141-3/+34
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | fuzzer: Updates to fuzzer pluginHarish Mahendrakar2019-10-221-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to configure architecture Limit number of decode calls to 100 Avoid zero size allocations Bug: 141574514 Test: ./avc_dec_fuzzer Change-Id: I3a449a795e1d849424dafb00142d861988e5a0e4
* | | | | | | | | | | | | Snap for 5989825 from e40cbbfc510639c092a6720bf7fc2ce4668073dd to rvc-releaseandroid-build-team Robot2019-11-061-23/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic0d9108b12a40a0025811598fb7cb0e4380fb133
| * | | | | | | | | | | | decoder: Move initialization of dbp_mgr entries to init_decoder() am: ↵Harish Mahendrakar2019-11-051-23/+24
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec am: 474797af3c am: 942e7f8896 Change-Id: I3fb8acb951bc8043546ab1c8956b664427b16295
| | * | | | | | | | | | | decoder: Move initialization of dbp_mgr entries to init_decoder() am: ↵Harish Mahendrakar2019-11-051-23/+24
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec am: 474797af3c Change-Id: I315a135615fdace5bc573e9f585133a991b30c77
| | | * | | | | | | | | | decoder: Move initialization of dbp_mgr entries to init_decoder() am: ↵Harish Mahendrakar2019-11-051-23/+24
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 am: 873bac42ec Change-Id: I6f5d7d5486926100a815ffcddd134cf998d35c79
| | | | * \ \ \ \ \ \ \ \ \ decoder: Move initialization of dbp_mgr entries to init_decoder() am: ↵Harish Mahendrakar2019-11-051-23/+24
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|/ / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01da7b5a52 am: 41fcd228ae am: cce42ea920 am: 6c9873af88 am: 662efee177 Change-Id: I14c0ab90853acfae799d88c288b3e28bfa734336
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 14:34:28 +0000