aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-11-18Snap for 6981242 from 793a1f374f1a9ed49b52227987e53172964946a7 to ↵r_aml_301500702android-mainline-11.0.0_r6android-mainline-11.0.0_r4android11-mainline-sparse-2021-jan-releaseandroid-build-team Robot
mainline-release Change-Id: Ia07c63d17daf2f4836794935637dc8b9209d0beb
2020-10-30decoder: fix integer overflow when setting i4_prev_max_display_seqShivaansh Agrawal
reset ps_dec->i4_prev_max_display_seq if out of int32 range to avoid overflow Bug: 143791121 Bug: 143791161 Bug: 170737173 Test: POC in bug description Merged-In: I3d8df556b003a7c739716bb33262ab3a6ca7b2d9 Change-Id: I3d8df556b003a7c739716bb33262ab3a6ca7b2d9
2020-10-20Snap for 6916203 from 84907ba2d6e604d1397cb9076030cc11ce6e1b49 to ↵android-mainline-11.0.0_r9android-mainline-11.0.0_r3android-mainline-11.0.0_r29android11-mainline-sparse-2020-dec-releaseandroid-build-team Robot
mainline-release Change-Id: I1439dbaf0af4595d81fb7dfeef1d27da93e5c733
2020-09-25Merge "Decoder: Fix heap buffer overflow." into mainline-prodTreeHugger Robot
2020-09-25Merge "decoder: Update reorder depth to account for display latency" into ↵TreeHugger Robot
mainline-prod
2020-09-25Merge "decoder: Allow stride to be smaller than decode width" into mainline-prodTreeHugger Robot
2020-09-25Decoder: Fix Null dereferenceAasaipriya Chandran
Add checks to validate long term index and max long term index parsed in MMCO commands. Bug: 140358770 Bug: 140680655 Bug: 148772548 Bug: 152148135 Bug: 152434373 Bug: 152550528 Test: poc in bug Change-Id: I9052ce7721491fdd5fb4807ec33e399cee8c70cf
2020-09-18decoder: Update reorder depth to account for display latencyHarish Mahendrakar
Decoder returns output with an additional latency of 2. reorder depth retured is now updated to account for this extra latency Also move reorder_depth initialization to parse_sps() Instead of initializing reorder_depth after decoding first picture, initialize it in parse_sps(). Bug: 163127030 Test: poc in bug Test: atest android.mediav2.cts Merged-In: I94b35b2c5df5c910d0159548b168617946a19cc2 Change-Id: I94b35b2c5df5c910d0159548b168617946a19cc2
2020-08-27decoder: Allow stride to be smaller than decode widthHarish Mahendrakar
When cropping is enabled, application can request a stride that is larger than display width but smaller than decode width. Bug: 160397536 Test: stagefright -sS <clip in bug> Change-Id: I453b2de0474f3ae4d021084729c33d52fc1090dc
2020-08-18Decoder: Fix heap buffer overflow.Hamsalekha S
Fix bitstream buffer overflow in the function ih264d_parse_sei_message Bug: 152895390 Test: POC in bug Change-Id: I41ff1f7b2834c2d09e546b8e3d37e4cd4abfa28d
2020-05-31Snap for 6545159 from 5b879a3b7025de7b7914365fa4da4612554386f8 to ↵android-mainline-11.0.0_r2android-mainline-11.0.0_r1android-build-team Robot
mainline-release Change-Id: I8f2dd990f64da8b3e60b322a797014107292bc63
2020-05-29point to new repo hooks for mainline uploads am: 6129152b6fandroid-mainline-11.0.0_r35Ray Essick
Change-Id: I4ddcabddfbce8f05e3c3cfd94d1ebcdad3a3dc89
2020-05-26point to new repo hooks for mainline uploadsandroid11-devRay Essick
Bug: 157501573 Test: upload Change-Id: If1f024379589f420fd23e4f25e0d178a10b84f11
2020-05-03Snap for 6456462 from bb5a9f7a4c00af3d80981bbe9144189898bc83b1 to ↵android-build-team Robot
mainline-release Change-Id: I01b650de3642081e0a01cc5c02f597d46de6f02e
2020-05-01Set min_sdk_version to be part of mainline modules am: e8d70076de am: ↵Jooyung Han
3fc114c0c7 am: e35ceba888 Change-Id: Idf1b59bc0a99648917518e694528d4c567b1f0a4
2020-05-01Set min_sdk_version to be part of mainline modules am: e8d70076de am: 3fc114c0c7Jooyung Han
Change-Id: I525107dc800390154aae1ef08baf5fdd4958bac8
2020-05-01Set min_sdk_version to be part of mainline modules am: e8d70076deJooyung Han
Change-Id: I01e42e538d26cf16878500fa34a951424ef1cd26
2020-05-01Set min_sdk_version to be part of mainline modulesJooyung Han
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)
2020-04-08Snap for 6374617 from 0d2b665fbeb70697cd16aaf7a5e8be2cbc72bd20 to ↵android-build-team Robot
mainline-release Change-Id: I0113238a6914647a68ab66f55ebf6f879643e57f
2020-04-07Revert "decoder: set u4_frame_decoded to true only after both fields are ↵Harish Mahendrakar
decoded" am: e0ad0016f0 am: 5ddd1567f9 am: a5a03d8967 Change-Id: I1f2ff823bb100c93a7ec98dce4513624c1b7e6cf
2020-04-07Revert "decoder: set u4_frame_decoded to true only after both fields are ↵Harish Mahendrakar
decoded" am: e0ad0016f0 am: 5ddd1567f9 Change-Id: I5e9dc3e671df6a4597828591f32aa16f34d69dbd
2020-04-07Revert "decoder: set u4_frame_decoded to true only after both fields are ↵Harish Mahendrakar
decoded" am: e0ad0016f0 Change-Id: I94dd473b5afb7b9f5e155b0ed081d312187a135e
2020-04-06Revert "decoder: set u4_frame_decoded to true only after both fields are ↵Harish Mahendrakar
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
2020-03-20Snap for 6315035 from e2c8e56b91b35492a847e673374b4c674a6e9e48 to ↵android-build-team Robot
mainline-release Change-Id: If99b70da2cc685f7e0f9ae5055b218d1b75a1570
2020-03-20Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot
qt-qpr1-dev am: 280902e61f am: 7286f5f021 am: b51f786034 am: 5bb9f6d260 Change-Id: I2c5afd2519d87b83b7e7710fee3b335068fb3441
2020-03-20decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621 am: ↵Harish Mahendrakar
9157866b2b am: 6f0ef308c3 Change-Id: I1baa6475c19cbe9bc8a6baa4efcad05418d55257
2020-03-20Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot
qt-qpr1-dev am: 280902e61f am: 7286f5f021 am: b51f786034 Change-Id: I97e5a4ac75d927f615ce91abd6c47f63f18a154f
2020-03-20decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621 am: ↵Harish Mahendrakar
9157866b2b Change-Id: I3b62e821e1133034944e9a6747b3943fe997338e
2020-03-20Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot
qt-qpr1-dev am: 280902e61f am: 7286f5f021 Change-Id: Id436aee0eaf0f45794186713cec5ec6e463da5c5
2020-03-20decoder: Fix in detecting dangling fields am: 6dd54b9e18 am: 7e44189621Harish Mahendrakar
Change-Id: I24f0868f85ec1eb081d50e2da07606ecb58f3e90
2020-03-20Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot
qt-qpr1-dev am: 280902e61f Change-Id: I3f9e5f1019b7759e83a2cc7f2848766f52bcdfed
2020-03-20decoder: Fix in detecting dangling fields am: 6dd54b9e18Harish Mahendrakar
Change-Id: Ia546016131ba894365e90089a6644383c76bf325
2020-03-20Merge "decoder: Fix lt_ref increment in ih264d_fix_error_in_dpb" into ↵TreeHugger Robot
qt-qpr1-dev
2020-02-11decoder: Fix lt_ref increment in ih264d_fix_error_in_dpbHarish Mahendrakar
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-11decoder: Fix in detecting dangling fieldsHarish Mahendrakar
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-01-22Merge "encoder: Return gracefully from entropy encoding errors" am: ↵Automerger Merge Worker
94f5d3f0f7 am: 7be9fe31f8 am: 0b545cc625 Change-Id: Ia99a4e1a024310153d372cca66fa97aeb1e5b2bd
2020-01-22Merge "encoder: Return gracefully from entropy encoding errors" am: ↵Automerger Merge Worker
94f5d3f0f7 am: 7be9fe31f8 Change-Id: Ib74b095ac162196e549f41e9d8b7d2d42333e964
2020-01-22Merge "encoder: Return gracefully from entropy encoding errors"android10-sidebranchChamarthi Kishore
am: 94f5d3f0f7 Change-Id: I460d6eb6afa66a5b40e9d34dc2f49e0030f11239
2020-01-22Merge "encoder: Return gracefully from entropy encoding errors"android-r-preview-1Treehugger Robot
2020-01-16[automerger skipped] DO NOT MERGE - Merge ↵Automerger Merge Worker
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-16DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Automerger Merge Worker
stage-aosp-master am: 2f6efb8050 Change-Id: I48146badcf8fbb820c0ea20d8ef53065135f84be
2020-01-15DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into ↵Xin Li
stage-aosp-master Bug: 146167222 Change-Id: I0bfd5bcbdfc87b371efb7ab5611ec505a10fa0f6
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b am: 826a705863 Change-Id: Ife6f6d0a5231076a9fec4cbf9a449f1fd67abc08
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 am: 8c2ee3ea8b Change-Id: Idf10b1ae11ad8f376d0b3f2587bebeeece6126f1
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 am: 4b7a562681 Change-Id: I0966eed6f66382e3fa7ccc19558734cc202ed0f3
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f am: ed2b83d989 Change-Id: I7feff45df303f49d95b4d5b07019929dead2810c
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b am: cebf26ab4d am: f64194a96f Change-Id: I7bd7ba5f8adb66af75ef92257576bef227507f15
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b am: cebf26ab4d Change-Id: Ib8872212d43d41ae25f28992b6c02ab15cb72b26
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵Automerger Merge Worker
into oc-dev am: 9d7a036d7b Change-Id: I8d4b3415dfe5d2148f3211de258798de214559d0
2020-01-09Merge "decoder: Fix minimum poc calculation check while adding to display" ↵TreeHugger Robot
into oc-dev