summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-25Merge remote-tracking branch ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r11android-12.1.0_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseWilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev am: eb9f4d24af Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/14701713 Change-Id: I1973a18abec086d2080e2e375273fdd8f92e0d08
2021-05-25Merge remote-tracking branch ↵android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devWilson Sung
'goog/qcom/release/LA.UM.9.1.C11.11.00.00.841.013' into sc-dev Conflicts: conf_files/atoll/media_codecs.xml conf_files/atoll/media_codecs_performance.xml conf_files/atoll/media_codecs_vendor.xml conf_files/sm6150/media_codecs.xml conf_files/sm6150/media_codecs_sdmmagpie_v1.xml conf_files/sm6150/media_codecs_vendor_sdmmagpie_v1.xml mm-core/src/registry_table.c mm-core/src/registry_table_android.c mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp product.mk Bug: 188781413 Bug: 189096555 Change-Id: I3ff3c2d9f700e0e134fedc8e0012381cdd9442b3
2021-04-22Merge "sm6150: Limit the max performance load"qctecmdr
2021-03-09Merge "conf_files: trinket: Remove 2k and qhd profiles"qctecmdr
2021-03-09Merge "conf_files: msmnile: Remove 2k and qhd profiles"qctecmdr
2021-03-09Merge "conf_files: atoll: Remove 2k and qhd profiles"qctecmdr
2021-03-08conf_files: trinket: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: Ib40939c2f4c1b2e274833c3cab42a603549ddd38
2021-03-05conf_files: sm6150: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: I597e4ad8c6656e34be6bb3c85439fca2c38c5d77
2021-03-05conf_files: atoll: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: I0c96636d3ae6de0e1fc69ce553e311c4a2fd21c0
2021-03-05conf_files: msmnile: Remove 2k and qhd profilesShrikara B
Remove 2K and QHD profiles from media_profiles xml file. These resolutions are actually not supported by camera. Change-Id: I9b0f7e625b0f290d2700d8d48bc4b48c586e602d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 75c7f979e5 -s ↵Xin Li
ours am: 005fc0f2a9 -s ours am skip reason: Change-Id I9c2059f4238d06e0b6e0b0d9d74f8ba383a5beb8 with SHA-1 a7cf7d2235 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If9c747d725b0d79abad17acd45df0e15f45a5520
2021-02-20[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/media am: 53e1171c20 ↵Bob Badour
am: 2cd15a53b9 am: 3071d67c50 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1588403 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id88747a76552648ba134e7f758be58283fb524ab
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 75c7f979e5 -s oursXin Li
am skip reason: Change-Id I9c2059f4238d06e0b6e0b0d9d74f8ba383a5beb8 with SHA-1 a7cf7d2235 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iad8784d8e59928d2703d1523437d07bb6f1e67e4
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I9c2059f4238d06e0b6e0b0d9d74f8ba383a5beb8 Change-Id: Ib94f5e195b55e7a1e7d0b8009082bd49e2930e89
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/media am: 53e1171c20 ↵Bob Badour
am: 2cd15a53b9 Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1588403 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie38dc7f37ad2c27a4f09ce5b1ac1e285efc20066
2021-02-19[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/media am: 53e1171c20Bob Badour
Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1588403 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4fed96c0ac74fc456ee67eb86d707668d9010ab
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to hardware/qcom/sm8150/mediaBob Badour
Added SPDX-license-identifier-Apache-2.0 to: libstagefrighthw/Android.mk Added SPDX-license-identifier-BSD to: hypv-intercept/Android.mk libarbitrarybytes/Android.mk libc2dcolorconvert/Android.mk libplatformconfig/Android.mk mm-video-v4l2/vidc/common/Android.mk mm-video-v4l2/vidc/vdec/Android.mk mm-video-v4l2/vidc/venc/Android.mk Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: mm-core/Android.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ic7de79a006517cf97f6c37a64940d3d723c2384e
2021-01-19mm-video-v4l2: Use default value for max luminance.Vasantha Balla
Use the default max luminance value if the value from the bitstream is less than 100 cd/m^2. Change-Id: Ia51ef1fb105ba687e5d34d88a8485fb71918c9e0
2020-12-13mm-video-v4l2: venc: Close and delete handle on errorSanjay Singh
Close and delete handle when memory allocation fails, otherwise this may cause memory leak. Change-Id: Ie560b4af6b729d1cbcf0050c6d0c6ad6cbbcc817
2020-12-077150: finetune performance xmlParas Nagda
Fine tuned the performance xml based on the CTS results for C2 HW codec Change-Id: I375e2abe927be456d1493bea063bf47992f4799e
2020-11-26Merge "mm-video-v4l2: vdec: do not update buffer requirements during ↵qctecmdr
getparameter"
2020-11-23Mark ab/6881855 as merged am: a4dee4974c am: a7cf7d2235Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/13112955 Change-Id: I0c846f2e823d4cd52306579001eb206b3f63c585
2020-11-23Mark ab/6881855 as merged am: a4dee4974cXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/13112955 Change-Id: I9c2059f4238d06e0b6e0b0d9d74f8ba383a5beb8
2020-11-23Mark ab/6881855 as mergedandroid-s-preview-1Xin Li
Bug: 172690556 Change-Id: I185907646a8c5fc4b878507bc80951f9bed76d1c
2020-11-18sm6150: Limit the max performance loadSanjay Singh
Limit the maximum performance load to UHD@30 instead of true4k@30 as per published spec to both talos/moorea. For VP8 codec, performance load is reduced to 1080p@60. Change-Id: Ia733a51bf34a8f06ec63c526a35de76cfa6e152e
2020-11-03mm-video-v4l2: vdec: add special handling for codec_config bufferGovindaraj Rajagopal
[1] During flush, current implementation allows codec_config buffer to send it to firmware, even there is no sufficient FTB buffers avaliable with firmware. So VideoDecMsgThread thread is waiting on codec_config EBD for 2 sec and that lead to timeout in pre-roll logic at framework. So framework treats that as a corrupted clip and closes video session and proceeds with only audio. [2] To handle this situation, send outstanding FTB buffers to firmware, before queuing codec_config ETB's. Change-Id: I5df3bada976cab282a41b3cb2b836ed468d37615 Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org> Signed-off-by: Sanjay Singh <sisanj@codeaurora.org>
2020-10-30mm-video-v4l2: vdec: do not update buffer requirements during getparameterGovindaraj Rajagopal
Updating buffer requirements in getparameter replaces all the values set by client. For only secure usecase, input buffer size is halved in kernel, so query only buffer size instead of overriding complete buffer requirements set by client. Change-Id: I45d43a10b698fad36cd083f878ab4be80b004cfb Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2020-10-27Merge "mm-video-v4l2: vidc: Removed restriction over -ve time stamps"qctecmdr
2020-10-27mm-video-v4l2: vidc: Removed restriction over -ve time stampsSanjay Singh
Major video use-case have regression due to negative time stamp restriction. So timestamp restriction is removed. Change-Id: I12dee082d9be07ec6ee8fb1cd01084003cd58de0
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9131ecbf7 -s ours am: ↵Xin Li
55f248d769 -s ours am: 902b467c5b -s ours am skip reason: Change-Id I0a65c1208bae758f90af891ecd58d630aaaa1708 with SHA-1 2221918fa2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12796879 Change-Id: Ib3a780a4058ef427238d8062aeaa0b948fdfd5c5
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9131ecbf7 -s ours am: ↵Xin Li
55f248d769 -s ours am skip reason: Change-Id I0a65c1208bae758f90af891ecd58d630aaaa1708 with SHA-1 2221918fa2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12796879 Change-Id: Ie68202c21805b8a3a7271726eb31e05aa866e7ab
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: a9131ecbf7 -s oursXin Li
am skip reason: Change-Id I0a65c1208bae758f90af891ecd58d630aaaa1708 with SHA-1 2221918fa2 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12796879 Change-Id: Ifefe896dbdb67abddb268ad30900f6e28eb909c6
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I0a65c1208bae758f90af891ecd58d630aaaa1708 Change-Id: I78b1e28ccff75f8f429f7330b111f38847ea6d0d
2020-09-24mm-video-v4l2: enable sending hdr10plus metadata via gralloc handleParas Nagda
Enable setting of vp9/hevc hdr10plus metadata via private gralloc along with frameworks. Change-Id: I9d63d0e82c6f6bba1f229ef509885a1acd69238c
2020-09-14Merge remote-tracking branch ↵ChengYou Ho
'goog/qcom/release/LA.UM.9.1.R1.10.00.00.604.038' into rvc-dev am: c7b3d621ad am: 72af8d6194 Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/11396550 Change-Id: Ib2b0187aa3a5ebf79d2ae179e187bbb22154d4cd
2020-09-11[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 ↵Xin Li
-s ours am: 42318db5e9 -s ours am: 6cbd0b2da7 -s ours am: d62f45b26b -s ours am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441 Change-Id: I4c6a08c99bc2289e4cd391d0a5e01081f9200f5a
2020-09-11[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 ↵Xin Li
-s ours am: 42318db5e9 -s ours am: 6cbd0b2da7 -s ours am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441 Change-Id: I0e5a92d270717a28c036699ed8121605dd206754
2020-09-11[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 ↵Xin Li
-s ours am: 42318db5e9 -s ours am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441 Change-Id: I1e30619926f0eeb4f389af6bb3d589b725ed9326
2020-09-11[automerger skipped] Merge Android R am: b4eab38de6 -s ours am: 4f0d5891f1 ↵Xin Li
-s ours am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441 Change-Id: I9c7563c29c4f78882c84695aa5a1521130822b57
2020-09-11[automerger skipped] Merge Android R am: b4eab38de6 -s oursXin Li
am skip reason: Change-Id I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d with SHA-1 6da222fc09 is in history Original change: https://android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/1422441 Change-Id: Ibe7f23768391bee4fba7ead461e953c90082daf5
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d Change-Id: I68140ef190682d8ddfb176ceca1f479d56a814b1
2020-09-07mm-core: Remove tme,vpp for TrinketParas Nagda
Since tme,vpp is not supported on trinket removing the same from registry. Change-Id: I3f8df16cac5f3e204f941c8c0ee118067c28a55d
2020-09-02[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6da222fc09 -s ours am: d23ed625fc -s ours am: c6d76509b9 -s ours am: 0b0b5630cc -s ours am skip reason: Change-Id If59a1a4a9c779b41916cbea378d885e1295ac15c with SHA-1 fad1e7d9a1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12470177 Change-Id: Ibfadf70dca85efc0201058ec5a0d5403b0af9d6b
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6da222fc09 -s ours am: d23ed625fc -s ours am: c6d76509b9 -s ours am skip reason: Change-Id If59a1a4a9c779b41916cbea378d885e1295ac15c with SHA-1 fad1e7d9a1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12470177 Change-Id: Ibdf4753f23fa8c3254031f2326c8426e468c75fd
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6da222fc09 -s ours am: d23ed625fc -s ours am skip reason: Change-Id If59a1a4a9c779b41916cbea378d885e1295ac15c with SHA-1 fad1e7d9a1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12470177 Change-Id: I712ee4877099639e396ed4ed94a4182b044549b6
2020-09-01[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: 6da222fc09 -s ours am skip reason: Change-Id If59a1a4a9c779b41916cbea378d885e1295ac15c with SHA-1 fad1e7d9a1 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/media/+/12470177 Change-Id: I69c136979a325f4896232ab7357eb52af6f3fb83
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: If59a1a4a9c779b41916cbea378d885e1295ac15c Change-Id: I5d60cc1d7aab23ff51c3592a5bac3d4e8dcbb87d
2020-08-27msmnile : remove vc1 entry from media_codec xmlParas Nagda
Change-Id: I33d1284671cfbb17c40b222c27820c3b08114a34
2020-08-24mm-core: Remove vpp for atollParas Nagda
Since VPP service is not supported on atoll removing the same from registry. Change-Id: Ibd7d3c0e0506965954bc73ee07a1d8305da69cea
2020-08-20media: Talos: update the MediaCodec TagParas Nagda
MediaCodec tag was misplaced.corrected the same. Change-Id: Id87e59cb03ce20238929d823710594b9738805b7