From: Sejun Park Date: Fri, 18 Dec 2015 07:46:07 +0000 (+0900) Subject: Removed libprivilege-control X-Git-Tag: submit/tizen/20151221.082959~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31e50316e481a5e38586ec9c2925dc1df85022fd;p=platform%2Fcore%2Fapi%2Fmediacodec.git Removed libprivilege-control Change-Id: I679c41f7c27fde8d1fcfa4c3a00bb1c64327bd4b --- diff --git a/packaging/capi-media-codec.spec b/packaging/capi-media-codec.spec index 4aa6db3..688e5f4 100755 --- a/packaging/capi-media-codec.spec +++ b/packaging/capi-media-codec.spec @@ -1,7 +1,7 @@ Name: capi-media-codec Summary: A Media Codec library in Tizen Native API Version: 0.4.0 -Release: 1 +Release: 2 Group: Multimedia/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz @@ -18,14 +18,11 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(gstreamer-app-1.0) BuildRequires: pkgconfig(capi-system-info) BuildRequires: pkgconfig(iniparser) -%if "%{tizen_target_name}" == "Z130H" || "%{?tizen_target_name}" == "Z300H" +%if "%{tizen_target_name}" == "TM1" #!BuildIgnore: kernel-headers BuildConflicts: linux-glibc-devel BuildRequires: kernel-headers-tizen-dev %endif -Requires(post): /sbin/ldconfig -Requires(post): libprivilege-control -Requires(postun): /sbin/ldconfig %description @@ -42,7 +39,7 @@ Requires: %{name} = %{version}-%{release} %build -%if "%{tizen_target_name}" == "Z130H" || "%{?tizen_target_name}" == "Z300H" +%if "%{tizen_target_name}" == "TM1" export CFLAGS="$CFLAGS -DTIZEN_PROFILE_LITE" %endif %if 0%{?sec_build_binary_debug_enable} diff --git a/src/media_codec_port_gst.c b/src/media_codec_port_gst.c index 81a676d..4058509 100755 --- a/src/media_codec_port_gst.c +++ b/src/media_codec_port_gst.c @@ -91,36 +91,57 @@ int(*venc_vtable[])() = {&__mc_fill_inbuf_with_packet, &__mc_fill_venc_packet_wi int(*vdec_h264_sw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* FFMPEG H.264 Decoder Vtable */ &__mc_fill_vdec_packet_with_outbuf, &__mc_vdec_caps}; +int(*vdec_mpeg4_sw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* FFMPEG MPEG4 Decoder Vtable */ + &__mc_fill_vdec_packet_with_outbuf, + &__mc_vdec_mpeg4_caps}; +int(*venc_mpeg4_sw_vtable[])() = {&__mc_fill_inbuf_with_venc_packet, /* SPRD MPEG4 Encoder Vtable */ + &__mc_fill_venc_packet_with_outbuf, + &__mc_venc_caps}; +int(*vdec_h263_sw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* FFMPEG MPEG4 Decoder Vtable */ + &__mc_fill_vdec_packet_with_outbuf, + &__mc_vdec_h263_caps}; +int(*venc_h263_sw_vtable[])() = {&__mc_fill_inbuf_with_venc_packet, /* SPRD MPEG4 Encoder Vtable */ + &__mc_fill_venc_packet_with_outbuf, + &__mc_venc_caps}; +#ifdef TIZEN_PROFILE_LITE int(*vdec_h264_hw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* SPRD H.264 Decoder Vtable */ &__mc_fill_video_packet_with_mm_video_buffer, - &__mc_h264dec_caps}; + &__mc_sprddec_caps}; int(*venc_h264_hw_vtable[])() = {&__mc_fill_inbuf_with_mm_video_buffer, /* SPRD H.264 Encoder Vtable */ &__mc_fill_venc_packet_with_outbuf, - &__mc_hw_h264enc_caps}; -int(*vdec_mpeg4_sw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* FFMPEG MPEG4 Decoder Vtable */ - &__mc_fill_vdec_packet_with_outbuf, - &__mc_vdec_mpeg4_caps}; + &__mc_sprdenc_caps}; int(*vdec_mpeg4_hw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* SPRD MPEG4 Decoder Vtable */ &__mc_fill_video_packet_with_mm_video_buffer, &__mc_sprddec_mpeg4_caps}; -int(*venc_mpeg4_sw_vtable[])() = {&__mc_fill_inbuf_with_venc_packet, /* SPRD MPEG4 Encoder Vtable */ - &__mc_fill_venc_packet_with_outbuf, - &__mc_venc_caps}; int(*venc_mpeg4_hw_vtable[])() = {&__mc_fill_inbuf_with_mm_video_buffer, /* SPRD MPEG4 Encoder Vtable */ &__mc_fill_venc_packet_with_outbuf, &__mc_sprdenc_mpeg4_caps}; -int(*vdec_h263_sw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* FFMPEG MPEG4 Decoder Vtable */ - &__mc_fill_vdec_packet_with_outbuf, - &__mc_vdec_h263_caps}; int(*vdec_h263_hw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* SPRD MPEG4 Decoder Vtable */ &__mc_fill_video_packet_with_mm_video_buffer, &__mc_sprddec_mpeg4_caps}; -int(*venc_h263_sw_vtable[])() = {&__mc_fill_inbuf_with_venc_packet, /* SPRD MPEG4 Encoder Vtable */ - &__mc_fill_venc_packet_with_outbuf, - &__mc_venc_caps}; int(*venc_h263_hw_vtable[])() = {&__mc_fill_inbuf_with_mm_video_buffer, /* SPRD MPEG4 Encoder Vtable */ &__mc_fill_venc_packet_with_outbuf, &__mc_sprdenc_mpeg4_caps}; +#else +int(*vdec_h264_hw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* EXYNOS H.264 Decoder Vtable */ + &__mc_fill_video_packet_with_mm_video_buffer, + &__mc_h264dec_caps}; +int(*venc_h264_hw_vtable[])() = {&__mc_fill_inbuf_with_mm_video_buffer, /* EXYNOS H.264 Encoder Vtable */ + &__mc_fill_venc_packet_with_outbuf, + &__mc_hw_h264enc_caps}; +int(*vdec_mpeg4_hw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* EXYNOS MPEG4 Decoder Vtable */ + &__mc_fill_video_packet_with_mm_video_buffer, + &__mc_sprddec_mpeg4_caps}; +int(*venc_mpeg4_hw_vtable[])() = {&__mc_fill_inbuf_with_mm_video_buffer, /* EXYNOS MPEG4 Encoder Vtable */ + &__mc_fill_venc_packet_with_outbuf, + &__mc_sprdenc_mpeg4_caps}; +int(*vdec_h263_hw_vtable[])() = {&__mc_fill_inbuf_with_packet, /* EXYNOS MPEG4 Decoder Vtable */ + &__mc_fill_video_packet_with_mm_video_buffer, + &__mc_sprddec_mpeg4_caps}; +int(*venc_h263_hw_vtable[])() = {&__mc_fill_inbuf_with_mm_video_buffer, /* EXYNOS MPEG4 Encoder Vtable */ + &__mc_fill_venc_packet_with_outbuf, + &__mc_sprdenc_mpeg4_caps}; +#endif /* audio vtable */ int(*aenc_vtable[])() = {&__mc_fill_inbuf_with_packet, &__mc_fill_packet_with_outbuf, &__mc_aenc_caps}; @@ -2605,7 +2626,7 @@ static MMVideoBuffer *__mc_gst_make_tbm_buffer(mc_gst_core_t* core, media_packet #ifdef TIZEN_PROFILE_LITE int phy_addr = 0; int phy_size = 0; - tbm_bo_handle handle_fd = tbm_bo_get_handle(bo, TBM_DEVICE_MM); + tbm_bo_handle handle_fd = tbm_bo_get_handle(mm_vbuffer->handle.bo[0], TBM_DEVICE_MM); if (__tbm_get_physical_addr_bo(handle_fd, &phy_addr, &phy_size) == 0) { mm_vbuffer->handle.paddr[0] = (void *)phy_addr;