summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 69293e50d2 -s ours am: 028f850ae5 -s ours am skip reason: subject contains skip directive Change-Id: I4e597ac6de818cc4a97e701feab20444b6032246
2019-02-11[automerger skipped] DO NOT MERGE - Merge pi-platform-release ↵Xin Li
(PPRL.190205.001) into stage-aosp-master am: 69293e50d2 -s ours am skip reason: subject contains skip directive Change-Id: I2784e04f96aa9bdfd0272f95701aa4099c412396
2019-02-11DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into ↵Xin Li
stage-aosp-master Bug: 124234733 Change-Id: I76e44955c55679a78646d494e6a625f2583f3cda
2019-02-09Snap for 5180536 from 264e4ba1ced98d02e1be33852ff395fc6212a615 to ↵pie-platform-releaseandroid-build-team Robot
pi-platform-release Change-Id: Ibeb29004d30aa56067b06456795db4d49df87a48
2019-01-23media: Fix compilation error with logical OR operandSanthosh Behara
Fix compilation error with logical OR operand usage Change-Id: I4db58aecb8bea18c03262d60c75983e024b29fad
2018-12-24Merge remote-tracking branch 'goog/qcom/release/LA.UM.7.8.9.C1.08.00.00.516.007'Robin Peng
Conflicts: mm-video-v4l2/vidc/venc/inc/video_encoder_device_v4l2.h Bug: 121228685 Change-Id: I38dfda186f1d12cd2732808d1d8ebbda90946db4
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: 669cdf0683 -s ours am: a194a78b0c -s ours am: 18ea303efb -s ours Change-Id: I664def5ee1fd2238ccf2303a89336679297b181b
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: 669cdf0683 -s ours am: a194a78b0c -s ours Change-Id: Ib541922768fc10d16693c20a44f68172e8f82efe
2018-12-13[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into master am: 669cdf0683 -s ours Change-Id: If6500613dc781a3f1347d9552aeefd9699c35d28
2018-12-12venc: add break to switch statementUma Mehta
insert 'break;' to avoid fall-through to default case. Change-Id: I23e4067d906e635559d79bcd6bfbe0d2be5ff6db
2018-12-11[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into stage-aosp-master am: d2e2f8e47d -s ours am: 90ad4add64 -s ours Change-Id: Iae3cfb283cc7e59d3a4f959012dc13ebcb302671
2018-12-11[automerger skipped] DO NOT MERGE - Merge pie-platform-release ↵Xin Li
(PPRL.181205.001) into stage-aosp-master am: d2e2f8e47d -s ours Change-Id: If0da1d7d7d28fdb0b858ec5b3b245512a552586a
2018-12-11DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into masterXin Li
Bug: 120502534 Change-Id: Ibbaf44201c75df9c03331256f1799f8d90b06bbb
2018-12-11DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into ↵Xin Li
stage-aosp-master Bug: 120502534 Change-Id: I9facf2fe1405860e7f254a3d18a1d81a2886d864
2018-12-07[automerger skipped] Fix invalid logical constant creation in sdm845.Stephen Hines
am: 8c8a960f5c -s ours Change-Id: I43049a4b4aba0827da40516b6681a68717d39377
2018-12-07Fix invalid logical constant creation in sdm845.Stephen Hines
This code incorrectly uses || to combine a bunch of state constants. The next Clang warns on this buggy pattern. hardware/qcom/sdm845/media/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp:1097:40: error: use of logical '||' with constant operand [-Werror,-Wconstant-logical-operand] if (eState == (OMX_StateLoaded || OMX_StateWaitForResources ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ hardware/qcom/sdm845/media/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp:1097:40: note: use '|' for a bitwise operation if (eState == (OMX_StateLoaded || OMX_StateWaitForResources ^~ | Bug: http://b/110779387 Test: Build with new toolchain. Change-Id: If791d503a43740f83189f181964931a26cb77fe2 Merged-In: If791d503a43740f83189f181964931a26cb77fe2 (cherry picked from commit 891f019d60607816fc482c09cbd360f6d60f89fc)
2018-12-06Fix invalid logical constant creation in sdm845Yi Kong
This code incorrectly uses || to combine a bunch of state constants, fixes constant-logical-operand warning. Test: m checkbuild Change-Id: I51dedf2b34e270550e0e5f97ac30990f9a4669c6
2018-11-28Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-releaseBill Yi
Change-Id: I61a18196c95c54d108d86c65e85ce696dce46931
2018-10-29Allow implicit-fallthrough warnings in video_encoder_device_v4l2.cpp. am: ↵Chih-Hung Hsieh
6afc17b75f am: 223643dc0f am: 1318f5939e Change-Id: I206d8fed55e2c78cdf75512f115aa9ee07e3ac43
2018-10-29Allow implicit-fallthrough warnings in video_encoder_device_v4l2.cpp. am: ↵Chih-Hung Hsieh
6afc17b75f am: 223643dc0f Change-Id: I2bbe05218a97ac34e59642c2695385e7477a63f3
2018-10-29Allow implicit-fallthrough warnings in video_encoder_device_v4l2.cpp.Chih-Hung Hsieh
am: 6afc17b75f Change-Id: Ic777d4ceb2502113b267d2cd8dd04756f59e7c9f
2018-10-29Allow implicit-fallthrough warnings in video_encoder_device_v4l2.cpp.android-wear-8.0.0_r2Chih-Hung Hsieh
It will be a global error by default. Test: make checkbuild Bug: 112564944 Change-Id: I379c618465365363536aecf3f34e5105ea72e53a Exempt-From-Owner-Approval: do not block on new warnings
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 67ed58e210 -s ours am: d591a22846 -s ours Change-Id: I037e75439a4e27e702fe9f041717e5ebcb1a11fd
2018-10-24[automerger skipped] Merge pi-platform-release to stage-aosp-master - DO NOT ↵Bill Yi
MERGE am: 67ed58e210 -s ours Change-Id: Ia948c0e591178eaf53eb71a876cc3ba4f7073eb7
2018-10-24Merge pi-platform-release to stage-aosp-master - DO NOT MERGEBill Yi
Change-Id: Ia583dbd9ef36826308ede6f364d9fcdcf82fd0e9
2018-10-16mm-video-v4l2: vdec: Typecast the value instead of addressMaheshwar Ajja
m_etb/ftb_q.pop_entry() will save the buffer header pointer address in the value of the variable passed. Use the value of this variable and not the address to typecast. Change-Id: I53b78dc47486c0ce4e934dd579c9212f269859e9 Signed-off-by: shubham <shubgupt@codeaurora.org>
2018-10-02Snap for 5044688 from 96454aaa4ab9f17690ecd4f5f147f3afe5e0361d to ↵android-9.0.0_r35android-9.0.0_r34android-9.0.0_r33android-9.0.0_r32android-9.0.0_r31pie-qpr2-releaseandroid-build-team Robot
pi-qpr2-release Change-Id: I9c4b7f26adb33926d1cc0513918506587783804e
2018-09-26Fix invalid logical constant creation in sdm845.Stephen Hines
This code incorrectly uses || to combine a bunch of state constants. The next Clang warns on this buggy pattern. hardware/qcom/sdm845/media/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp:1097:40: error: use of logical '||' with constant operand [-Werror,-Wconstant-logical-operand] if (eState == (OMX_StateLoaded || OMX_StateWaitForResources ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ hardware/qcom/sdm845/media/mm-video-v4l2/vidc/venc/src/omx_video_base.cpp:1097:40: note: use '|' for a bitwise operation if (eState == (OMX_StateLoaded || OMX_StateWaitForResources ^~ | Bug: http://b/110779387 Test: Build with new toolchain. Change-Id: If791d503a43740f83189f181964931a26cb77fe2
2018-09-10Merge cherrypicks of [4986743, 4986744, 4987539, 4987168, 4986376, 4986377, ↵android-9.0.0_r30android-9.0.0_r22android-9.0.0_r21android-9.0.0_r20android-9.0.0_r19android-9.0.0_r16pie-qpr1-s3-releasepie-qpr1-s2-releasepie-qpr1-s1-releasepie-qpr1-releaseandroid-build-team Robot
4986378, 4986889, 4986745, 4986746, 4986747, 4986748, 4986749, 4986750, 4986773, 4987169, 4987170, 4987611, 4987631, 4987632, 4987633, 4987634, 4986890, 4987612, 4987651, 4987598, 4987613, 4987614, 4987615, 4987599, 4986379, 4986380, 4987652, 4987653, 4987691, 4986774] into pi-qpr1-release Change-Id: Ie360f0e1956c58f9d8a3ccbfa2a6ab2fd82a5302
2018-09-10mm-video-v4l2: vdec: Correct order of reading color primariesSanthosh Behara
According to H265 spec, the color primaries should be in G,B,R order. But in the exisisting code they are read in R, G, B order. Correct the order of reading bitstream as per the specification. (Cherry-picked from: https://partner-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1120439) Bug: 111799726 Change-Id: Ic6703dcf7878c27e3e18e437039ddb74cf8d32d6 (cherry picked from commit acb885f628ccf4731d887d47300e5d9ff58b72b4) (cherry picked from commit 96454aaa4ab9f17690ecd4f5f147f3afe5e0361d)
2018-09-10mm-video-v4l2: vdec: Correct order of reading color primaries am: 96454aaa4aSanthosh Behara
am: 90766dc707 Change-Id: I463ccb2ba06e0877d0752bd5fa063978eee7aa89
2018-09-10mm-video-v4l2: vdec: Correct order of reading color primariesSanthosh Behara
am: 96454aaa4a Change-Id: I37dcddb0db44ec7f4f88510ee9c152cae760a28c
2018-09-05mm-video-v4l2: vdec: Correct order of reading color primariesandroid-9.0.0_r47android-9.0.0_r46android-9.0.0_r45android-9.0.0_r44android-9.0.0_r43android-9.0.0_r42android-9.0.0_r41android-9.0.0_r40android-9.0.0_r37android-9.0.0_r36pie-qpr3-s1-releasepie-qpr3-releasepie-qpr3-b-releasepie-b4s4-devSanthosh Behara
According to H265 spec, the color primaries should be in G,B,R order. But in the exisisting code they are read in R, G, B order. Correct the order of reading bitstream as per the specification. (Cherry-picked from: https://partner-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1120439) Bug: 111799726 Change-Id: Ic6703dcf7878c27e3e18e437039ddb74cf8d32d6 (cherry picked from commit acb885f628ccf4731d887d47300e5d9ff58b72b4)
2018-09-04media: venc: Fix compilation errorManikanta Kanamarlapudi
Use the "base" enum type when comparing against an extended enum value. CRs-Fixed: 2307726 Change-Id: I143194f4e688c747a487441c6c22e894176b4598
2018-08-28Merge "media: use native Constrained high/base profile"Linux Build Service Account
2018-08-20media: use native Constrained high/base profileUma Mehta
CBP/CHP is supported at native layer, hence using the same in place of vendor extension. Change-Id: I280cf24f9ce394ca5ed9beec4a3a93a68fe5ae1d
2018-08-17mm-video-v4l2: vdec: Correct order of reading color primariesSanthosh Behara
According to H265 spec, the color primaries should be in G,B,R order. But in the exisisting code they are read in R, G, B order. Correct the order of reading bitstream as per the specification. (Cherry-picked from: https://partner-android-review.googlesource.com/c/platform/hardware/qcom/sdm845/media/+/1120439) Bug: 111799726 Change-Id: Ic6703dcf7878c27e3e18e437039ddb74cf8d32d6
2018-08-16mm-video-v4l2: vdec: Correct order of reading color primariesSanthosh Behara
According to H265 spec, the color primaries should be in G,B,R order. But in the exisisting code they are read in R, G, B order. Correct the order of reading bitstream as per the specification. Change-Id: Ic6703dcf7878c27e3e18e437039ddb74cf8d32d6
2018-08-03libplatformconfig: define a separate print macroshubham
libplatformconfig uses the print macro defined that uses debug level which may go out of scope and cause heap-use-after-free Change-Id: Iee3fe156ceaaea8bfc86beb8220476f2ba85bb73