diff options
author | Sejun Park <sejun79.park@samsung.com> | 2017-09-12 19:08:13 +0900 |
---|---|---|
committer | Sejun Park <sejun79.park@samsung.com> | 2017-09-14 14:48:50 +0900 |
commit | d68c9f290e5bab4a5844cf3179089b1b29ce5c0f (patch) | |
tree | 8ac6dcbb9de2c86804f9ad6156bea3700b1cdae4 | |
parent | ea5f84c335e133f9756135262db585a6a3451ff9 (diff) | |
download | libomxil-e7270-v4l2-d68c9f290e5bab4a5844cf3179089b1b29ce5c0f.tar.gz libomxil-e7270-v4l2-d68c9f290e5bab4a5844cf3179089b1b29ce5c0f.tar.bz2 libomxil-e7270-v4l2-d68c9f290e5bab4a5844cf3179089b1b29ce5c0f.zip |
Remove build warningssubmit/tizen/20170914.095319accepted/tizen/unified/20170915.191013
Change-Id: Icb6d5af3c42e1361afebcfe9e504df46d9697ff1
-rwxr-xr-x | exynos/libion/kernel-headers/linux/ion.h | 16 | ||||
-rwxr-xr-x | exynos/libvideocodec/Makefile.am | 1 | ||||
-rwxr-xr-x | exynos/libvideocodec/dec/ExynosVideoDecoder.c | 1 | ||||
-rwxr-xr-x | exynos/libvideocodec/enc/ExynosVideoEncoder.c | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | openmax/component/video/dec/h264/Exynos_OMX_H264dec.c | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | openmax/component/video/dec/h264/library_register.c | 0 | ||||
-rwxr-xr-x | openmax/osal/Exynos_OSAL_Log.c | 1 | ||||
-rwxr-xr-x | openmax/osal/Exynos_OSAL_SharedMemory.c | 2 | ||||
-rwxr-xr-x | openmax/osal/Makefile.am | 1 | ||||
-rwxr-xr-x | packaging/libomxil-e7270-v4l2.spec | 2 |
10 files changed, 23 insertions, 2 deletions
diff --git a/exynos/libion/kernel-headers/linux/ion.h b/exynos/libion/kernel-headers/linux/ion.h index bb145d1..fa0fe9f 100755 --- a/exynos/libion/kernel-headers/linux/ion.h +++ b/exynos/libion/kernel-headers/linux/ion.h @@ -102,5 +102,21 @@ struct ion_preload_data { #define ION_IOC_PRELOAD_ALLOC _IOW(ION_IOC_MAGIC, 8, struct ion_preload_data) /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ #define ION_IOC_CUSTOM _IOWR(ION_IOC_MAGIC, 6, struct ion_custom_data) + +struct ion_handle; + +int ion_open(); +int ion_close(int fd); +int ion_alloc(int fd, size_t len, size_t align, unsigned int heap_mask, + unsigned int flags, ion_user_handle_t *handle); +int ion_alloc_fd(int fd, size_t len, size_t align, unsigned int heap_mask, + unsigned int flags, int *handle_fd); +int ion_sync_fd(int fd, int handle_fd); +int ion_sync_fd_partial(int fd, int handle_fd, off_t offset, size_t len); +int ion_free(int fd, ion_user_handle_t handle); +int ion_map(int fd, ion_user_handle_t handle, size_t length, int prot, + int flags, off_t offset, unsigned char **ptr, int *map_fd); +int ion_share(int fd, ion_user_handle_t handle, int *share_fd); +int ion_import(int fd, int share_fd, ion_user_handle_t *handle); #endif /* WARNING: DO NOT EDIT, AUTO-GENERATED CODE - SEE TOP FOR INSTRUCTIONS */ diff --git a/exynos/libvideocodec/Makefile.am b/exynos/libvideocodec/Makefile.am index 41c658b..8dc3d6f 100755 --- a/exynos/libvideocodec/Makefile.am +++ b/exynos/libvideocodec/Makefile.am @@ -12,6 +12,7 @@ libExynosVideoApi_la_CFLAGS = -I$(CURDIR)/include \ -I$(CURDIR)/mfc_headers \ -I$(top_srcdir)/openmax/include/khronos \ -I$(top_srcdir)/openmax/osal \ + -I$(top_srcdir)/exynos/libion/kernel-headers/linux \ $(EXYNOSCOMMON_CFLAGS) libExynosVideoApi_la_CFLAGS += -DCID_SUPPORT -DUSE_DEFINE_H264_SEI_TYPE -DUSE_MFC_MEDIA -DUSE_ORIGINAL_HEADER \ diff --git a/exynos/libvideocodec/dec/ExynosVideoDecoder.c b/exynos/libvideocodec/dec/ExynosVideoDecoder.c index 55a22ad..d7931fa 100755 --- a/exynos/libvideocodec/dec/ExynosVideoDecoder.c +++ b/exynos/libvideocodec/dec/ExynosVideoDecoder.c @@ -45,6 +45,7 @@ #include "ExynosVideoDec.h" #include "ExynosVideo_OSAL_Dec.h" #include "OMX_Core.h" +#include "ion.h" /* #define LOG_NDEBUG 0 */ #ifdef LOG_TAG diff --git a/exynos/libvideocodec/enc/ExynosVideoEncoder.c b/exynos/libvideocodec/enc/ExynosVideoEncoder.c index 63d1a89..9d73ffe 100755 --- a/exynos/libvideocodec/enc/ExynosVideoEncoder.c +++ b/exynos/libvideocodec/enc/ExynosVideoEncoder.c @@ -45,6 +45,7 @@ #include "ExynosVideoEnc.h" #include "ExynosVideo_OSAL_Enc.h" #include "OMX_Core.h" +#include "ion.h" /* #define LOG_NDEBUG 0 */ #ifdef LOG_TAG diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c index fc40001..fc40001 100755..100644 --- a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c +++ b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.c diff --git a/openmax/component/video/dec/h264/library_register.c b/openmax/component/video/dec/h264/library_register.c index b3c77f9..b3c77f9 100755..100644 --- a/openmax/component/video/dec/h264/library_register.c +++ b/openmax/component/video/dec/h264/library_register.c diff --git a/openmax/osal/Exynos_OSAL_Log.c b/openmax/osal/Exynos_OSAL_Log.c index 04fc7a1..24ef4e1 100755 --- a/openmax/osal/Exynos_OSAL_Log.c +++ b/openmax/osal/Exynos_OSAL_Log.c @@ -33,6 +33,7 @@ #include "Exynos_OSAL_Log.h" #include "Exynos_OSAL_ETC.h" +#include "Exynos_OSAL_Memory.h" #ifdef USE_DLOG #include <dlog.h> diff --git a/openmax/osal/Exynos_OSAL_SharedMemory.c b/openmax/osal/Exynos_OSAL_SharedMemory.c index 21e83e1..a7b766e 100755 --- a/openmax/osal/Exynos_OSAL_SharedMemory.c +++ b/openmax/osal/Exynos_OSAL_SharedMemory.c @@ -38,7 +38,7 @@ #include <fcntl.h> #include <sys/mman.h> -#include <../libion/kernel-headers/linux/ion.h> +#include "ion.h" #include "exynos_ion.h" #include "Exynos_OSAL_Mutex.h" diff --git a/openmax/osal/Makefile.am b/openmax/osal/Makefile.am index 47aac5b..2dcd154 100755 --- a/openmax/osal/Makefile.am +++ b/openmax/osal/Makefile.am @@ -19,6 +19,7 @@ libExynosOMX_OSAL_la_CFLAGS = -I$(top_srcdir)/openmax/include/khronos \ -I$(top_srcdir)/openmax/core \ -I$(top_srcdir)/openmax/osal \ -I$(top_srcdir)/openmax/component/common \ + -I$(top_srcdir)/exynos/libion/kernel-headers/linux \ -I$(top_srcdir)/exynos/libvideocodec/include libExynosOMX_OSAL_la_CFLAGS += -DUSE_KHRONOS_OMX_HEADER -DUSE_DMA_BUF -DUSE_METADATABUFFERTYPE -DUSE_STOREMETADATA libExynosOMX_OSAL_la_CFLAGS += -Wno-unused-label diff --git a/packaging/libomxil-e7270-v4l2.spec b/packaging/libomxil-e7270-v4l2.spec index b0a2bb4..e513bed 100755 --- a/packaging/libomxil-e7270-v4l2.spec +++ b/packaging/libomxil-e7270-v4l2.spec @@ -3,7 +3,7 @@ Summary: OpenMAX IL for e7270-v4l2 Version: 0.0.1 License: Apache-2.0 Group: Development/Libraries -Release: 0 +Release: 1 ExclusiveArch: %arm Source: %{name}-%{version}.tar.gz Requires(post): /sbin/ldconfig |