summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-03Snap for 6360434 from 36a2e54ac76aac12b3a81ee4ee87efe3b2f89aaf to rvc-d1-releaseandroid-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid-build-team Robot
Change-Id: I87d7d2bc1b4ee32c9f760d908385e4dda263c8f1
2020-03-24Snap for 6325852 from 463d752f5b3042193354ec8c75bb73454a7dac2f to rvc-d1-releaseandroid-build-team Robot
Change-Id: I0e3fdb73a82ea6658ebb1f9302aacffc2028ad3c
2020-03-23Merge remote-tracking branch ↵android-11.0.0_r16android11-d1-b-releaseAlex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev am: 463d752f5b Change-Id: I6009f6ed9c33333091bae75893751b15843182a7
2020-02-26Merge remote-tracking branch ↵android-mainline-12.0.0_r112android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseandroid11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devaml_tz2_305400100Alex Hong
'goog/qcom/release/LA.UM.7.8.9.C2.08.00.00.618.012' into rvc-dev Conflicts: mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp Bug: 149539244 Change-Id: I1f76b1a162e331bad8e6af6b259aca271a212460
2020-02-15Snap for 6210127 from 7338ce29053842d95e83136b53efe43806e5f228 to rvc-d1-releaseandroid-build-team Robot
Change-Id: I080a1ad92c8377e79462c784951087eae36254f1
2020-02-11vdec: Set correct output buffer size: dynamic meta mode am: 4c2000cb4e am: ↵Automerger Merge Worker
fd31cabb7a Change-Id: I41b65318e298de01e0cf999baffba3dc174da281
2020-02-11vdec: Set correct output buffer size: dynamic meta mode am: 4c2000cb4eAutomerger Merge Worker
Change-Id: I194a8bc82247ec3de87754a67c69443a486d187e
2020-02-11vdec: Set correct output buffer size: dynamic meta modePriyanka Gujjula
When frameworks queries for output buffer size on decoder via OMX_IndexParamPortDefinition, expectation is to return metadata buffer size instead of YUV buffer size in dynamic metadata mode. Test: CtsMediaTestCases & CtsVideoTestCases pass Bug: 147104052 Change-Id: Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b
2020-01-06vdec: Set correct output buffer size: dynamic meta modePriyanka Gujjula
When frameworks queries for output buffer size on decoder via OMX_IndexParamPortDefinition, expectation is to return metadata buffer size instead of YUV buffer size in dynamic metadata mode. Change-Id: Ica54841cbc81b29c4b3bfa0b58f94a0f82de300b
2019-10-30[automerger skipped] DO NOT MERGE - ↵Xin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: e65f94797c am: 507841ed48 -s ours am skip reason: subject contains skip directive Change-Id: I3c990b40badf71b5d8337d4e8e3add2bf9c8a5ef
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: e65f94797c Change-Id: I44030f0cbba158702743af46a6d5af4490d22490
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ibc88c85edbbde9344ad5aa89714025a71a71d987
2019-10-18Skip QD1A.190821.011 in stage-aosp-master am: 8dc55a3c73 am: cb11337b79Xin Li
am: f904016958 Change-Id: I3bf9d6227a66cba527f75e44c0c0d2a897b6a044
2019-10-18Skip QD1A.190821.011 in stage-aosp-master am: 8dc55a3c73Xin Li
am: cb11337b79 Change-Id: I6d3602bcc6ff2ba0bf8ba1974429ae8a8c73754d
2019-10-18Skip QD1A.190821.011 in stage-aosp-masterXin Li
am: 8dc55a3c73 Change-Id: If3379aaf102847c026b7abc6c748b0513157f82b
2019-10-16Skip QD1A.190821.011 in stage-aosp-masterXin Li
Bug: 141248619 Change-Id: Icaad77f44a9b7cb649731c25d3d73298461017b9
2019-09-26mm-video-v4l2: venc: handle use after free on venc_devGovindaraj Rajagopal
pthread_join(msg_thread_id) is called after deleting venc_dev object. So member variables from venc_dev class is accessed in VencEncMsgThread. So changed the sequence to ensure thread_join before deleting venc_dev obj. Change-Id: I0b49d9d9051d1e4e01ee507fe87a6df88f2b986d Signed-off-by: Govindaraj Rajagopal <grajagop@codeaurora.org>
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 82e4d0f00d -s ours am: 9af2f3bf69 -s ours am: c0378db17a -s ours am skip reason: change_id Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6 with SHA1 6e57c01c49 is in history Change-Id: Ie08fffb7cabd850dcf027e1cd2ff5629b8f7dcc4
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 82e4d0f00d -s ours am: 9af2f3bf69 -s ours am skip reason: change_id Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6 with SHA1 6e57c01c49 is in history Change-Id: I833b0e7d64d807cf02fef53fa779ee080be029c8
2019-09-08[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into ↵Xin Li
stage-aosp-master am: 82e4d0f00d -s ours am skip reason: change_id Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6 with SHA1 6e57c01c49 is in history Change-Id: I66be729957ef37d8ec69398558c0a449874b0083
2019-09-08Merge qt-r1-dev-plus-aosp-without-vendor (5817612) into stage-aosp-masterXin Li
No content change. Bug: 135460123 Change-Id: Ida363ddc0ffcee9f364cc29e867d34344e966f74 Merged-In: Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
6e57c01c49 -s ours am: 85bdeed848 am: 914f0505ae am: 7e4ad843bf -s ours am skip reason: subject contains skip directive Change-Id: I309d527489e110e3e9f37ae2121da64cc6b5fea5
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
6e57c01c49 -s ours am: 85bdeed848 am: 914f0505ae Change-Id: I1f12e97623a774ad89c7269460a04f75dd1bbc63
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into master am: ↵Xin Li
6e57c01c49 -s ours am: 85bdeed848 Change-Id: Ibb319a70ffe4f365a3f0d3646843990b6c58ceb8
2019-09-05[automerger skipped] DO NOT MERGE - Merge Android 10 into masterXin Li
am: 6e57c01c49 -s ours am skip reason: subject contains skip directive Change-Id: Ie0afe02c6f11b9395dd24ca2eacd64365eb68982
2019-09-04DO NOT MERGE - Merge Android 10 into masterndk-sysroot-r21Xin Li
Bug: 139893257 Change-Id: Id34b9a5175c55e22b1c2f2d1b3fb62a7e5f497d6
2019-07-02[automerger skipped] DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor ↵Xin Li
(5699924) into stage-aosp-master am: cffd9b6e6b am: e4c9d536db -s ours am skip reason: subject contains skip directive Change-Id: Id319b8b756b1e0ffa694f495aa125b6b194f06b6
2019-07-02DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵Xin Li
stage-aosp-master am: cffd9b6e6b Change-Id: I6fea0fb2b86eae533971e4e0e2c0e835f8e4b5a2
2019-07-01DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into ↵temp_140451723Xin Li
stage-aosp-master Bug: 134405016 Change-Id: I9df07bd37da9890778c1480d202271e5fa790c5b
2019-05-25Snap for 5606075 from b0efeb18b5983ae92094a062ca6615f646ecf6db to ↵android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid-build-team Robot
qt-c2f2-release Change-Id: Iaea2611c2bccdd0a05ed2c869d2efaf33968c0dc
2019-05-24mm-core: b4/s4: remove mpeg2 decoder and other unused components am: ↵Praveen Chavan
4fd48f445c am: 77952afd68 am: 17ba3148da Change-Id: Id8c902d2878a59dccbc29ddfc89c795bea084a0b
2019-05-24mm-core: b4/s4: remove mpeg2 decoder and other unused components am: ↵Praveen Chavan
4fd48f445c am: b0efeb18b5 am: a91bcd4518 Change-Id: Ia5764f69d354b15f1b66b48e73eb62ebe6e240e7
2019-05-24mm-core: b4/s4: remove mpeg2 decoder and other unused components am: 4fd48f445cPraveen Chavan
am: 77952afd68 Change-Id: Ib8d10d950eea489ad99739b69fe007f52893cd31
2019-05-24mm-core: b4/s4: remove mpeg2 decoder and other unused components am: 4fd48f445cPraveen Chavan
am: b0efeb18b5 Change-Id: I1617b1b574102456e49bbb5c5356b21f2d54fd9b
2019-05-24mm-core: b4/s4: remove mpeg2 decoder and other unused componentsPraveen Chavan
am: 4fd48f445c Change-Id: Iadbe098f7d54c0d7ef9d172935a6faca1b9c421d
2019-05-24mm-core: b4/s4: remove mpeg2 decoder and other unused componentsandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android10-qpr2-s1-releaseandroid10-qpr1-mainline-releaseandroid10-mainline-media-releasePraveen Chavan
am: 4fd48f445c Change-Id: I0c1d078b720dd4189c2bb79d407911f9dc552975
2019-05-13mm-core: b4/s4: remove mpeg2 decoder and other unused componentsandroid10-devPraveen Chavan
Remove mpeg2 decoder (secure/non-secure) and other unused components since they are not published in media_codecs.xml Test: m vts && vts-tradefed run vts -m VtsHalMediaOmxV1_0Host Bug: 130202495 Change-Id: I3371cebefab18cf740cac45436e2d475d7521b4b
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ↵Xin Li
bafb1705ac -s ours am: 5e2c282ac1 -s ours am: 12f8fcd97a -s ours am skip reason: subject contains skip directive Change-Id: Ia1ac65aa9bcf911cb6bcc8a8e5636d4bbc08689d
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master. am: ↵Xin Li
bafb1705ac -s ours am: 5e2c282ac1 -s ours am skip reason: subject contains skip directive Change-Id: Id0ff67a7e742cd7dd6cf5df507b48f56a49d507d
2019-05-09[automerger skipped] DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
am: bafb1705ac -s ours am skip reason: subject contains skip directive Change-Id: I5931eb9234788094441df6acb27bcda226423dfa
2019-05-09DO NOT MERGE - Merge Pie Bonito/Sargo into master.Xin Li
Bug: 131756210 Change-Id: Ibeff0ea6ad07f8daa406fd7e532d3ad7527cf1fc
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
71119cc899 -s ours am: b56ec37914 -s ours am: d00e8f5092 -s ours am skip reason: subject contains skip directive Change-Id: I7691043bce578ccfd7b31aaab2f7b3ef86155250
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into master am: ↵Xin Li
71119cc899 -s ours am: b56ec37914 -s ours am skip reason: subject contains skip directive Change-Id: I9a11d0d452703a7857a36077d0ce9a97892a139e
2019-03-11[automerger skipped] DO NOT MERGE - Merge PPRL.190305.001 into mastertemp_b_131756210_stage-aosp-masterXin Li
am: 71119cc899 -s ours am skip reason: subject contains skip directive Change-Id: Ife5ea8452f7aff4ee76b6c3b27217d07f86932b7
2019-03-11DO NOT MERGE - Merge PPRL.190305.001 into masterandroid-q-preview-6android-q-preview-5android-q-preview-4android-q-preview-2.5android-q-preview-1Xin Li
Bug: 127812889 Change-Id: I92ef763031baa27eb7603b16443bf83239092741
2019-02-28libplatformconfig: decouple static linkage to vidc-common-libPraveen Chavan
Remove static dependency to libOmxVidcCommon b/117673125 Change-Id: Idc171b3c9130e2354e4d83ebc630b231de8dba26
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
am: c7a278d77c Change-Id: I6bbdcab89cd73b66baaa5e14de7cfffcfdfb2e67
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I09d568460feb563a2473b2bcb6b19352d6ffaead
2019-02-21DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Iebc74b06a9dc67295a8ce7c4c801fbdb45a696e3
2019-02-15Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.083'Robin Peng
Conflicts: mm-video-v4l2/vidc/vdec/src/omx_vdec_v4l2.cpp mm-video-v4l2/vidc/venc/src/omx_video_base.cpp Bug: 124397977 Change-Id: I92df53d9ee300d501a9629355256364280fff595
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 23:38:46 +0000