diff options
author | Sejun Park <sejun79.park@samsung.com> | 2015-10-13 15:53:39 +0900 |
---|---|---|
committer | Sejun Park <sejun79.park@samsung.com> | 2015-10-13 15:54:49 +0900 |
commit | 72bdbf7decb4639831c3c4914f275edda37741a1 (patch) | |
tree | effbbe0a98a011c60e77bc56ada4c17ac6ada705 | |
parent | 32a0ef070fe4e2b6c9065c0d65b96685826fcadd (diff) | |
download | libomxil-e54xx-72bdbf7decb4639831c3c4914f275edda37741a1.tar.gz libomxil-e54xx-72bdbf7decb4639831c3c4914f275edda37741a1.tar.bz2 libomxil-e54xx-72bdbf7decb4639831c3c4914f275edda37741a1.zip |
Fixed build break on 64bitsubmit/tizen/20151019.111418submit/tizen/20151013.090304
Change-Id: I1bd7540831b71251c62032a0f31239ae6a233e20
-rwxr-xr-x | configure.ac | 11 | ||||
-rwxr-xr-x | exynos4/libswconverter/Makefile.am | 18 | ||||
-rwxr-xr-x | omxil-e54xx.pc.in | 3 | ||||
-rwxr-xr-x | openmax/component/audio/dec/mp3/Makefile.am | 2 | ||||
-rwxr-xr-x | openmax/component/video/dec/h264/Exynos_OMX_H264dec.h | 3 | ||||
-rwxr-xr-x | openmax/component/video/dec/h264/Makefile.am | 2 | ||||
-rwxr-xr-x | openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h | 2 | ||||
-rwxr-xr-x | openmax/component/video/dec/mpeg2/Makefile.am | 2 | ||||
-rwxr-xr-x | openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h | 2 | ||||
-rwxr-xr-x | openmax/component/video/dec/mpeg4/Makefile.am | 2 | ||||
-rwxr-xr-x | openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h | 3 | ||||
-rwxr-xr-x | openmax/component/video/dec/vc1/Makefile.am | 2 | ||||
-rwxr-xr-x | openmax/component/video/enc/h264/Makefile.am | 2 | ||||
-rwxr-xr-x | openmax/component/video/enc/mpeg4/Makefile.am | 2 | ||||
-rwxr-xr-x | packaging/libomxil-e54xx.spec | 17 | ||||
-rwxr-xr-x | srp.pc.in | 2 |
16 files changed, 53 insertions, 22 deletions
diff --git a/configure.ac b/configure.ac index 79a65ff..4550422 100755 --- a/configure.ac +++ b/configure.ac @@ -185,4 +185,15 @@ AC_ARG_ENABLE(drm, AC_HELP_STRING([--enable-use-drm], [use drm]), [BOARD_USE_DRM=no]) AM_CONDITIONAL([BOARD_USE_DRM], [test "x$BOARD_USE_DRM" = "xyes"]) +AC_ARG_ENABLE(neon, AC_HELP_STRING([--enable-neon], [neon]), + [ + case "${enableval}" in + yes) BOARD_USE_NEON=yes ;; + no) BOARD_USE_NEON=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --enable-neon) ;; + esac + ], + [BOARD_USE_NEON=no]) +AM_CONDITIONAL([BOARD_USE_NEON], [test "x$BOARD_USE_NEON" = "xyes"]) + AC_OUTPUT diff --git a/exynos4/libswconverter/Makefile.am b/exynos4/libswconverter/Makefile.am index c3f44e5..a2fab45 100755 --- a/exynos4/libswconverter/Makefile.am +++ b/exynos4/libswconverter/Makefile.am @@ -1,16 +1,18 @@ lib_LTLIBRARIES = libswconverter.la -libswconverter_la_SOURCES = swconvertor.c \ - csc_ARGB8888_to_YUV420SP_NEON.s \ - csc_interleave_memcpy_neon.s \ - csc_linear_to_tiled_crop_neon.s \ - csc_linear_to_tiled_interleave_crop_neon.s \ - csc_tiled_to_linear_crop_neon.s \ - csc_tiled_to_linear_deinterleave_crop_neon.s - +libswconverter_la_SOURCES = swconvertor.c libswconverter_la_LIBADD = libswconverter_la_CFLAGS = -I$(top_srcdir)/exynos4/include \ -I$(top_srcdir)/exynos/include +if BOARD_USE_NEON +libswconverter_la_SOURCES += csc_ARGB8888_to_YUV420SP_NEON.s \ + csc_interleave_memcpy_neon.s \ + csc_linear_to_tiled_crop_neon.s \ + csc_linear_to_tiled_interleave_crop_neon.s \ + csc_tiled_to_linear_crop_neon.s \ + csc_tiled_to_linear_deinterleave_crop_neon.s +libswconverter_la_CFLAGS += -DUSE_NEON +endif diff --git a/omxil-e54xx.pc.in b/omxil-e54xx.pc.in index faf96b8..1c7efb4 100755 --- a/omxil-e54xx.pc.in +++ b/omxil-e54xx.pc.in @@ -1,6 +1,7 @@ prefix=@prefix@ -libdir=@prefix@/lib +libdir=@LIB_INSTALL_DIR@ includedir=@prefix@/include +omxdir=@libdir@ Name: Samsung OpenMAX IL package Description: Samsung E4X12 codec diff --git a/openmax/component/audio/dec/mp3/Makefile.am b/openmax/component/audio/dec/mp3/Makefile.am index eaff551..23453a4 100755 --- a/openmax/component/audio/dec/mp3/Makefile.am +++ b/openmax/component/audio/dec/mp3/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.MP3.Decoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_MP3_Decoder_la_SOURCES = Exynos_OMX_Mp3dec.c \ Exynos_OMX_Mp3dec.h \ diff --git a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h index 9b039f2..7f36d71 100755 --- a/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h +++ b/openmax/component/video/dec/h264/Exynos_OMX_H264dec.h @@ -74,6 +74,9 @@ extern "C" { OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit(OMX_HANDLETYPE hComponent, OMX_STRING componentName); OMX_ERRORTYPE Exynos_OMX_ComponentDeinit(OMX_HANDLETYPE hComponent); +OMX_ERRORTYPE H264CodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent); +OMX_ERRORTYPE H264CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent); + #ifdef __cplusplus }; #endif diff --git a/openmax/component/video/dec/h264/Makefile.am b/openmax/component/video/dec/h264/Makefile.am index 538ecb2..1b27150 100755 --- a/openmax/component/video/dec/h264/Makefile.am +++ b/openmax/component/video/dec/h264/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.AVC.Decoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_AVC_Decoder_la_SOURCES = Exynos_OMX_H264dec.c \ Exynos_OMX_H264dec.h \ diff --git a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h index 7430754..c9b4b9a 100755 --- a/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h +++ b/openmax/component/video/dec/mpeg2/Exynos_OMX_Mpeg2dec.h @@ -75,6 +75,8 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit( OMX_ERRORTYPE Exynos_OMX_ComponentDeinit( OMX_HANDLETYPE hComponent); +OMX_ERRORTYPE Mpeg2CodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent); +OMX_ERRORTYPE Mpeg2CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent); #ifdef __cplusplus }; #endif diff --git a/openmax/component/video/dec/mpeg2/Makefile.am b/openmax/component/video/dec/mpeg2/Makefile.am index 14b59b7..1316b11 100755 --- a/openmax/component/video/dec/mpeg2/Makefile.am +++ b/openmax/component/video/dec/mpeg2/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.M2V.Decoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_M2V_Decoder_la_SOURCES = Exynos_OMX_Mpeg2dec.c \ Exynos_OMX_Mpeg2dec.h \ diff --git a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h index a1b0706..3740733 100755 --- a/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h +++ b/openmax/component/video/dec/mpeg4/Exynos_OMX_Mpeg4dec.h @@ -107,6 +107,8 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit( OMX_ERRORTYPE Exynos_OMX_ComponentDeinit( OMX_HANDLETYPE hComponent); +OMX_ERRORTYPE Mpeg4CodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent); +OMX_ERRORTYPE Mpeg4CodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent); #ifdef __cplusplus }; #endif diff --git a/openmax/component/video/dec/mpeg4/Makefile.am b/openmax/component/video/dec/mpeg4/Makefile.am index 4eeee83..de95dff 100755 --- a/openmax/component/video/dec/mpeg4/Makefile.am +++ b/openmax/component/video/dec/mpeg4/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.M4V.Decoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_M4V_Decoder_la_SOURCES = Exynos_OMX_Mpeg4dec.c \ Exynos_OMX_Mpeg4dec.h \ diff --git a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h index d944208..f614c83 100755 --- a/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h +++ b/openmax/component/video/dec/vc1/Exynos_OMX_Wmvdec.h @@ -112,6 +112,9 @@ OSCL_EXPORT_REF OMX_ERRORTYPE Exynos_OMX_ComponentInit( OMX_ERRORTYPE Exynos_OMX_ComponentDeinit( OMX_HANDLETYPE hComponent); +OMX_ERRORTYPE WmvCodecSrcInit(OMX_COMPONENTTYPE *pOMXComponent); +OMX_ERRORTYPE WmvCodecDstSetup(OMX_COMPONENTTYPE *pOMXComponent); +OMX_ERRORTYPE WmvCodecCheckResolutionChange(OMX_COMPONENTTYPE *pOMXComponent); #ifdef __cplusplus }; #endif diff --git a/openmax/component/video/dec/vc1/Makefile.am b/openmax/component/video/dec/vc1/Makefile.am index d3636bc..abb2fb5 100755 --- a/openmax/component/video/dec/vc1/Makefile.am +++ b/openmax/component/video/dec/vc1/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.WMV.Decoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_WMV_Decoder_la_SOURCES = Exynos_OMX_Wmvdec.c \ Exynos_OMX_Wmvdec.h \ diff --git a/openmax/component/video/enc/h264/Makefile.am b/openmax/component/video/enc/h264/Makefile.am index a59e5ff..494c384 100755 --- a/openmax/component/video/enc/h264/Makefile.am +++ b/openmax/component/video/enc/h264/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.AVC.Encoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_AVC_Encoder_la_SOURCES = Exynos_OMX_H264enc.c \ Exynos_OMX_H264enc.h \ diff --git a/openmax/component/video/enc/mpeg4/Makefile.am b/openmax/component/video/enc/mpeg4/Makefile.am index dda1a4f..9e46125 100755 --- a/openmax/component/video/enc/mpeg4/Makefile.am +++ b/openmax/component/video/enc/mpeg4/Makefile.am @@ -1,5 +1,5 @@ lib_LTLIBRARIES = libOMX.Exynos.M4V.Encoder.la -libdir = @prefix@/lib/omx +libdir = @libdir@/omx libOMX_Exynos_M4V_Encoder_la_SOURCES = Exynos_OMX_Mpeg4enc.c \ Exynos_OMX_Mpeg4enc.h \ diff --git a/packaging/libomxil-e54xx.spec b/packaging/libomxil-e54xx.spec index b31db7d..1cb5344 100755 --- a/packaging/libomxil-e54xx.spec +++ b/packaging/libomxil-e54xx.spec @@ -28,7 +28,10 @@ development package for libomxil-e54xx-v4l2 %build ./autogen.sh -export CFLAGS+=" -mfpu=neon\ +export CFLAGS+="\ +%ifnarch aarch64 + -mfpu=neon\ +%endif -DUSE_PB\ -DUSE_DMA_BUF\ -DUSE_H264_PREPEND_SPS_PPS\ @@ -36,7 +39,11 @@ export CFLAGS+=" -mfpu=neon\ -DKERNEL_HEADER_MODIFICATION" -%configure --prefix=%{_prefix} --disable-static --enable-dlog +%ifnarch aarch64 +%configure --prefix=%{_prefix} --disable-static --enable-dlog --enable-neon +%else +%configure --prefix=%{_prefix} --disable-static --enable-dlog --disable-neon +%endif #make %{?jobs:-j%jobs} make @@ -54,11 +61,11 @@ rm -rf %{buildroot} %files %manifest libomxil-e54xx.manifest -/usr/lib/*.so* -/usr/lib/omx/*.so +%{_libdir}/*.so* +%{_libdir}/omx/*.so %files devel /usr/include/* -/usr/lib/pkgconfig/* +%{_libdir}/pkgconfig/* @@ -1,5 +1,5 @@ prefix=@prefix@ -libdir=@prefix@/lib +libdir=@LIB_INSTALL_DIR@ includedir=@prefix@/include Name: Samsung RP package |