diff options
| author | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-05-20 12:00:36 +0200 |
|---|---|---|
| committer | codeworkx <daniel.hillenbrand@codeworkx.de> | 2012-05-20 12:00:36 +0200 |
| commit | 62f02ba4f4b7b561aa15408ebd9951600bdd71aa (patch) | |
| tree | ac05dc645945a58edbc26e96df1a78ac16f27706 /exynos4/hal/libhwconverter | |
| parent | e54debb12ecdf92d12acab00a261c0c5a6ef1d64 (diff) | |
| download | hardware_samsung-62f02ba4f4b7b561aa15408ebd9951600bdd71aa.zip hardware_samsung-62f02ba4f4b7b561aa15408ebd9951600bdd71aa.tar.gz hardware_samsung-62f02ba4f4b7b561aa15408ebd9951600bdd71aa.tar.bz2 | |
exynos: reorganized and updated from insignal
Changes needed on exynos4210 devices:
libcsc -> libseccscapi
libswconverter -> remove
TARGET_HAL_PATH := hardware/samsung/exynos4/hal
TARGET_OMX_PATH := hardware/samsung/exynos/multimedia/openmax
$(call inherit-product, hardware/samsung/exynos4210.mk)
Change-Id: Ic59ef95b85ef37b3f38fb36cf6a364a5414685ee
Diffstat (limited to 'exynos4/hal/libhwconverter')
| -rw-r--r-- | exynos4/hal/libhwconverter/Android.mk | 11 | ||||
| -rw-r--r-- | exynos4/hal/libhwconverter/HardwareConverter.cpp | 3 |
2 files changed, 9 insertions, 5 deletions
diff --git a/exynos4/hal/libhwconverter/Android.mk b/exynos4/hal/libhwconverter/Android.mk index ecda03b..c1ded53 100644 --- a/exynos4/hal/libhwconverter/Android.mk +++ b/exynos4/hal/libhwconverter/Android.mk @@ -12,6 +12,8 @@ # See the License for the specific language governing permissions and # limitations under the License. +ifeq ($(filter-out exynos4,$(TARGET_BOARD_PLATFORM)),) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -21,10 +23,13 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libcutils libfimc LOCAL_SRC_FILES := HardwareConverter.cpp LOCAL_C_INCLUDES := \ - $(TOP)/$(BOARD_HAL_PATH)/include \ - $(TOP)/$(BOARD_HMM_PATH)/openmax/sec_omx/include/khronos \ - $(TOP)/$(BOARD_HMM_PATH)/openmax/sec_omx/include/sec + $(LOCAL_PATH)/../include \ + $(TOP)/$(TARGET_HAL_PATH)/include \ + $(TOP)/$(TARGET_OMX_PATH)/include/khronos \ + $(TOP)/$(TARGET_OMX_PATH)/include/sec LOCAL_MODULE_TAGS := eng LOCAL_MODULE := libhwconverter include $(BUILD_SHARED_LIBRARY) + +endif diff --git a/exynos4/hal/libhwconverter/HardwareConverter.cpp b/exynos4/hal/libhwconverter/HardwareConverter.cpp index 3a66767..9ff6e55 100644 --- a/exynos4/hal/libhwconverter/HardwareConverter.cpp +++ b/exynos4/hal/libhwconverter/HardwareConverter.cpp @@ -15,7 +15,6 @@ */ #include <utils/Log.h> - #include "SEC_OMX_Def.h" #include "SecFimc.h" #include "HardwareConverter.h" @@ -25,7 +24,7 @@ HardwareConverter::HardwareConverter() SecFimc* handle_fimc = new SecFimc(); mSecFimc = (void *)handle_fimc; - if (handle_fimc->create(SecFimc::DEV_2, SecFimc::MODE_MULTI_BUF, 1) == false) + if (handle_fimc->create(SecFimc::DEV_0, SecFimc::MODE_MULTI_BUF, 1) == false) bHWconvert_flag = 0; else bHWconvert_flag = 1; |