summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-08-12Merge "Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5."HEADandroid-m-preview-2mastermainElliott Hughes
2015-08-12Lose HAVE_ANDROID_OS from hardware/samsung_slsi/exynos5.Elliott Hughes
Change-Id: I638a8fdc13603448b96cc66e8cc517302ce04936
2015-04-03Merge "Remove superfluous OpenSSL include paths."android-wear-5.1.1_r1android-wear-5.1.0_r1android-m-preview-1android-m-previewmaster-soongKenny Root
2015-02-26am 1458007d: Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
* commit '1458007d0f8623d649e40c671ad0ec51f4913c79': Separate keymaster0 and keymaster1 HALs.
2015-02-26Merge "Separate keymaster0 and keymaster1 HALs."Shawn Willden
2015-02-26Separate keymaster0 and keymaster1 HALs.Shawn Willden
Change-Id: Ida47d6fae1ed7e85e7c223900f6b7a2e655fee47 (cherry picked from commit f02e17e73036be67a9c8d6ecc7b82cbc5684131d)
2015-02-06am 4baab539: exynos: vdec: report width/height as stride/slice-height for ↵Lajos Molnar
BUFFER_COPY * commit '4baab539d5854f3270e6eb5a3d12e5be0fd8bdef': exynos: vdec: report width/height as stride/slice-height for BUFFER_COPY
2015-02-05exynos: vdec: report width/height as stride/slice-height for BUFFER_COPYandroid-5.1.1_r5android-5.1.1_r28android-5.1.1_r22android-5.1.1_r17android-5.1.1_r12lollipop-mr1-wfc-releaselollipop-mr1-devLajos Molnar
This is a workaround for bytebuffer mode, as decoder actually uses width and height as stride and slice height for the output buffer. Changing only at getParam as the internal value may be used elsewhere. Bug: 19179288 Change-Id: I2a85f02bf626971ae3fa31bafe5af9ac761d3ca8
2015-02-04am 1112f2fc: Merge "exynos: vdec: support disabling metadata and native ↵Lajos Molnar
buffer modes" into lmp-mr1-dev * commit '1112f2fc374699af6ea7c40dc5e57f0bfd77c338': exynos: vdec: support disabling metadata and native buffer modes
2015-02-04am 3ece9dfd: Revert "exynos: gralloc: implement gralloc_lock_ycbcr"Lajos Molnar
* commit '3ece9dfda9477300b641c44cff2e79115987a0b5': Revert "exynos: gralloc: implement gralloc_lock_ycbcr"
2015-02-04Merge "exynos: vdec: support disabling metadata and native buffer modes" ↵Lajos Molnar
into lmp-mr1-dev
2015-01-31am 6c0730fc: Merge "Fix "error: \'memset\' was not declared in this scope"."Elliott Hughes
* commit '6c0730fc1030bb41f8857ba5ff768dedb961dce0': Fix "error: 'memset' was not declared in this scope".
2015-01-31am c65ad165: Merge "Fix "error: \'strerror\' was not declared in this scope"."Elliott Hughes
* commit 'c65ad165e47ae46e53fed07b576ff5efbf47b1c8': Fix "error: 'strerror' was not declared in this scope".
2015-01-31am 7f50a9df: Merge "Fix "error: use of undeclared identifier \'strerror\'"."Elliott Hughes
* commit '7f50a9df54ef63467fee5ad08111cfe11f03c3b6': Fix "error: use of undeclared identifier 'strerror'".
2015-01-31Merge "Fix "error: 'memset' was not declared in this scope"."Elliott Hughes
2015-01-30Fix "error: 'memset' was not declared in this scope".Elliott Hughes
Change-Id: I3c08c481e9a315fd374b68142ddedeb2db613c6e
2015-01-31Merge "Fix "error: 'strerror' was not declared in this scope"."Elliott Hughes
2015-01-30Fix "error: 'strerror' was not declared in this scope".Elliott Hughes
Change-Id: If8e3b1d1198df2e725ba08fdecda6bb996e23656
2015-01-31Merge "Fix "error: use of undeclared identifier 'strerror'"."Elliott Hughes
2015-01-30Fix "error: use of undeclared identifier 'strerror'".Elliott Hughes
Change-Id: I96065fe96e98073360340f042dc1736ce508e02b
2015-01-30exynos: vdec: support disabling metadata and native buffer modesLajos Molnar
Bug: 19179288 Change-Id: I57495379be6170fec6e07ea9a1f67ed81aeeadf2
2015-01-30Revert "exynos: gralloc: implement gralloc_lock_ycbcr"Lajos Molnar
This format is not SW readable This reverts commit 25ffbfe5e8b51f392fafc1bffb16b6633a8ba3df. Bug: 19179288 Change-Id: Icbfc098f4a079f32a3809ab9ef9bfcbc509a89ee
2015-01-29am 25ffbfe5: exynos: gralloc: implement gralloc_lock_ycbcrLajos Molnar
* commit '25ffbfe5e8b51f392fafc1bffb16b6633a8ba3df': exynos: gralloc: implement gralloc_lock_ycbcr
2015-01-28exynos: gralloc: implement gralloc_lock_ycbcrLajos Molnar
Support only NV12 TILED format used by video decoder for surface output. Bug: 19179288 Change-Id: Iac345ca76cb856a39031d82ee1bbb6177c09a30d
2015-01-22Remove superfluous OpenSSL include paths.Adam Langley
The libcrypto and libssl modules (and their respective static and host versions) use LOCAL_EXPORT_C_INCLUDE_DIRS thus just including the module is sufficient. Change-Id: Ie591e149b4252284c1344261fdabe785250ee16e
2015-01-16am f2eb9594: manta: libcamera2: fix copy-and-paste regressionMark Salyzyn
* commit 'f2eb959463914d0928d20fda3fb860365e57ea9f': manta: libcamera2: fix copy-and-paste regression
2015-01-16manta: libcamera2: fix copy-and-paste regressionMark Salyzyn
In "manta: libcamera2: if captured shot drained, record current shot data" m_reprocessingFrameCnt was taken from previous fragment and not replaced in the new context with shot_ext->shot.ctl.request.frameCount. This resulted in CTS:android.hardware.cts.CameraTest@testJpegExif failures. Bug: 18958123 Change-Id: I3e55fe5be64e2fbc15e14c34891b26afbdb52640
2015-01-07am 29a60df6: exynos_omx: check pointer before use to workaround potential crash.Ronghua Wu
* commit '29a60df69e0caa0800bc7cf848b00b719019bb6c': exynos_omx: check pointer before use to workaround potential crash.
2015-01-06am 66efbe79: Merge "Suppress or fix clang errors before the fix from upstream."Chih-Hung Hsieh
* commit '66efbe79457a52ffcef470089a35ac39514759f5': Suppress or fix clang errors before the fix from upstream.
2015-01-06Merge "Suppress or fix clang errors before the fix from upstream."Chih-Hung Hsieh
2015-01-06Suppress or fix clang errors before the fix from upstream.Chih-Hung Hsieh
* Make Exynos_UpdateFrameSize global to link with other modules. * Suppress warnings about int conversion, pointer conversion, implicit function declaration, sign/unsign comparison, and c++11-narrowing. Change-Id: I462902cbc0d1c3442d59a6741c66d8a870a99e8c
2014-12-30am 35575718: Merge "Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: ↵Elliott Hughes
error: \'errno\' undeclared"." * commit '35575718dd13c61263b5b1d090cc747b16e160d9': Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: error: 'errno' undeclared".
2014-12-29Merge "Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: error: ↵Elliott Hughes
'errno' undeclared"."
2014-12-29Fix "hardware/samsung_slsi/exynos5/libcsc/csc.c:341:67: error: 'errno' ↵Elliott Hughes
undeclared". Change-Id: Ic5982302a0dd0a88bac7aaf30128a84b2c1cd95c
2014-12-19exynos_omx: check pointer before use to workaround potential crash.Ronghua Wu
Bug: 18639414 Change-Id: Ia603736d4c81488cc9772ce0cf7b253f2932a2b4
2014-12-16am 6e324cc3: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
* commit '6e324cc3a987b3aee665a5ec32993018d84479d4': Cleanup Obsolete LOCAL_PRELINK_MODULE.
2014-12-16Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."Ying Wang
2014-12-16Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang
Bug: 18675947 Change-Id: Id460accbd37f1cbdf84c94510064ac4ac261f77e
2014-12-09am 31346bb9: Merge "Fix a build break due to a change in libui"Dan Stoza
* commit '31346bb9622e96aa6b93838b2f8b144360503098': Fix a build break due to a change in libui
2014-12-08Merge "Fix a build break due to a change in libui"android-wear-5.0.0_r1lollipop-wear-releaseDan Stoza
2014-12-08Fix a build break due to a change in libuiDan Stoza
The Rect constructor became ambiguous because of the addition of a new overload. This resolves the ambiguity to fix the build, but the dependency on libui should be removed altogether. Bug: 18668702 Change-Id: I923fcf793790776cd067933292ec8c8050f27d1c
2014-12-02am d6d94475: manta: libcamera2: if captured shot drained, record current ↵Mark Salyzyn
shot data * commit 'd6d94475d878944562d0f1e16a5b6508fce87e3e': manta: libcamera2: if captured shot drained, record current shot data
2014-12-02manta: libcamera2: if captured shot drained, record current shot dataMark Salyzyn
Bug: 18523848 Change-Id: Ia394570f1ce22997cf8ba13c4f4165cdf2549402
2014-11-25am 2be288ff: Merge "Fix build after C++11 migration."Dan Albert
* commit '2be288ff70a54d330c12496958a42b6d9e52b51e': Fix build after C++11 migration.
2014-11-25Merge "Fix build after C++11 migration."Dan Albert
2014-11-25Fix build after C++11 migration.Dan Albert
More UD literal issues. `using namespace std` should be illegal. Change-Id: If408f360e28acf9159705b9b724c7c083391ff71
2014-11-20am 492a2506: manta: libcamera2: drain requests on empty request queueMark Salyzyn
* commit '492a2506b49ab9dfd574ab354ef6edcfd7ba6a68': manta: libcamera2: drain requests on empty request queue
2014-11-19manta: libcamera2: drain requests on empty request queueMark Salyzyn
Bug: 18118823 Bug: 17771002 Bug: 17660746 Bug: 13921808 Bug: 13358648 Bug: 13299991 Change-Id: Ib81b7d8b76470eebcd434a20b46d6235f5381f8b
2014-11-17am cc270654: Merge "Stop using stlport."Dan Albert
* commit 'cc2706542fc0fb3b54c40e173e9d08d042571660': Stop using stlport.
2014-11-17Merge "Stop using stlport."Dan Albert
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-22 12:48:59 +0000