diff options
| author |   Roger Monk <r-monk@ti.com> | 2010-09-30 10:36:54 +0100 |
|---|---|---|
| committer |   Koen Kooi <koen@openembedded.org> | 2010-09-30 13:20:26 +0200 |
| commit | d552faedf572b16b4a935d4145801e3a088125be (patch) | |
| tree | e651d5b59d5dbb56f2803f6f9ac9b1234eed0a2b /recipes/ti | |
| parent | ff74b8dd67bea633e8eefd51144420215bef7ddf (diff) | |
| download | openembedded-d552faedf572b16b4a935d4145801e3a088125be.tar.gz | |
gstreamer-ti: sync with arago
Signed-off-by: Roger Monk <r-monk@ti.com>
Signed-off-by: Koen Kooi <k-kooi@ti.com>
Diffstat (limited to 'recipes/ti')
18 files changed, 74 insertions, 1932 deletions
diff --git a/recipes/ti/gstreamer-ti.inc b/recipes/ti/gstreamer-ti.inc index d21794228e..70b70d9b1e 100644 --- a/recipes/ti/gstreamer-ti.inc +++ b/recipes/ti/gstreamer-ti.inc @@ -15,10 +15,15 @@ require ti-paths.inc require ti-staging.inc # Rebuild on kernel change since it links statically to ti-dmai, ti-codec-engine, etc -PR = "r59+${MACHINE_KERNEL_PR}" +PR = "r72+${MACHINE_KERNEL_PR}" DEPENDS = "ti-dmai gstreamer gst-plugins-base" +# enable c6accel elements on omapl138 +DEPENDS_append_da850-omapl138-evm = " ti-c6accel " +EXTRA_OECONF_omapl138 = "--enable-c6accel" +export C6ACCEL_INSTALL_DIR + # gstreamer_ti picks up some config variables from the environment # - variables are used in the gstreamer makefile # - PLATFORM, XDC_PLATFORM, XDC_TARGET, MVTOOL_DIR @@ -61,6 +66,9 @@ export LINK_XDC_ROOT = "${LINK_INSTALL_DIR}" export CODEC_SERVER = "${installdir}/ti-codecs-server/cs.x64P" CPPFLAGS_append = " -DPlatform_${PLATFORM}" +# We are still using encode/decode combo for DM6446 +export ENCODE_COMBO = "${installdir}/ti-codecs-server/encodeCombo.x64P" +export DECODE_COMBO = "${installdir}/ti-codecs-server/decodeCombo.x64P" # Makefile also expects to be able to find the kernel headers from the envirionment export LINUXKERNEL_INSTALL_DIR = "${STAGING_KERNEL_DIR}" @@ -86,25 +94,14 @@ do_install_prepend () { cp -r ${WORKDIR}/gstreamer_ti/gstreamer_demo/${PLATFORM} ${D}/${installdir}/gst fi - # replace insmod with modprobe - sed -i 's/insmod/modprobe/g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - sed -i 's/.ko//g' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - - if [ "${PLATFORM}" = "omap3530" ]; then - echo "modprobe sdmak" >> ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - fi - - # FIXME: add depmod -a after #!/bin/sh - sed -i '/#!\/bin\/sh/a\depmod -a' ${D}/${installdir}/gst/${PLATFORM}/loadmodules.sh - # delete .svn files find ${D}/${installdir}/gst -name .svn -type d | xargs rm -rf chmod 0755 ${D}/${installdir}/gst -R install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/gstreamer-ti-rc.sh ${D}${sysconfdir}/init.d/gstti-init - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/gst-ti.sh ${D}${sysconfdir}/profile.d/ + + sed -i -e 's|\<platform\>|${PLATFORM}|g' ${D}${sysconfdir}/init.d/gstti-init } RRECOMMENDS_${PN}_append_dm6446 += "ti-codecs-dm6446-server ti-cmem-module ti-dsplink-module" @@ -125,7 +122,6 @@ pkg_postinst_${PN} () { fi } - INITSCRIPT_NAME = "gstti-init" INITSCRIPT_PARAMS = "start 30 5 2 . stop 40 0 1 6 ." diff --git a/recipes/ti/gstreamer-ti/0007-add-omapdmaifbsink.patch b/recipes/ti/gstreamer-ti/0001-add-omapdmaifbsink.patch index be6f899f0c..026a01ba52 100644 --- a/recipes/ti/gstreamer-ti/0007-add-omapdmaifbsink.patch +++ b/recipes/ti/gstreamer-ti/0001-add-omapdmaifbsink.patch @@ -1,25 +1,7 @@ -From 6bd18e8107d55a5900bb9b9efa40c9f099d16942 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 08:46:18 -0500 -Subject: [PATCH] add omapdmaifbsink - ---- - configure.ac | 1 + - src/Makefile.am | 8 +- - src/gstticodecplugin.c | 8 + - src/omapfb.c | 1005 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/omapfb.h | 142 +++++++ - src/yuv.S | 117 ++++++ - 6 files changed, 1277 insertions(+), 4 deletions(-) - create mode 100644 src/omapfb.c - create mode 100644 src/omapfb.h - create mode 100644 src/yuv.S - -diff --git a/configure.ac b/configure.ac -index 32f8304..c8f102c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,6 +25,7 @@ dnl make aclocal work in maintainer mode +diff -uNr ticodecplugin/configure.ac ticodecplugin.new/configure.ac +--- ticodecplugin/configure.ac 2010-08-24 15:08:58.609410984 -0500 ++++ ticodecplugin.new/configure.ac 2010-09-03 13:54:11.909410298 -0500 +@@ -25,6 +25,7 @@ AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") AM_CONFIG_HEADER(config.h) @@ -27,46 +9,20 @@ index 32f8304..c8f102c 100644 dnl check for tools AC_PROG_CC -diff --git a/src/Makefile.am b/src/Makefile.am -index 95973a8..acbad81 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -4,16 +4,16 @@ XDC_CONFIG_BASENAME = gstticodecplugin_$(GST_TI_PLATFORM) - plugin_LTLIBRARIES = libgstticodecplugin.la - - # sources used to compile this plug-in --libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c -+libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec.c gsttiauddec1.c gsttividdec.c gsttividdec2.c gsttiimgenc1.c gsttiimgenc.c gsttiimgdec1.c gsttiimgdec.c gsttidmaibuffertransport.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c omapfb.c yuv.S - - # flags used to compile this plugin - # add other _CFLAGS and _LIBS as needed --libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) --libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm -+libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) -I$(LINUXKERNEL_INSTALL_DIR)/include -+libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm -lX11 - libgstticodecplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,$(XDC_CONFIG_BASENAME)/linker.cmd - - # headers we need but don't want installed --noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h -+noinst_HEADERS = gsttiauddec.h gsttiauddec1.h gsttividdec.h gsttividdec2.h gsttiimgenc1.h gsttiimgenc.h gsttiimgdec1.h gsttiimgdec.h gsttidmaibuffertransport.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h omapfb.h - - # XDC Configuration - CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro -diff --git a/src/gstticodecplugin.c b/src/gstticodecplugin.c -index e98832d..8f8e938 100644 ---- a/src/gstticodecplugin.c -+++ b/src/gstticodecplugin.c -@@ -47,6 +47,7 @@ +diff -uNr ticodecplugin/src/gstticodecplugin.c ticodecplugin.new/src/gstticodecplugin.c +--- ticodecplugin/src/gstticodecplugin.c 2010-08-24 15:08:58.609410984 -0500 ++++ ticodecplugin.new/src/gstticodecplugin.c 2010-09-03 13:54:11.929409696 -0500 +@@ -42,6 +42,7 @@ #include "gsttiaudenc1.h" #include "gsttividresize.h" #include "gsttidmaiperf.h" +#include "omapfb.h" - /* entry point to initialize the plug-in - * initialize the plug-in itself -@@ -161,6 +162,13 @@ TICodecPlugin_init (GstPlugin * TICodecPlugin) - GST_TYPE_DMAIPERF)) + #ifdef HAVE_C6ACCEL + #include "gsttic6xcolorspace.h" +@@ -134,6 +135,13 @@ return FALSE; + #endif + env_value = getenv("GST_omapdmaifbsink_DISABLE"); + @@ -78,11 +34,33 @@ index e98832d..8f8e938 100644 return TRUE; } -diff --git a/src/omapfb.c b/src/omapfb.c -new file mode 100644 -index 0000000..0fb4eef ---- /dev/null -+++ b/src/omapfb.c +diff -uNr ticodecplugin/src/Makefile.am ticodecplugin.new/src/Makefile.am +--- ticodecplugin/src/Makefile.am 2010-08-24 22:01:30.989165985 -0500 ++++ ticodecplugin.new/src/Makefile.am 2010-09-03 13:53:41.037663172 -0500 +@@ -12,16 +12,16 @@ + + + # sources used to compile this plug-in +-libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec1.c gsttividdec2.c gsttiimgenc1.c gsttiimgdec1.c gsttidmaibuffertransport.c gsttidmaibuftab.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c $(C6ACCEL_SRC) ++libgstticodecplugin_la_SOURCES = gstticodecplugin.c gsttiauddec1.c gsttividdec2.c gsttiimgenc1.c gsttiimgdec1.c gsttidmaibuffertransport.c gsttidmaibuftab.c gstticircbuffer.c gsttidmaivideosink.c gstticodecs.c gstticodecs_platform.c gsttiquicktime_aac.c gsttiquicktime_h264.c gsttividenc1.c gsttiaudenc1.c gstticommonutils.c gsttividresize.c gsttidmaiperf.c gsttiquicktime_mpeg4.c $(C6ACCEL_SRC) omapfb.c yuv + + # flags used to compile this plugin + # add other _CFLAGS and _LIBS as needed +-libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) +-libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm ++libgstticodecplugin_la_CFLAGS = $(GST_CFLAGS) $(shell cat $(XDC_CONFIG_BASENAME)/compiler.opt) -I$(LINUXKERNEL_INSTALL_DIR)/include ++libgstticodecplugin_la_LIBADD = $(GST_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstvideo-0.10 -lgstaudio-0.10 -lm -lX11 + libgstticodecplugin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -Wl,$(XDC_CONFIG_BASENAME)/linker.cmd -Wl,$(C6ACCEL_LIB) + + # headers we need but don't want installed +-noinst_HEADERS = gsttiauddec1.h gsttividdec2.h gsttiimgenc1.h gsttiimgdec1.h gsttidmaibuffertransport.h gsttidmaibuftab.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h $(C6ACCEL_HEAD) ++noinst_HEADERS = gsttiauddec1.h gsttividdec2.h gsttiimgenc1.h gsttiimgdec1.h gsttidmaibuffertransport.h gsttidmaibuftab.h gstticircbuffer.h gsttidmaivideosink.h gsttithreadprops.h gstticodecs.h gsttiquicktime_aac.h gsttiquicktime_h264.h gsttividenc1.h gsttiaudenc1.h gstticommonutils.h gsttividresize.h gsttiquicktime_mpeg4.h $(C6ACCEL_HEAD) omapfb.h + + # XDC Configuration + CONFIGURO = $(XDC_INSTALL_DIR)/xs xdc.tools.configuro +diff -uNr ticodecplugin/src/omapfb.c ticodecplugin.new/src/omapfb.c +--- ticodecplugin/src/omapfb.c 1969-12-31 18:00:00.000000000 -0600 ++++ ticodecplugin.new/src/omapfb.c 2010-09-03 13:54:11.929409696 -0500 @@ -0,0 +1,1005 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1089,11 +1067,9 @@ index 0000000..0fb4eef + + return type; +} -diff --git a/src/omapfb.h b/src/omapfb.h -new file mode 100644 -index 0000000..6103b49 ---- /dev/null -+++ b/src/omapfb.h +diff -uNr ticodecplugin/src/omapfb.h ticodecplugin.new/src/omapfb.h +--- ticodecplugin/src/omapfb.h 1969-12-31 18:00:00.000000000 -0600 ++++ ticodecplugin.new/src/omapfb.h 2010-09-03 13:54:11.929409696 -0500 @@ -0,0 +1,142 @@ +/* + * Copyright (C) 2008 Felipe Contreras <felipe.contreras@gmail.com> @@ -1237,11 +1213,9 @@ index 0000000..6103b49 +G_END_DECLS + +#endif /* GST_OMAPFB_H */ -diff --git a/src/yuv.S b/src/yuv.S -new file mode 100644 -index 0000000..52113fa ---- /dev/null -+++ b/src/yuv.S +diff -uNr ticodecplugin/src/yuv.S ticodecplugin.new/src/yuv.S +--- ticodecplugin/src/yuv.S 1969-12-31 18:00:00.000000000 -0600 ++++ ticodecplugin.new/src/yuv.S 2010-09-03 13:54:11.929409696 -0500 @@ -0,0 +1,117 @@ +/* + Copyright (C) 2008 Mans Rullgard @@ -1360,6 +1334,3 @@ index 0000000..52113fa + pop {r4-r11,pc} + .endfunc + --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/0001-gstreamer-ti-tracker-1055.patch b/recipes/ti/gstreamer-ti/0001-gstreamer-ti-tracker-1055.patch deleted file mode 100644 index 99a94a5561..0000000000 --- a/recipes/ti/gstreamer-ti/0001-gstreamer-ti-tracker-1055.patch +++ /dev/null @@ -1,994 +0,0 @@ -From 455900e8cbb7a88d3ec05cba5393f4ca0bf22adc Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 05:21:19 -0500 -Subject: [PATCH] gstreamer ti tracker 1055 - ---- - Makefile.external | 49 +++++++--- - src/Makefile.am | 4 +- - src/gstticodecplugin_dm355.cfg | 143 ++++++++++++----------------- - src/gstticodecplugin_dm365.cfg | 185 ++++++++++++++++++-------------------- - src/gstticodecplugin_dm6467t.cfg | 34 +++++++ - src/gstticodecs_dm355.c | 11 +-- - src/gstticodecs_dm365.c | 23 ++++-- - src/gstticodecs_dm6467.c | 2 +- - src/gstticodecs_dm6467t.c | 69 ++++++++++++++ - src/gsttidmaivideosink.c | 25 ++++- - src/gsttividdec2.c | 73 ++++++++------- - src/gsttividenc1.c | 10 ++- - src/gsttividresize.c | 4 + - 13 files changed, 380 insertions(+), 252 deletions(-) - create mode 100644 src/gstticodecplugin_dm6467t.cfg - create mode 100644 src/gstticodecs_dm6467t.c - -diff --git a/Makefile.external b/Makefile.external -index ca14b49..1f67783 100644 ---- a/Makefile.external -+++ b/Makefile.external -@@ -3,8 +3,7 @@ - # - # The only customization required below is defining the DVSDK_PATH - # and, if your DVSDK doesn't include DMAI, the set DMAI_INSTALL_DIR variable --# appropriately. If your DVSDK does include DMAI, then delete the line --# setting the DMAI_INSTALL_DIR variable below. -+# appropriately. - # - # Copyright (C) 2009 Ridgerun - # -@@ -17,15 +16,16 @@ DMAI_INSTALL_DIR=undefined - ifeq ($(DVSDK_PATH),undefined) - $(error You need to define the environment variable DVSDK_PATH) - endif -+include $(DVSDK_PATH)/Rules.make -+ - ifeq ($(DMAI_INSTALL_DIR),undefined) - $(error You need to define the environment variable DMAI_INSTALL_DIR) - endif - - default: -- @echo "Please specify the target: dm6446, omap3530, dm355, dm6467, dm365" -+ @echo "Please specify the target: dm6446, omap3530, dm355, dm6467, dm6467t, dm365" - --include $(DVSDK_PATH)/Rules.make --export PLATFORM=$(MAKECMDGOALS) -+export GST_TI_PLATFORM=$(MAKECMDGOALS) - export BIOS_INSTALL_DIR - export CE_INSTALL_DIR - export CMEM_INSTALL_DIR -@@ -33,6 +33,7 @@ export CODEC_INSTALL_DIR - export DMAI_INSTALL_DIR - export FC_INSTALL_DIR - export LINK_INSTALL_DIR -+export LINK_XDC_ROOT = $(LINK_INSTALL_DIR)/packages - export LINUXKERNEL_INSTALL_DIR - export LPM_INSTALL_DIR - export MVTOOL_DIR -@@ -41,34 +42,49 @@ export XDAIS_INSTALL_DIR - export XDC_INSTALL_DIR - export EDMA3_LLD_INSTALL_DIR - --ifeq ($(PLATFORM), dm355) -- export XDC_TARGET = gnu.targets.MVArm9 -- export XDC_PLATFORM = ti.platforms.evmDM355 -+ifeq ($(GST_TI_PLATFORM), dm355) -+ export XDC_TARGET = gnu.targets.arm.GCArmv5T -+ export XDC_PLATFORM = ti.platforms.evmDM355 -+ export MVTOOL_PREFIX = $(CSTOOL_PREFIX) -+ export MVTOOL_DIR = $(CSTOOL_DIR) -+ export PLATFORM_XDC = ${XDC_PLATFORM} - endif - --ifeq ($(PLATFORM), dm6446) -+ifeq ($(GST_TI_PLATFORM), dm6446) - export XDC_TARGET = gnu.targets.MVArm9 - export XDC_PLATFORM = ti.platforms.evmDM6446 - endif - --ifeq ($(PLATFORM), dm6467) -+ifeq ($(GST_TI_PLATFORM), dm6467) - export XDC_TARGET = gnu.targets.MVArm9 - export XDC_PLATFORM = ti.platforms.evmDM6467 - endif - --ifeq ($(PLATFORM), dm365) -- export XDC_TARGET = gnu.targets.MVArm9 -- export XDC_PLATFORM = ti.platforms.evmDM365 -+ifeq ($(GST_TI_PLATFORM), dm6467t) -+ export XDC_TARGET = gnu.targets.arm.GCArmv5T -+ export XDC_PLATFORM = ti.platforms.evmDM6467 -+ export LINK_XDC_ROOT = $(LINK_INSTALL_DIR) -+ export MVTOOL_PREFIX = $(CSTOOL_PREFIX) -+ export MVTOOL_DIR = $(CSTOOL_DIR) -+ export PLATFORM_XDC = ${XDC_PLATFORM} - endif - --ifeq ($(PLATFORM), omap3530) -+ifeq ($(GST_TI_PLATFORM), dm365) -+ export XDC_TARGET = gnu.targets.arm.GCArmv5T -+ export XDC_PLATFORM = ti.platforms.evmDM365 -+ export MVTOOL_PREFIX = $(CSTOOL_PREFIX) -+ export MVTOOL_DIR = $(CSTOOL_DIR) -+ export PLATFORM_XDC = ${XDC_PLATFORM} -+endif -+ -+ifeq ($(GST_TI_PLATFORM), omap3530) - export XDC_TARGET = gnu.targets.arm.GCArmv5T - export XDC_PLATFORM = ti.platforms.evm3530 - export MVTOOL_PREFIX = $(CSTOOL_PREFIX) - export MVTOOL_DIR = $(CSTOOL_DIR) - endif - --CPPFLAGS=-DPlatform_$(PLATFORM) -+CPPFLAGS=-DPlatform_$(GST_TI_PLATFORM) - HOST=arm-none-linux-gnueabi - - configure: -@@ -86,6 +102,9 @@ dm6446: Makefile - dm6467: Makefile - $(MAKE) -f Makefile - -+dm6467t: Makefile -+ $(MAKE) -f Makefile -+ - dm355: Makefile - $(MAKE) -f Makefile - -diff --git a/src/Makefile.am b/src/Makefile.am -index 231beb0..95973a8 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,6 +1,6 @@ - # plugindir is set in configure - --XDC_CONFIG_BASENAME = gstticodecplugin_$(PLATFORM) -+XDC_CONFIG_BASENAME = gstticodecplugin_$(GST_TI_PLATFORM) - plugin_LTLIBRARIES = libgstticodecplugin.la - - # sources used to compile this plug-in -@@ -21,7 +21,7 @@ BUILT_SOURCES = $(XDC_CONFIG_BASENAME)/compiler.opt $(XDC_CONFIG_BASENAME)/linke - XDC_PATH = .;$(XDC_INSTALL_DIR)/packages;$(LINK_XDC_ROOT);$(FC_INSTALL_DIR)/packages;$(CE_INSTALL_DIR)/packages;$(XDAIS_INSTALL_DIR)/packages;$(CODEC_INSTALL_DIR)/packages;$(CMEM_INSTALL_DIR)/packages;$(DMAI_INSTALL_DIR)/packages;$(LPM_INSTALL_DIR)/packages;$(XDC_USER_PATH);$(EDMA3_LLD_INSTALL_DIR)/packages; - - gstticodecs_platform.c : -- ln -s $(srcdir)/gstticodecs_$(PLATFORM).c gstticodecs_platform.c -+ ln -s $(srcdir)/gstticodecs_$(GST_TI_PLATFORM).c gstticodecs_platform.c - - %/compiler.opt %/linker.cmd : %.cfg - XDCPATH="$(XDC_PATH)" $(CONFIGURO) -c $(MVTOOL_DIR) -o $(XDC_CONFIG_BASENAME) -t $(XDC_TARGET) -p $(XDC_PLATFORM) -b $(DMAI_INSTALL_DIR)/packages/config.bld $< -diff --git a/src/gstticodecplugin_dm355.cfg b/src/gstticodecplugin_dm355.cfg -index 7ceae4f..bf533f0 100644 ---- a/src/gstticodecplugin_dm355.cfg -+++ b/src/gstticodecplugin_dm355.cfg -@@ -1,84 +1,59 @@ --/* -- * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU Lesser General Public License as -- * published by the Free Software Foundation version 2.1 of the License. -- * -- * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -- * whether express or implied; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- */ -- --prog.build.platform = "ti.platforms.evmDM355"; -- --/* Load support for the Codec Engine OSAL */ --var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); -- --/* Configure CE to use it's DSP Link Linux version */ --osalGlobal.runtimeEnv = osalGlobal.LINUX; -- --/* -- * ======== Engine Configuration ======== -- */ --var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2'); --var imgenc = xdc.module('ti.sdo.ce.image1.IIMGENC1'); --var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec.dm355.ce.MPEG4DEC'); --var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc.dm355.ce.MPEG4ENC'); --var JPEGENC = xdc.useModule('ti.sdo.codecs.jpegenc.dm355.ce.JPEGENC'); --var JPEGDEC = xdc.useModule('ti.sdo.codecs.jpegdec.dm355.ce.JPEGDEC'); -- --var Engine = xdc.useModule('ti.sdo.ce.Engine'); --var decodeEngine = Engine.create("decode", [ -- {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1}, -- {name: "jpegdec", mod: JPEGDEC, local: true, groupId: 1}, --]); -- --var encodeEngine = Engine.create("encode", [ -- {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1}, -- {name: "jpegenc", mod: JPEGENC, local: true, groupId: 1}, --]); -- --/* Load support for the 'Davinci Multimedia Application Interface' modules */ --var DMAI = xdc.loadPackage('ti.sdo.dmai'); -- --/* -- * ======== DMAN3 Configuration ======== -- */ -- --var DMAN3 = xdc.useModule('ti.sdo.fc.dman3.DMAN3'); -- --/* give DMAN3 all TCCs except those hard-coded by The JPEG & MPEG Enc & Decs */ -- --/* -- * For the 32-63 range, configure tccAllocationMaskH to exclude used channels -- * JPEG Dec: {33-47, 52-57} -- * JPEG Enc: {34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49} -- * MPEG Dec: {32-63} -- * MPEG Enc: {12, 13, 34, 35, 40,41,42,43,44,45,46,47,48,49,50,52,53, -- * 54,55,56,57,63} -- */ --DMAN3.tccAllocationMaskH = 0x0; /* everthing 32-63 hardcoded and unavailable */ -- --/* Give DMAN3 all lower TCCs except what's taken by Linux kernel and a Codec: -- * Based on the info from montavista: {2, 3, 8, 9, 26, 27, 30, 31} -- * and MPEG Enc taking up: {12, 13} -- */ --DMAN3.tccAllocationMaskL = 0x33ffccf3; -- --/* Following assignments will give DMAN3 control of PaRAMs above 78: */ --DMAN3.paRamBaseIndex = 64; --DMAN3.numPaRamEntries = 48; --DMAN3.nullPaRamIndex = 127; -- --/* Configure Scratch Group's DMAN3 resources */ --DMAN3.numTccGroup[1] = 0; --DMAN3.numPaRamGroup[1] = 32; -- --DMAN3.qdmaChannels = [0, 1, 2, 3, 4, 5, 6, 7]; --DMAN3.maxQdmaChannels = 8; --DMAN3.numQdmaChannels = 8; --DMAN3.maxTCs = 2; -- -+/* ===========================================================================
-+ * Copyright (c) Texas Instruments Incorporated 2009
-+ *
-+ * Use of this software is controlled by the terms and conditions found in
-+ * the license agreement under which this software has been supplied or
-+ * provided.
-+ * ===========================================================================
-+ */
-+
-+/* Load support for the Codec Engine OSAL */
-+var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
-+
-+/* Configure CE to use it's DSP Link Linux version */
-+osalGlobal.runtimeEnv = osalGlobal.LINUX;
-+
-+/* Configure RMAN */
-+var RMAN = xdc.useModule('ti.sdo.fc.rman.RMAN');
-+RMAN.useDSKT2 = false;
-+RMAN.persistentAllocFxn = "__ALG_allocMemory";
-+RMAN.persistentFreeFxn = "__ALG_freeMemory";
-+RMAN.semCreateFxn = "Sem_create";
-+RMAN.semDeleteFxn = "Sem_delete";
-+RMAN.semPendFxn = "Sem_pend";
-+RMAN.semPostFxn = "Sem_post";
-+RMAN.tableSize = 10;
-+
-+var EDMA3 = xdc.useModule('ti.sdo.fc.edma3.Settings');
-+var EDMA3CHAN = xdc.useModule('ti.sdo.fc.ires.edma3chan.EDMA3CHAN');
-+var EDMA = xdc.useModule('ti.sdo.linuxutils.edma.EDMA');
-+var VICPLU = xdc.useModule('ti.sdo.linuxutils.vicp.VICP');
-+var VICP = xdc.useModule('ti.sdo.fc.ires.vicp.VICP2');
-+var VICPSYNC = xdc.useModule('ti.sdo.fc.vicpsync.VICPSYNC');
-+var ADDRSPACE = xdc.useModule('ti.sdo.fc.ires.addrspace.ADDRSPACE');
-+var CMEM = xdc.useModule('ti.sdo.linuxutils.cmem.CMEM');
-+
-+/*
-+ * ======== Engine Configuration ========
-+ */
-+var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2');
-+var auddec = xdc.module('ti.sdo.ce.audio.IAUDDEC');
-+var videnc = xdc.module('ti.sdo.ce.video1.IVIDENC1');
-+var audenc = xdc.module('ti.sdo.ce.audio.IAUDENC');
-+
-+var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec.ce.MPEG4DEC');
-+var JPEGDEC = xdc.useModule('ti.sdo.codecs.jpegdec.ce.JPEGDEC');
-+var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc.ce.MPEG4ENC');
-+var JPEGENC = xdc.useModule('ti.sdo.codecs.jpegenc.ce.JPEGENC');
-+
-+var Engine = xdc.useModule('ti.sdo.ce.Engine');
-+var myEngine = Engine.create("codecServer", [
-+ {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1},
-+ {name: "jpegdec", mod: JPEGDEC, local: true, groupId: 1},
-+ {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1},
-+ {name: "jpegenc", mod: JPEGENC, local: true, groupId: 1}
-+]);
-+
-+/* Load support for the 'Davinci Multimedia Application Interface' modules */
-+var DMAI = xdc.loadPackage('ti.sdo.dmai');
-+
-diff --git a/src/gstticodecplugin_dm365.cfg b/src/gstticodecplugin_dm365.cfg -index 6442dce..0e94a35 100644 ---- a/src/gstticodecplugin_dm365.cfg -+++ b/src/gstticodecplugin_dm365.cfg -@@ -1,99 +1,86 @@ --/* -- * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU Lesser General Public License as -- * published by the Free Software Foundation version 2.1 of the License. -- * -- * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -- * whether express or implied; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- */ -- --prog.build.platform = "ti.platforms.evmDM365"; -- --/* Load support for the Codec Engine OSAL */ --var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); -- --/* Configure CE to use it's DSP Link Linux version */ --osalGlobal.runtimeEnv = osalGlobal.LINUX; -- --/* -- * ======== Engine Configuration ======== -- */ --var videnc = xdc.module('ti.sdo.ce.video1.IVIDENC1'); --var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2'); -- --var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc.ce.MPEG4ENC'); --var H264ENC = xdc.useModule('ti.sdo.codecs.h264enc.ce.H264ENC'); --var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec.ce.MPEG4DEC'); --var H264DEC = xdc.useModule('ti.sdo.codecs.h264dec.ce.H264DEC'); --var JPEGENC = xdc.useModule('ti.sdo.codecs.jpegenc.ce.JPEGENC'); --var JPEGDEC = xdc.useModule('ti.sdo.codecs.jpegdec.ce.JPEGDEC'); -- --var Engine = xdc.useModule('ti.sdo.ce.Engine'); --var encodeEngine = Engine.create("encode", [ -- {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1}, -- {name: "h264enc", mod: H264ENC, local: true, groupId: 1}, -- {name: "jpegenc", mod: JPEGENC, local: true, groupId: 1}, --]); --var decodeEngine = Engine.create("decode", [ -- {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1}, -- {name: "h264dec", mod: H264DEC, local: true, groupId: 1}, -- {name: "jpegdec", mod: JPEGDEC, local: true, groupId: 1}, --]); -- --/* Load support for the 'Davinci Multimedia Application Interface' modules */ --var DMAI = xdc.loadPackage('ti.sdo.dmai'); -- --/* Load support for SimpleWidget */ --/*var SW = xdc.loadPackage('ti.sdo.simplewidget');*/ -- -- --/* Configure RMAN */ --var RMAN = xdc.useModule('ti.sdo.fc.rman.RMAN'); --RMAN.useDSKT2 = false; --RMAN.persistentAllocFxn = "__ALG_allocMemory"; --RMAN.persistentFreeFxn = "__ALG_freeMemory"; --RMAN.semCreateFxn = "Sem_create"; --RMAN.semDeleteFxn = "Sem_delete"; --RMAN.semPendFxn = "Sem_pend"; --RMAN.semPostFxn = "Sem_post"; --RMAN.tableSize = 10; -- --/* Configure VICPSYNC */ --var VICPSYNC = xdc.useModule('ti.sdo.fc.vicpsync.VICPSYNC'); -- --/* Configure HDVICPSYNC */ --var HDVICPSYNC = xdc.useModule('ti.sdo.fc.hdvicpsync.HDVICPSYNC'); -- --/* Configure MEMUTILS */ --var MEMUTILS = xdc.useModule('ti.sdo.fc.memutils.MEMUTILS'); -- --var EDMA3 = xdc.useModule('ti.sdo.fc.edma3.Settings'); -- --var HDVICP = xdc.useModule('ti.sdo.fc.ires.hdvicp.HDVICP'); -- --var VICP = xdc.useModule('ti.sdo.fc.ires.vicp.VICP2'); -- --var ADDRSPACE = xdc.useModule('ti.sdo.fc.ires.addrspace.ADDRSPACE'); -- --var EDMA3CHAN = xdc.useModule('ti.sdo.fc.ires.edma3chan.EDMA3CHAN'); -- --var LSP = xdc.useModule('ti.sdo.linuxutils.edma.EDMA'); -- --var CMEM = xdc.useModule('ti.sdo.linuxutils.cmem.CMEM'); -- -- --/* Uncomment these lines if you wish to debug FC and enable FC trace */ -- --/* --xdc.loadPackage('ti.sdo.fc.ires.vicp').profile = "debug_trace"; --xdc.loadPackage('ti.sdo.fc.ires.edma3chan').profile = "debug_trace"; --xdc.loadPackage('ti.sdo.fc.rman').profile = "debug_trace"; --xdc.loadPackage('ti.sdo.fc.edma3').profile = "debug_trace"; --EDMA3CHAN.trace = true; --EDMA3CHAN.debug = true; --*/ -+/* ============================================================================
-+ * Copyright (c) Texas Instruments Incorporated 2009
-+ *
-+ * Use of this software is controlled by the terms and conditions found in the
-+ * license agreement under which this software has been supplied or provided.
-+ * ============================================================================
-+ */
-+
-+/* Load support for the Codec Engine OSAL */
-+var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global');
-+
-+/* Configure CE to use it's DSP Link Linux version */
-+osalGlobal.runtimeEnv = osalGlobal.LINUX;
-+
-+/*
-+ * ======== Engine Configuration ========
-+ */
-+var viddec = xdc.module('ti.sdo.ce.video2.IVIDDEC2');
-+var auddec = xdc.module('ti.sdo.ce.audio.IAUDDEC');
-+
-+var MPEG4DEC = xdc.useModule('ti.sdo.codecs.mpeg4dec_hdvicp.ce.MPEG4DEC_HDVICP');
-+var MPEG2DEC = xdc.useModule('ti.sdo.codecs.mpeg2dec.ce.MPEG2DEC');
-+var H264DEC = xdc.useModule('ti.sdo.codecs.h264dec.ce.H264DEC');
-+var MPEG4ENC = xdc.useModule('ti.sdo.codecs.mpeg4enc_hdvicp.ce.MPEG4ENC_HDVICP');
-+var MPEG2ENC = xdc.useModule('ti.sdo.codecs.mpeg2enc.ce.MPEG2ENC');
-+var H264ENC = xdc.useModule('ti.sdo.codecs.h264enc.ce.H264ENC');
-+
-+var Engine = xdc.useModule('ti.sdo.ce.Engine');
-+var myEngine = Engine.create("codecServer", [
-+ {name: "mpeg4dec", mod: MPEG4DEC, local: true, groupId: 1},
-+ {name: "mpeg2dec", mod: MPEG2DEC, local: true, groupId: 1},
-+ {name: "h264dec", mod: H264DEC, local: true, groupId: 1},
-+ {name: "mpeg4enc", mod: MPEG4ENC, local: true, groupId: 1},
-+ {name: "mpeg2enc", mod: MPEG2ENC, local: true, groupId: 1},
-+ {name: "h264enc", mod: H264ENC, local: true, groupId: 1},
-+]);
-+
-+
-+
-+/* Load support for the 'Davinci Multimedia Application Interface' modules */
-+var DMAI = xdc.loadPackage('ti.sdo.dmai');
-+
-+/* Configure RMAN */
-+var RMAN = xdc.useModule('ti.sdo.fc.rman.RMAN');
-+RMAN.useDSKT2 = false;
-+RMAN.persistentAllocFxn = "__ALG_allocMemory";
-+RMAN.persistentFreeFxn = "__ALG_freeMemory";
-+RMAN.semCreateFxn = "Sem_create";
-+RMAN.semDeleteFxn = "Sem_delete";
-+RMAN.semPendFxn = "Sem_pend";
-+RMAN.semPostFxn = "Sem_post";
-+RMAN.tableSize = 10;
-+
-+/* Configure VICPSYNC */
-+var VICPSYNC = xdc.useModule('ti.sdo.fc.vicpsync.VICPSYNC');
-+
-+/* Configure HDVICPSYNC */
-+var HDVICPSYNC = xdc.useModule('ti.sdo.fc.hdvicpsync.HDVICPSYNC');
-+
-+/* Configure MEMUTILS */
-+var MEMUTILS = xdc.useModule('ti.sdo.fc.memutils.MEMUTILS');
-+
-+var EDMA3 = xdc.useModule('ti.sdo.fc.edma3.Settings');
-+
-+var HDVICP = xdc.useModule('ti.sdo.fc.ires.hdvicp.HDVICP');
-+
-+var VICP = xdc.useModule('ti.sdo.fc.ires.vicp.VICP2');
-+
-+var EDMA3CHAN = xdc.useModule('ti.sdo.fc.ires.edma3chan.EDMA3CHAN');
-+
-+var EDMA = xdc.useModule('ti.sdo.linuxutils.edma.EDMA');
-+
-+var ADDRSPACE = xdc.useModule('ti.sdo.fc.ires.addrspace.ADDRSPACE');
-+
-+var CMEM = xdc.useModule('ti.sdo.linuxutils.cmem.CMEM');
-+
-+/* Uncomment these lines if you wish to debug FC and enable FC trace */
-+/*
-+/*
-+xdc.loadPackage('ti.sdo.fc.ires.vicp').profile = "debug_trace";
-+xdc.loadPackage('ti.sdo.fc.ires.edma3chan').profile = "debug_trace";
-+xdc.loadPackage('ti.sdo.fc.rman').profile = "debug_trace";
-+xdc.loadPackage('ti.sdo.fc.edma3').profile = "debug_trace";
-+EDMA3CHAN.trace = true;
-+EDMA3CHAN.debug = true;
-+*/
-diff --git a/src/gstticodecplugin_dm6467t.cfg b/src/gstticodecplugin_dm6467t.cfg -new file mode 100644 -index 0000000..686cfeb ---- /dev/null -+++ b/src/gstticodecplugin_dm6467t.cfg -@@ -0,0 +1,34 @@ -+/* ============================================================================ -+ * Copyright (c) Texas Instruments Incorporated 2009 -+ * -+ * Use of this software is controlled by the terms and conditions found in the -+ * license agreement under which this software has been supplied or provided. -+ * ============================================================================ -+ */ -+ -+/* Load support for the Codec Engine OSAL */ -+var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); -+var os = xdc.useModule('ti.sdo.ce.osal.linux.Settings'); -+osalGlobal.os = os; -+ -+/* Configure CE to use it's DSP Link Linux version */ -+var ipc = xdc.useModule('ti.sdo.ce.ipc.Settings'); -+ipc.commType = ipc.COMM_DSPLINK; -+ -+/* -+ * ======== Engine Configuration ======== -+ */ -+var Engine = xdc.useModule('ti.sdo.ce.Engine'); -+var demoEngine = Engine.createFromServer( -+ "codecServer", -+ "./bin/cs.x64P", -+ "ti.sdo.server.cs" -+ ); -+ -+var combopath = "" + java.lang.System.getenv("CODEC_SERVER"); -+if (combopath != "" && combopath != "null") { -+ demoEngine.server = java.lang.System.getenv("CODEC_SERVER"); -+} -+ -+/* Load support for the 'Davinci Multimedia Application Interface' modules */ -+var DMAI = xdc.loadPackage('ti.sdo.dmai'); -diff --git a/src/gstticodecs_dm355.c b/src/gstticodecs_dm355.c -index a372b06..9d4325b 100644 ---- a/src/gstticodecs_dm355.c -+++ b/src/gstticodecs_dm355.c -@@ -22,8 +22,7 @@ - #include "gstticodecs.h" - - /* Declaration of the production engine and decoders shipped with the DVSDK */ --static Char decodeEngine[] = "decode"; --static Char encodeEngine[] = "encode"; -+static Char codecServer[] = "codecServer"; - - /* NULL terminated list of speech decoders in the engine to use in the demo */ - GstTICodec gst_ticodec_codecs[] = { -@@ -32,25 +31,25 @@ GstTICodec gst_ticodec_codecs[] = { - { - "MPEG4 Video Decoder", /* String name of codec used by plugin */ - "mpeg4dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - { - "MPEG4 Video Encoder", /* String name of codec used by plugin */ - "mpeg4enc", /* String name of codec used by CE */ -- encodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - /* Imaging Codecs */ - { - "JPEG Image Encoder", - "jpegenc", -- encodeEngine -+ codecServer - }, - { - "JPEG Image Decoder", - "jpegdec", -- decodeEngine -+ codecServer - }, - - { NULL } -diff --git a/src/gstticodecs_dm365.c b/src/gstticodecs_dm365.c -index 9572403..cf81e6f 100644 ---- a/src/gstticodecs_dm365.c -+++ b/src/gstticodecs_dm365.c -@@ -22,8 +22,7 @@ - #include "gstticodecs.h" - - /* Declaration of the production engine and decoders shipped with the DVSDK */ --static Char decodeEngine[] = "decode"; --static Char encodeEngine[] = "encode"; -+static Char codecServer[] = "codecServer"; - - /* NULL terminated list of speech decoders in the engine to use in the demo */ - GstTICodec gst_ticodec_codecs[] = { -@@ -32,25 +31,37 @@ GstTICodec gst_ticodec_codecs[] = { - { - "MPEG4 Video Decoder", /* String name of codec used by plugin */ - "mpeg4dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ { -+ "MPEG2 Video Decoder", /* String name of codec used by plugin */ -+ "mpeg2dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ - }, - - { - "MPEG4 Video Encoder", /* String name of codec used by plugin */ - "mpeg4enc", /* String name of codec used by CE */ -- encodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ { -+ "MPEG2 Video Encoder", /* String name of codec used by plugin */ -+ "mpeg2enc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ - }, - - { - "H.264 Video Decoder", /* String name of codec used by plugin */ - "h264dec", /* String name of codec used by CE */ -- decodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - { - "H.264 Video Encoder", /* String name of codec used by plugin */ - "h264enc", /* String name of codec used by CE */ -- encodeEngine /* Engine that contains this codec */ -+ codecServer /* Engine that contains this codec */ - }, - - { NULL } -diff --git a/src/gstticodecs_dm6467.c b/src/gstticodecs_dm6467.c -index b9b0499..cbb6520 100644 ---- a/src/gstticodecs_dm6467.c -+++ b/src/gstticodecs_dm6467.c -@@ -1,5 +1,5 @@ - /* -- * gstticodecs_dm6446.c -+ * gstticodecs_dm6467.c - * - * This file provides information for available codecs on the DM6446 platform. - * -diff --git a/src/gstticodecs_dm6467t.c b/src/gstticodecs_dm6467t.c -new file mode 100644 -index 0000000..fe597d5 ---- /dev/null -+++ b/src/gstticodecs_dm6467t.c -@@ -0,0 +1,69 @@ -+/* -+ * gstticodecs_dm6467t.c -+ * -+ * This file provides information for available codecs on the DM6446 platform. -+ * -+ * Original Author: -+ * Don Darling, Texas Instruments, Inc. -+ * -+ * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation version 2.1 of the License. -+ * -+ * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -+ * whether express or implied; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ */ -+ -+#include "gstticodecs.h" -+ -+/* Declaration of the production engine and decoders shipped with the DVSDK */ -+static Char codecServer[] = "codecServer"; -+ -+/* NULL terminated list of speech decoders in the engine to use in the demo */ -+GstTICodec gst_ticodec_codecs[] = { -+ -+ /* Speech Codecs */ -+ { -+ "G.711 Speech Decoder", /* String name of codec used by plugin */ -+ "g711dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, { -+ "G.711 Speech Encoder", /* String name of codec used by plugin */ -+ "g711enc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Audio Codecs */ -+ { -+ "AAC Audio Decoder", /* String name of codec used by plugin */ -+ "aachedec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Video Codecs */ -+ { -+ "H.264 Video Decoder", /* String name of codec used by plugin */ -+ "h264dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, { -+ "H.264 BP/HP Decoder", /* Name of codec used by plugin */ -+ "h2641080p60vdec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, { -+ "H.264 Video Encoder", /* String name of codec used by plugin */ -+ "h264enc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, { -+ "MPEG2 Video Decoder", /* String name of codec used by plugin */ -+ "mpeg2dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ { NULL } -+}; -+ -diff --git a/src/gsttidmaivideosink.c b/src/gsttidmaivideosink.c -index 5f6a5b3..81bdac7 100644 ---- a/src/gsttidmaivideosink.c -+++ b/src/gsttidmaivideosink.c -@@ -32,11 +32,12 @@ - /* Define sink (input) pad capabilities. - * - * UYVY - YUV 422 interleaved corresponding to V4L2_PIX_FMT_UYVY in v4l2 -- * Y8C8 - YUV 422 semi planar. The dm6467 VDCE outputs this format after a -+ * NV16 - YUV 422 semi planar. The dm6467 VDCE outputs this format after a - * color conversion.The format consists of two planes: one with the - * Y component and one with the CbCr components interleaved (hence semi) * - * See the LSP VDCE documentation for a thorough description of this - * format. -+ * Y8C8 - Same as NV16. Y8C8 was used in MVL-based LSPs. - * NV12 - YUV 420 semi planar corresponding to V4L2_PIX_FMT_NV12 in v4l2. - * The format consists of two planes: one with the - * Y component and one with the CbCr components interleaved with -@@ -62,6 +63,11 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( - "width=(int)[ 1, MAX ], " - "height=(int)[ 1, MAX ];" - "video/x-raw-yuv, " -+ "format=(fourcc)NV16, " -+ "framerate=(fraction)[ 0, MAX ], " -+ "width=(int)[ 1, MAX ], " -+ "height=(int)[ 1, MAX ];" -+ "video/x-raw-yuv, " - "format=(fourcc)NV12, " - "framerate=(fraction)[ 0, MAX ], " - "width=(int)[ 1, MAX ], " -@@ -219,7 +225,7 @@ static void gst_tidmaivideosink_class_init(GstTIDmaiVideoSinkClass * klass) - "Video Standard used\n" - "\tAUTO (if supported), CIF, SIF_NTSC, SIF_PAL, VGA, D1_NTSC\n" - "\tD1_PAL, 480P, 576P, 720P_60, 720P_50, 1080I_30, 1080I_25\n" -- "\t1080P_30, 1080P_25, 1080P_24\n", -+ "\t1080P_30, 1080P_60, 1080P_25, 1080P_24\n", - NULL, G_PARAM_READWRITE)); - - g_object_class_install_property(gobject_class, PROP_VIDEOOUTPUT, -@@ -661,6 +667,9 @@ static int gst_tidmaivideosink_videostd_get_attrs(VideoStd_Type videoStd, - break; - case VideoStd_480P: - case VideoStd_720P_60: -+ #if defined(Platform_dm6467t) -+ case VideoStd_1080P_60: -+ #endif - vattrs->framerate = 60; - break; - -@@ -715,6 +724,9 @@ static int gst_tidmaivideosink_videostd_get_refresh_latency( - - case VideoStd_480P: - case VideoStd_720P_60: -+ #if defined(Platform_dm6467t) -+ case VideoStd_1080P_60: -+ #endif - return 16667; - - #if defined(Platform_omap3530) -@@ -949,6 +961,10 @@ static int gst_tidmaivideosink_convert_attrs(int attr, - return VideoStd_1080P_25; - else if (!strcmp(sink->videoStd, "1080P_24")) - return VideoStd_1080P_24; -+ #if defined(Platform_dm6467t) -+ else if (!strcmp(sink->videoStd, "1080P_60")) -+ return VideoStd_1080P_60; -+ #endif - #if defined(Platform_omap3530) - else if (!strcmp(sink->videoStd, "VGA")) - return VideoStd_VGA; -@@ -958,7 +974,7 @@ static int gst_tidmaivideosink_convert_attrs(int attr, - "Please choose from:\n" - "\tAUTO (if supported), CIF, SIF_NTSC, SIF_PAL, VGA, D1_NTSC\n" - "\tD1_PAL, 480P, 576P, 720P_60, 720P_50, 1080I_30, 1080I_25\n" -- "\t1080P_30, 1080P_25, 1080P_24\n", sink->videoStd); -+ "\t1080P_30, 1080P_60, 1080P_25, 1080P_24\n", sink->videoStd); - return -1; - } - break; -@@ -1307,14 +1323,13 @@ static gboolean gst_tidmaivideosink_process_caps(GstBaseSink * bsink, - case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): - inBufColorSpace = ColorSpace_UYVY; - break; -+ case GST_MAKE_FOURCC('N', 'V', '1', '6'): - case GST_MAKE_FOURCC('Y', '8', 'C', '8'): - inBufColorSpace = ColorSpace_YUV422PSEMI; - break; -- #if defined(Platform_dm365) - case GST_MAKE_FOURCC('N', 'V', '1', '2'): - inBufColorSpace = ColorSpace_YUV420PSEMI; - break; -- #endif - default: - GST_ERROR("unsupported fourcc\n"); - return FALSE; -diff --git a/src/gsttividdec2.c b/src/gsttividdec2.c -index 0804065..79b28a5 100644 ---- a/src/gsttividdec2.c -+++ b/src/gsttividdec2.c -@@ -674,16 +674,8 @@ static gboolean gst_tividdec2_set_source_caps( - given buffer */ - BufferGfx_getDimensions(hBuf, &dim); - --#if !defined(Platform_dm365) -- caps = -- gst_caps_new_simple("video/x-raw-yuv", -- "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('U','Y','V','Y'), -- "framerate", GST_TYPE_FRACTION, viddec2->framerateNum, -- viddec2->framerateDen, -- "width", G_TYPE_INT, dim.width, -- "height", G_TYPE_INT, dim.height, -- NULL); --#else -+#if defined(Platform_dm365) || defined(Platform_dm6467) || \ -+ defined(Platform_dm6467t) - caps = - gst_caps_new_simple("video/x-raw-yuv", - "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('N','V','1','2'), -@@ -692,6 +684,15 @@ static gboolean gst_tividdec2_set_source_caps( - "width", G_TYPE_INT, dim.width, - "height", G_TYPE_INT, dim.height, - NULL); -+#else -+ caps = -+ gst_caps_new_simple("video/x-raw-yuv", -+ "format", GST_TYPE_FOURCC, GST_MAKE_FOURCC('U','Y','V','Y'), -+ "framerate", GST_TYPE_FRACTION, viddec2->framerateNum, -+ viddec2->framerateDen, -+ "width", G_TYPE_INT, dim.width, -+ "height", G_TYPE_INT, dim.height, -+ NULL); - #endif - - /* Set the source pad caps */ -@@ -1227,29 +1228,35 @@ static gboolean gst_tividdec2_codec_start (GstTIViddec2 *viddec2) - - /* Set up codec parameters depending on device */ - switch(device) { -- case Cpu_Device_DM6467: -- params.forceChromaFormat = XDM_YUV_420P; -- params.maxWidth = VideoStd_1080I_WIDTH; -- params.maxHeight = VideoStd_1080I_HEIGHT + 8; -- colorSpace = ColorSpace_YUV420PSEMI; -- defaultNumBufs = 5; -- break; --#if defined(Platform_dm365) -- case Cpu_Device_DM365: -- params.forceChromaFormat = XDM_YUV_420SP; -- params.maxWidth = VideoStd_720P_WIDTH; -- params.maxHeight = VideoStd_720P_HEIGHT; -- colorSpace = ColorSpace_YUV420PSEMI; -- defaultNumBufs = 5; -- break; --#endif -- default: -- params.forceChromaFormat = XDM_YUV_422ILE; -- params.maxWidth = VideoStd_D1_WIDTH; -- params.maxHeight = VideoStd_D1_PAL_HEIGHT; -- colorSpace = ColorSpace_UYVY; -- defaultNumBufs = 3; -- break; -+ case Cpu_Device_DM6467: -+ #if defined(Platform_dm6467t) -+ params.forceChromaFormat = XDM_YUV_420SP; -+ params.maxFrameRate = 60000; -+ params.maxBitRate = 30000000; -+ #else -+ params.forceChromaFormat = XDM_YUV_420P; -+ #endif -+ params.maxWidth = VideoStd_1080I_WIDTH; -+ params.maxHeight = VideoStd_1080I_HEIGHT + 8; -+ colorSpace = ColorSpace_YUV420PSEMI; -+ defaultNumBufs = 5; -+ break; -+ #if defined(Platform_dm365) -+ case Cpu_Device_DM365: -+ params.forceChromaFormat = XDM_YUV_420SP; -+ params.maxWidth = VideoStd_720P_WIDTH; -+ params.maxHeight = VideoStd_720P_HEIGHT; -+ colorSpace = ColorSpace_YUV420PSEMI; -+ defaultNumBufs = 4; -+ break; -+ #endif -+ default: -+ params.forceChromaFormat = XDM_YUV_422ILE; -+ params.maxWidth = VideoStd_D1_WIDTH; -+ params.maxHeight = VideoStd_D1_PAL_HEIGHT; -+ colorSpace = ColorSpace_UYVY; -+ defaultNumBufs = 3; -+ break; - } - - GST_LOG("opening video decoder \"%s\"\n", viddec2->codecName); -diff --git a/src/gsttividenc1.c b/src/gsttividenc1.c -index f9c6f1a..2e1fb31 100644 ---- a/src/gsttividenc1.c -+++ b/src/gsttividenc1.c -@@ -133,6 +133,11 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - "framerate=(fraction)[ 0, MAX ], " - "width=(int)[ 1, MAX ], " - "height=(int)[ 1, MAX ];" -+ "video/x-raw-yuv, " /* NV16 - YUV422 semi planar */ -+ "format=(fourcc)NV16, " -+ "framerate=(fraction)[ 0, MAX ], " -+ "width=(int)[ 1, MAX ], " -+ "height=(int)[ 1, MAX ];" - "video/x-raw-yuv, " /* NV12 - YUV420 semi planar */ - "format=(fourcc)NV12, " - "framerate=(fraction)[ 0, MAX ], " -@@ -290,7 +295,7 @@ static void gst_tividenc1_class_init(GstTIVidenc1Class *klass) - - g_object_class_install_property(gobject_class, PROP_IN_COLORSPACE, - g_param_spec_string("iColorSpace", "Input colorspace", -- "Input color space (UYVY, Y8C8 or NV12)", -+ "Input color space (UYVY, Y8C8, NV16 or NV12)", - "unspecified", G_PARAM_READWRITE)); - - g_object_class_install_property(gobject_class, PROP_BITRATE, -@@ -456,6 +461,8 @@ static ColorSpace_Type gst_tividenc1_find_colorSpace (const gchar *colorSpace) - { - if (!strcmp(colorSpace, "UYVY")) - return ColorSpace_UYVY; -+ else if (!strcmp(colorSpace, "NV16")) -+ return ColorSpace_YUV422PSEMI; - else if (!strcmp(colorSpace, "Y8C8")) - return ColorSpace_YUV422PSEMI; - else if (!strcmp(colorSpace, "NV12")) -@@ -665,6 +672,7 @@ static gboolean gst_tividenc1_set_sink_caps(GstPad *pad, GstCaps *caps) - videnc1->colorSpace = ColorSpace_UYVY; - break; - -+ case GST_MAKE_FOURCC('N', 'V', '1', '6'): - case GST_MAKE_FOURCC('Y', '8', 'C', '8'): - videnc1->colorSpace = ColorSpace_YUV422PSEMI; - break; -diff --git a/src/gsttividresize.c b/src/gsttividresize.c -index 5757705..c200787 100644 ---- a/src/gsttividresize.c -+++ b/src/gsttividresize.c -@@ -90,6 +90,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ( GST_VIDEO_CAPS_YUV("UYVY")";" -+ GST_VIDEO_CAPS_YUV("NV16")";" - GST_VIDEO_CAPS_YUV("Y8C8")";" - GST_VIDEO_CAPS_YUV("NV12") - ) -@@ -101,6 +102,7 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE( - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ( GST_VIDEO_CAPS_YUV("UYVY")";" -+ GST_VIDEO_CAPS_YUV("NV16")";" - GST_VIDEO_CAPS_YUV("Y8C8")";" - GST_VIDEO_CAPS_YUV("NV12") - ) -@@ -583,6 +585,7 @@ static GstCaps * gst_tividresize_transform_caps (GstBaseTransform *trans, - int i; - static const guint32 supported_fmt[] = { - GST_MAKE_FOURCC('U','Y','V','Y'), -+ GST_MAKE_FOURCC('N','V','1','6'), - GST_MAKE_FOURCC('Y','8','C','8'), - GST_MAKE_FOURCC('N','V','1','2'), - }; -@@ -649,6 +652,7 @@ ColorSpace_Type gst_tividresize_get_colorSpace (guint32 fourcc) - switch (fourcc) { - case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): - return ColorSpace_UYVY; -+ case GST_MAKE_FOURCC('N', 'V', '1', '6'): - case GST_MAKE_FOURCC('Y', '8', 'C', '8'): - return ColorSpace_YUV422PSEMI; - case GST_MAKE_FOURCC('N', 'V', '1', '2'): --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/0002-add-omapl138-support.patch b/recipes/ti/gstreamer-ti/0002-add-omapl138-support.patch deleted file mode 100644 index 7ddbe648c3..0000000000 --- a/recipes/ti/gstreamer-ti/0002-add-omapl138-support.patch +++ /dev/null @@ -1,288 +0,0 @@ -From f19ff5f127764d42d497d47bcefeeca1e0af5f28 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 05:23:59 -0500 -Subject: [PATCH] add omapl138 support - ---- - src/gstticodecplugin_omapl138.cfg | 41 +++++++++++++++++++ - src/gstticodecs_omapl138.c | 81 +++++++++++++++++++++++++++++++++++++ - src/gsttidmaivideosink.c | 73 ++++++++++++++++++++++++++------- - src/gsttividenc1.c | 3 + - 4 files changed, 183 insertions(+), 15 deletions(-) - create mode 100644 src/gstticodecplugin_omapl138.cfg - create mode 100644 src/gstticodecs_omapl138.c - -diff --git a/src/gstticodecplugin_omapl138.cfg b/src/gstticodecplugin_omapl138.cfg -new file mode 100644 -index 0000000..af1ad41 ---- /dev/null -+++ b/src/gstticodecplugin_omapl138.cfg -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation version 2.1 of the License. -+ * -+ * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -+ * whether express or implied; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ */ -+ -+/* Load the Codec Engine 'Operating System Abstraction Layer' */ -+var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); -+ -+var os = xdc.useModule('ti.sdo.ce.osal.linux.Settings'); -+osalGlobal.os = os; -+ -+/* Configure CE to use it's DSP Link Linux version */ -+var ipc = xdc.useModule('ti.sdo.ce.ipc.Settings'); -+ipc.commType = ipc.COMM_DSPLINK; -+ -+/* -+* ======== Engine Configuration ======== -+ */ -+var Engine = xdc.useModule('ti.sdo.ce.Engine'); -+var demoEngine = Engine.createFromServer( -+ "codecServer", -+ "./bin/cs.x64P", -+ "ti.sdo.server.cs" -+ ); -+ -+var combopath = "" + java.lang.System.getenv("CODEC_SERVER"); -+if (combopath != "" && combopath != "null") { -+ demoEngine.server = java.lang.System.getenv("CODEC_SERVER"); -+} -+ -+/* Load support for the DMAI module */ -+var DMAI = xdc.loadPackage('ti.sdo.dmai'); -diff --git a/src/gstticodecs_omapl138.c b/src/gstticodecs_omapl138.c -new file mode 100644 -index 0000000..edab54f ---- /dev/null -+++ b/src/gstticodecs_omapl138.c -@@ -0,0 +1,81 @@ -+/* -+ * gstticodecs_omapl138.c -+ * -+ * This file provides information for available codecs on the OMAP3530 platform. -+ * -+ * Original Author: -+ * Don Darling, Texas Instruments, Inc. -+ * -+ * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation version 2.1 of the License. -+ * -+ * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -+ * whether express or implied; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ */ -+ -+#include "gstticodecs.h" -+ -+/* Declaration of the production engine and decoders shipped with the DVSDK */ -+static Char codecServer[] = "codecServer"; -+ -+/* NULL terminated list of speech decoders in the engine to use in the demo */ -+GstTICodec gst_ticodec_codecs[] = { -+ -+ /* Audio Decoders */ -+ { -+ "AAC Audio Decoder", /* String name of codec used by plugin */ -+ "aachedec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Video Decoders */ -+ { -+ "H.264 Video Decoder", /* String name of codec used by plugin */ -+ "h264dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, { -+ "MPEG4 Video Decoder", /* String name of codec used by plugin */ -+ "mpeg4dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Image Decoders */ -+ { -+ "JPEG Image Decoder", /* String name of codec used by plugin */ -+ "jpegdec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Video Encoders */ -+ { -+ "H.264 Video Encoder", /* String name of codec used by plugin */ -+ "h264enc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Image Encoders */ -+ { -+ "JPEG Image Encoder", /* String name of codec used by plugin */ -+ "jpegenc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ { NULL } -+}; -+ -+ -+/****************************************************************************** -+ * Custom ViM Settings for editing this file -+ ******************************************************************************/ -+#if 0 -+ Tabs (use 4 spaces for indentation) -+ vim:set tabstop=4: /* Use 4 spaces for tabs */ -+ vim:set shiftwidth=4: /* Use 4 spaces for >> operations */ -+ vim:set expandtab: /* Expand tabs into white spaces */ -+#endif -diff --git a/src/gsttidmaivideosink.c b/src/gsttidmaivideosink.c -index 81bdac7..65e0406 100644 ---- a/src/gsttidmaivideosink.c -+++ b/src/gsttidmaivideosink.c -@@ -52,6 +52,19 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS -+#if defined(Platform_omapl138) -+ ("video/x-raw-rgb, " -+ "bpp=(int)16, " -+ "depth=(int)16, " -+ "endianness=(int)1234, " -+ "red_mask=(int)63488, " -+ "green_mask=(int)2016, " -+ "blue_mask=(int)31, " -+ "framerate=(fraction)[ 0, MAX ], " -+ "width=(int)[ 1, MAX ], " -+ "height=(int)[1, MAX ] " -+ ) -+#else - ("video/x-raw-yuv, " - "format=(fourcc)UYVY, " - "framerate=(fraction)[ 0, MAX ], " -@@ -73,6 +86,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( - "width=(int)[ 1, MAX ], " - "height=(int)[ 1, MAX ]" - ) -+#endif - ); - - GST_DEBUG_CATEGORY_STATIC (gst_tidmaivideosink_debug); -@@ -673,6 +687,12 @@ static int gst_tidmaivideosink_videostd_get_attrs(VideoStd_Type videoStd, - vattrs->framerate = 60; - break; - -+ #if defined(Platform_omapl138) -+ case VideoStd_QVGA: -+ vattrs->framerate = 30; -+ break; -+ #endif -+ - #if defined(Platform_omap3530) - case VideoStd_VGA: - vattrs->framerate = 60; -@@ -1051,6 +1071,12 @@ static gboolean gst_tidmaivideosink_set_display_attrs(GstTIDmaiVideoSink *sink, - sink->dAttrs.colorSpace = colorSpace; - break; - #endif -+ #if defined(Platform_omapl138) -+ case Cpu_Device_OMAPL138: -+ sink->dAttrs = Display_Attrs_OMAPL138_OSD_DEFAULT; -+ sink->dAttrs.colorSpace = colorSpace; -+ break; -+ #endif - default: - sink->dAttrs = Display_Attrs_DM6446_DM355_VID_DEFAULT; - break; -@@ -1307,8 +1333,10 @@ static gboolean gst_tidmaivideosink_process_caps(GstBaseSink * bsink, - ColorSpace_Type inBufColorSpace; - gint framerateDen; - gint framerateNum; -+ const gchar *mime; - - structure = gst_caps_get_structure(caps, 0); -+ mime = gst_structure_get_name(structure); - - /* The width and height of the input buffer are collected here so that it - * can be checked against the width and height of the display buffer. -@@ -1316,23 +1344,38 @@ static gboolean gst_tidmaivideosink_process_caps(GstBaseSink * bsink, - gst_structure_get_int(structure, "width", &width); - gst_structure_get_int(structure, "height", &height); - -- /* Map input buffer fourcc to dmai color space */ -- gst_structure_get_fourcc(structure, "format", &fourcc); -+ if (!strcmp(mime, "video/x-raw-rgb")) { -+ gint rm,gm,bm; - -- switch (fourcc) { -- case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): -- inBufColorSpace = ColorSpace_UYVY; -- break; -- case GST_MAKE_FOURCC('N', 'V', '1', '6'): -- case GST_MAKE_FOURCC('Y', '8', 'C', '8'): -- inBufColorSpace = ColorSpace_YUV422PSEMI; -- break; -- case GST_MAKE_FOURCC('N', 'V', '1', '2'): -- inBufColorSpace = ColorSpace_YUV420PSEMI; -- break; -- default: -- GST_ERROR("unsupported fourcc\n"); -+ gst_structure_get_int(structure,"red_mask",&rm); -+ gst_structure_get_int(structure,"green_mask",&gm); -+ gst_structure_get_int(structure,"blue_mask",&bm); -+ if ((rm == 63488) && (gm == 2016) && (bm == 31)){ -+ inBufColorSpace = ColorSpace_RGB565; -+ } else { -+ GST_ERROR("unsupported color space\n"); - return FALSE; -+ } -+ } else { -+ -+ /* Map input buffer fourcc to dmai color space */ -+ gst_structure_get_fourcc(structure, "format", &fourcc); -+ -+ switch (fourcc) { -+ case GST_MAKE_FOURCC('U', 'Y', 'V', 'Y'): -+ inBufColorSpace = ColorSpace_UYVY; -+ break; -+ case GST_MAKE_FOURCC('N', 'V', '1', '6'): -+ case GST_MAKE_FOURCC('Y', '8', 'C', '8'): -+ inBufColorSpace = ColorSpace_YUV422PSEMI; -+ break; -+ case GST_MAKE_FOURCC('N', 'V', '1', '2'): -+ inBufColorSpace = ColorSpace_YUV420PSEMI; -+ break; -+ default: -+ GST_ERROR("unsupported fourcc\n"); -+ return FALSE; -+ } - } - - /* Read the frame rate */ -diff --git a/src/gsttividenc1.c b/src/gsttividenc1.c -index 2e1fb31..60bf9e4 100644 ---- a/src/gsttividenc1.c -+++ b/src/gsttividenc1.c -@@ -1488,6 +1488,9 @@ static gboolean gst_tividenc1_codec_start (GstTIVidenc1 *videnc1) - #if defined(Platform_omap3530) - case Cpu_Device_OMAP3530: - #endif -+ #if defined(Platform_omapl138) -+ case Cpu_Device_OMAPL138: -+ #endif - case Cpu_Device_DM6446: - params.inputChromaFormat = XDM_YUV_422ILE; - break; --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/0003-add-omapl137-support.patch b/recipes/ti/gstreamer-ti/0003-add-omapl137-support.patch deleted file mode 100644 index d1183e051c..0000000000 --- a/recipes/ti/gstreamer-ti/0003-add-omapl137-support.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 00f97a599ad3a87fc5cd46e0cf67b0039527a87b Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 05:25:30 -0500 -Subject: [PATCH] add omapl137 support - ---- - src/gstticodecplugin_omapl137.cfg | 41 +++++++++++++++++++ - src/gstticodecs_omapl137.c | 81 +++++++++++++++++++++++++++++++++++++ - src/gsttidmaivideosink.c | 10 ++++- - src/gsttividenc1.c | 3 + - 4 files changed, 133 insertions(+), 2 deletions(-) - create mode 100644 src/gstticodecplugin_omapl137.cfg - create mode 100644 src/gstticodecs_omapl137.c - -diff --git a/src/gstticodecplugin_omapl137.cfg b/src/gstticodecplugin_omapl137.cfg -new file mode 100644 -index 0000000..af1ad41 ---- /dev/null -+++ b/src/gstticodecplugin_omapl137.cfg -@@ -0,0 +1,41 @@ -+/* -+ * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation version 2.1 of the License. -+ * -+ * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -+ * whether express or implied; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ */ -+ -+/* Load the Codec Engine 'Operating System Abstraction Layer' */ -+var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); -+ -+var os = xdc.useModule('ti.sdo.ce.osal.linux.Settings'); -+osalGlobal.os = os; -+ -+/* Configure CE to use it's DSP Link Linux version */ -+var ipc = xdc.useModule('ti.sdo.ce.ipc.Settings'); -+ipc.commType = ipc.COMM_DSPLINK; -+ -+/* -+* ======== Engine Configuration ======== -+ */ -+var Engine = xdc.useModule('ti.sdo.ce.Engine'); -+var demoEngine = Engine.createFromServer( -+ "codecServer", -+ "./bin/cs.x64P", -+ "ti.sdo.server.cs" -+ ); -+ -+var combopath = "" + java.lang.System.getenv("CODEC_SERVER"); -+if (combopath != "" && combopath != "null") { -+ demoEngine.server = java.lang.System.getenv("CODEC_SERVER"); -+} -+ -+/* Load support for the DMAI module */ -+var DMAI = xdc.loadPackage('ti.sdo.dmai'); -diff --git a/src/gstticodecs_omapl137.c b/src/gstticodecs_omapl137.c -new file mode 100644 -index 0000000..05b0e9f ---- /dev/null -+++ b/src/gstticodecs_omapl137.c -@@ -0,0 +1,81 @@ -+/* -+ * gstticodecs_omapl137.c -+ * -+ * This file provides information for available codecs on the OMAP3530 platform. -+ * -+ * Original Author: -+ * Don Darling, Texas Instruments, Inc. -+ * -+ * Copyright (C) $year Texas Instruments Incorporated - http://www.ti.com/ -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU Lesser General Public License as -+ * published by the Free Software Foundation version 2.1 of the License. -+ * -+ * This program is distributed #as is# WITHOUT ANY WARRANTY of any kind, -+ * whether express or implied; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ */ -+ -+#include "gstticodecs.h" -+ -+/* Declaration of the production engine and decoders shipped with the DVSDK */ -+static Char codecServer[] = "codecServer"; -+ -+/* NULL terminated list of speech decoders in the engine to use in the demo */ -+GstTICodec gst_ticodec_codecs[] = { -+ -+ /* Audio Decoders */ -+ { -+ "AAC Audio Decoder", /* String name of codec used by plugin */ -+ "aachedec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Video Decoders */ -+ { -+ "H.264 Video Decoder", /* String name of codec used by plugin */ -+ "h264dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, { -+ "MPEG4 Video Decoder", /* String name of codec used by plugin */ -+ "mpeg4dec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Image Decoders */ -+ { -+ "JPEG Image Decoder", /* String name of codec used by plugin */ -+ "jpegdec", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Video Encoders */ -+ { -+ "H.264 Video Encoder", /* String name of codec used by plugin */ -+ "h264enc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ /* Image Encoders */ -+ { -+ "JPEG Image Encoder", /* String name of codec used by plugin */ -+ "jpegenc", /* String name of codec used by CE */ -+ codecServer /* Engine that contains this codec */ -+ }, -+ -+ { NULL } -+}; -+ -+ -+/****************************************************************************** -+ * Custom ViM Settings for editing this file -+ ******************************************************************************/ -+#if 0 -+ Tabs (use 4 spaces for indentation) -+ vim:set tabstop=4: /* Use 4 spaces for tabs */ -+ vim:set shiftwidth=4: /* Use 4 spaces for >> operations */ -+ vim:set expandtab: /* Expand tabs into white spaces */ -+#endif -diff --git a/src/gsttidmaivideosink.c b/src/gsttidmaivideosink.c -index 65e0406..1c365e4 100644 ---- a/src/gsttidmaivideosink.c -+++ b/src/gsttidmaivideosink.c -@@ -52,7 +52,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ( - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS --#if defined(Platform_omapl138) -+#if defined(Platform_omapl138) || defined(Platform_omapl137) - ("video/x-raw-rgb, " - "bpp=(int)16, " - "depth=(int)16, " -@@ -687,7 +687,7 @@ static int gst_tidmaivideosink_videostd_get_attrs(VideoStd_Type videoStd, - vattrs->framerate = 60; - break; - -- #if defined(Platform_omapl138) -+ #if defined(Platform_omapl138) || defined(Platform_omapl137) - case VideoStd_QVGA: - vattrs->framerate = 30; - break; -@@ -1077,6 +1077,12 @@ static gboolean gst_tidmaivideosink_set_display_attrs(GstTIDmaiVideoSink *sink, - sink->dAttrs.colorSpace = colorSpace; - break; - #endif -+ #if defined(Platform_omapl137) -+ case Cpu_Device_OMAPL137: -+ sink->dAttrs = Display_Attrs_OMAPL137_OSD_DEFAULT; -+ sink->dAttrs.colorSpace = colorSpace; -+ break; -+ #endif - default: - sink->dAttrs = Display_Attrs_DM6446_DM355_VID_DEFAULT; - break; -diff --git a/src/gsttividenc1.c b/src/gsttividenc1.c -index 60bf9e4..74a738f 100644 ---- a/src/gsttividenc1.c -+++ b/src/gsttividenc1.c -@@ -1491,6 +1491,9 @@ static gboolean gst_tividenc1_codec_start (GstTIVidenc1 *videnc1) - #if defined(Platform_omapl138) - case Cpu_Device_OMAPL138: - #endif -+ #if defined(Platform_omapl137) -+ case Cpu_Device_OMAPL137: -+ #endif - case Cpu_Device_DM6446: - params.inputChromaFormat = XDM_YUV_422ILE; - break; --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/0004-gstreamer-ti-dm6467-usesinglecsserver.patch b/recipes/ti/gstreamer-ti/0004-gstreamer-ti-dm6467-usesinglecsserver.patch deleted file mode 100644 index eac35766f1..0000000000 --- a/recipes/ti/gstreamer-ti/0004-gstreamer-ti-dm6467-usesinglecsserver.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 35f013c24fb78d6ae7257abb4b4ed5f356cac36b Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 05:27:41 -0500 -Subject: [PATCH] gstreamer ti dm6467 usesinglecsserver - ---- - src/gstticodecplugin_dm6467.cfg | 24 +++++++----------------- - 1 files changed, 7 insertions(+), 17 deletions(-) - -diff --git a/src/gstticodecplugin_dm6467.cfg b/src/gstticodecplugin_dm6467.cfg -index a141f03..9e64775 100644 ---- a/src/gstticodecplugin_dm6467.cfg -+++ b/src/gstticodecplugin_dm6467.cfg -@@ -29,25 +29,15 @@ TraceUtil.attrs = TraceUtil.SOCRATES_TRACING; - * ======== Engine Configuration ======== - */ - var Engine = xdc.useModule('ti.sdo.ce.Engine'); --var decodeEngine = Engine.createFromServer( -- "decode", -- "./decodeCombo.x64P", -- "ti.sdo.servers.decode" -+var demoEngine = Engine.createFromServer( -+ "codecServer", -+ "./bin/cs.x64P", -+ "ti.sdo.server.cs" - ); --var encodeEngine = Engine.createFromServer( -- "encode", -- "./encodeCombo.x64P", -- "ti.sdo.servers.encode" -- ); -- --var encpath = "" + java.lang.System.getenv("ENCODE_COMBO"); --if (encpath != "" && encpath != "null") { -- encodeEngine.server = java.lang.System.getenv("ENCODE_COMBO"); --} - --var decpath = "" + java.lang.System.getenv("DECODE_COMBO"); --if (decpath != "" && decpath != "null") { -- decodeEngine.server = java.lang.System.getenv("DECODE_COMBO"); -+var combopath = "" + java.lang.System.getenv("CODEC_SERVER"); -+if (combopath != "" && combopath != "null") { -+ demoEngine.server = java.lang.System.getenv("CODEC_SERVER"); - } - - /* Load support for the 'Davinci Multimedia Application Interface' modules */ --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/0005-remove-mp3-mime-type.patch b/recipes/ti/gstreamer-ti/0005-remove-mp3-mime-type.patch deleted file mode 100644 index 90cdc6e442..0000000000 --- a/recipes/ti/gstreamer-ti/0005-remove-mp3-mime-type.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 193b6fe6bca945b3c69d600ebcddd7639aff8f25 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 05:29:17 -0500 -Subject: [PATCH] remove mp3 mime type - -This patch removes mp3 decoder cap from auddec elements. mp3 decoder is not -part of tspa combo. If you are adding mp3 decoder support in your combo then -do not apply this patch. ---- - src/gsttiauddec.c | 2 +- - src/gsttiauddec1.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/gsttiauddec.c b/src/gsttiauddec.c -index 2df2464..337cb0f 100644 ---- a/src/gsttiauddec.c -+++ b/src/gsttiauddec.c -@@ -85,7 +85,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ("audio/mpeg, " -- "mpegversion = (int) { 1, 4 }") -+ "mpegversion = (int) { 4 }") - ); - - /* Constants */ -diff --git a/src/gsttiauddec1.c b/src/gsttiauddec1.c -index 6e56f4b..bf121e3 100644 ---- a/src/gsttiauddec1.c -+++ b/src/gsttiauddec1.c -@@ -85,7 +85,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ("audio/mpeg, " -- "mpegversion = (int) { 1, 4 }") -+ "mpegversion = (int) { 4 }") - ); - - /* Define source (output) pad capabilities. Currently, RAW is supported. */ --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/0006-gstreamer-ti-tracker-462.patch b/recipes/ti/gstreamer-ti/0006-gstreamer-ti-tracker-462.patch deleted file mode 100644 index 3fd1ac272a..0000000000 --- a/recipes/ti/gstreamer-ti/0006-gstreamer-ti-tracker-462.patch +++ /dev/null @@ -1,83 +0,0 @@ -From e227c83e6b857c7b87758741e0ab7a8b8c424a50 Mon Sep 17 00:00:00 2001 -From: Brijesh Singh <bksingh@ti.com> -Date: Sun, 9 May 2010 05:34:03 -0500 -Subject: [PATCH] gstreamer ti tracker 462 - ---- - src/gsttividdec.c | 10 ++++++++-- - src/gsttividdec2.c | 10 ++++++++-- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/src/gsttividdec.c b/src/gsttividdec.c -index e3714d6..51da81d 100644 ---- a/src/gsttividdec.c -+++ b/src/gsttividdec.c -@@ -83,7 +83,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ("video/mpeg, " -- "mpegversion=(int){ 2, 4 }, " /* MPEG versions 2 and 4 */ -+ "mpegversion=(int){ 2, 4 }, " /* MPEG versions 2 and 4 */ - "systemstream=(boolean)false, " - "framerate=(fraction)[ 0, MAX ], " - "width=(int)[ 1, MAX ], " -@@ -91,7 +91,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - "video/x-h264, " /* H264 */ - "framerate=(fraction)[ 0, MAX ], " - "width=(int)[ 1, MAX ], " -- "height=(int)[ 1, MAX ]" -+ "height=(int)[ 1, MAX ] ;" -+ "video/x-xvid" /* XVID */ - ) - ); - -@@ -606,6 +607,11 @@ static gboolean gst_tividdec_set_sink_caps(GstPad *pad, GstCaps *caps) - codec = gst_ticodec_get_codec("H.264 Video Decoder"); - } - -+ /* XVID Decode */ -+ else if (!strcmp(mime, "video/x-xvid")) { -+ codec = gst_ticodec_get_codec("MPEG4 Video Decoder"); -+ } -+ - /* Mime type not supported */ - else { - GST_ELEMENT_ERROR(viddec, STREAM, NOT_IMPLEMENTED, -diff --git a/src/gsttividdec2.c b/src/gsttividdec2.c -index 79b28a5..6bf421b 100644 ---- a/src/gsttividdec2.c -+++ b/src/gsttividdec2.c -@@ -84,7 +84,7 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - GST_PAD_ALWAYS, - GST_STATIC_CAPS - ("video/mpeg, " -- "mpegversion=(int){ 2, 4 }, " /* MPEG versions 2 and 4 */ -+ "mpegversion=(int){ 2, 4 }, " /* MPEG versions 2 and 4 */ - "systemstream=(boolean)false, " - "framerate=(fraction)[ 0, MAX ], " - "width=(int)[ 1, MAX ], " -@@ -92,7 +92,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE( - "video/x-h264, " /* H264 */ - "framerate=(fraction)[ 0, MAX ], " - "width=(int)[ 1, MAX ], " -- "height=(int)[ 1, MAX ]" -+ "height=(int)[ 1, MAX ] ;" -+ "video/x-xvid" /* XVID */ - ) - ); - -@@ -616,6 +617,11 @@ static gboolean gst_tividdec2_set_sink_caps(GstPad *pad, GstCaps *caps) - codec = gst_ticodec_get_codec("H.264 Video Decoder"); - } - -+ /* XVID Decode */ -+ else if (!strcmp(mime, "video/x-xvid")) { -+ codec = gst_ticodec_get_codec("MPEG4 Video Decoder"); -+ } -+ - /* Mime type not supported */ - else { - GST_ELEMENT_ERROR(viddec2, STREAM, NOT_IMPLEMENTED, --- -1.5.4.3 - diff --git a/recipes/ti/gstreamer-ti/dm365-evm/gst-ti.sh b/recipes/ti/gstreamer-ti/dm365-evm/gst-ti.sh deleted file mode 100644 index 5467a67be0..0000000000 --- a/recipes/ti/gstreamer-ti/dm365-evm/gst-ti.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - -# Disable XDM 1.x audio decoder -export GST_TI_TIAuddec1_DISABLE=1 - diff --git a/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh b/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh index c70bee1e30..32201b6bce 100644 --- a/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh +++ b/recipes/ti/gstreamer-ti/dm365-evm/loadmodules.sh @@ -1,37 +1,27 @@ #!/bin/sh -# -# Default DM365 Memory Map 128 MB -# -# Start Addr Size Description -# ---------------------------------------------------------------- -# 0x00001000 32K ARM926 TCM memory used by platinum codec -# 0x80000000 48 MB Linux -# 0x83000000 12 MB Video driver memory (Linux) -# 0x83C00000 68 MB CMEM -# 0x88000000 BOTTOM ADDRESS -# - rmmod cmemk 2>/dev/null +rmmod irqk 2>/dev/null +rmmod edmak 2>/dev/null +rmmod dm365mmap 2>/dev/null # Pools configuration -modprobe cmemk phys_start=0x83C00000 phys_end=0x88000000 pools=1x16539648,1x4841472,4x1843200,14x1646592,1x282624,1x176128,1x147456,1x69632,1x61440,1x32768,2x20480,1x16384,1x12288,4x8192,69x4096 allowOverlap=1 phys_start_1=0x00001000 phys_end_1=0x00008000 pools_1=1x28672 +modprobe cmemk phys_start=0x84d00000 phys_end=0x88000000 pools=1x16539648,1x4841472,4x1843200,14x1646592,1x282624,1x176128,1x147456,1x69632,1x61440,1x32768,2x20480,1x12288,1x8192,72x4096 # Decode + Display -#modprobe cmemk phys_start=0x83c00000 phys_end=0x88000000 pools=1x16539648,1x4841472,14x1646592,1x282624,1x176128,1x147456,1x69632,1x61440,1x32768,2x20480,1x12288,1x8192,64x4096 +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=1x16539648,1x4841472,14x1646592,1x282624,1x176128,1x147456,1x69632,1x61440,1x32768,2x20480,1x12288,1x8192,64x4096 # Capture + Encode -#modprobe cmemk phys_start=0x83c00000 phys_end=0x88000000 pools=1x3112960,1x2764800,3x1536000,1x65536,1x61440,1x49152,1x20480,1x16384,2x8192,87x4096 +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=1x3112960,1x2764800,3x1536000,1x65536,1x61440,1x49152,1x20480,1x16384,2x8192,87x4096 # Resizer -#modprobe cmemk phys_start=0x83c00000 phys_end=0x88000000 pools=3x1843200 +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=3x1843200 # Non-accel display -#modprobe cmemk phys_start=0x83c00000 phys_end=0x88000000 pools=1x1843200 +#insmod cmemk.ko phys_start=0x83c00000 phys_end=0x88000000 pools=1x1843200 -modprobe irqk +modprobe irqk modprobe edmak modprobe dm365mmap rm -f /dev/dm365mmap mknod /dev/dm365mmap c `awk "\\$2==\"dm365mmap\" {print \\$1}" /proc/devices` 0 - diff --git a/recipes/ti/gstreamer-ti/gst-ti.sh b/recipes/ti/gstreamer-ti/gst-ti.sh deleted file mode 100644 index 9fd904ddc3..0000000000 --- a/recipes/ti/gstreamer-ti/gst-ti.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# Disable XDM 0.9 elements -export GST_TI_TIViddec_DISABLE=1 -export GST_TI_TIAuddec_DISABLE=1 -export GST_TI_TIVidenc_DISABLE=1 -export GST_TI_TIImgdec_DISABLE=1 -export GST_TI_TIImgenc_DISABLE=1 - diff --git a/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh b/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh index da844f4f62..788b18ad45 100644 --- a/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh +++ b/recipes/ti/gstreamer-ti/gstreamer-ti-rc.sh @@ -6,8 +6,7 @@ load_module() { echo echo -n "Running /usr/share/ti/gst/<platform>/loadmodule.sh" - echo " (skipped)" - # /usr/share/ti/gst/<platform>/loadmodule.sh + /usr/share/ti/gst/<platform>/loadmodule.sh } case "$1" in diff --git a/recipes/ti/gstreamer-ti/mpeg2-caps.patch b/recipes/ti/gstreamer-ti/mpeg2-caps.patch deleted file mode 100644 index c8246579f2..0000000000 --- a/recipes/ti/gstreamer-ti/mpeg2-caps.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 5e5fe9fa15ceb0abae90c8f857f40d1791e7d2d4 Mon Sep 17 00:00:00 2001 -From: don.darling <don.darling@24075187-2e39-4e88-bbb8-bc8aa768f540> -Date: Mon, 24 May 2010 21:24:12 +0000 -Subject: Create source caps information for MPEG-2 streams in TIVidenc1. - -If you don't generate this caps information, you will also get errors while -encoding that look like this: - -(gst-launch-0.10:1580): GStreamer-CRITICAL **: gst_caps_unref: assertion `caps != NULL' failed - -The fact that source caps information was never generated for MPEG-2 looks like -an oversight -- the static caps for TIVidenc1 already allowed MPEG-2. - -git-svn-id: https://gstreamer.ti.com/svn/gstreamer_ti/trunk@647 24075187-2e39-4e88-bbb8-bc8aa768f540 ---- -diff --git a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c -index 2e1fb31..9749459 100644 ---- a/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c -+++ b/gstreamer_ti/ti_build/ticodecplugin/src/gsttividenc1.c -@@ -724,10 +724,13 @@ static gboolean gst_tividenc1_set_source_caps( - gboolean ret; - GstPad *pad; - char *string; -- GstTICodec *h264Codec = NULL, *mpeg4Codec = NULL; -+ GstTICodec *h264Codec = NULL; -+ GstTICodec *mpeg4Codec = NULL; -+ GstTICodec *mpeg2Codec = NULL; - - h264Codec = gst_ticodec_get_codec("H.264 Video Encoder"); - mpeg4Codec = gst_ticodec_get_codec("MPEG4 Video Encoder"); -+ mpeg2Codec = gst_ticodec_get_codec("MPEG2 Video Encoder"); - - pad = videnc1->srcpad; - -@@ -754,6 +757,24 @@ static gboolean gst_tividenc1_set_source_caps( - g_free(string); - } - -+ /* Create MPEG-2 source cap */ -+ if (mpeg2Codec && (!strcmp(mpeg2Codec->CE_CodecName, videnc1->codecName))) { -+ gint mpegversion = 2; -+ -+ caps = -+ gst_caps_new_simple("video/mpeg", -+ "mpegversion", G_TYPE_INT, mpegversion, -+ "framerate", GST_TYPE_FRACTION, videnc1->framerateNum, -+ videnc1->framerateDen, -+ "width", G_TYPE_INT, dim.width, -+ "height", G_TYPE_INT, dim.height, -+ NULL); -+ -+ string = gst_caps_to_string(caps); -+ GST_LOG("setting source caps to mpeg2: %s", string); -+ g_free(string); -+ } -+ - /* Create MPEG4 source cap */ - if (mpeg4Codec && (!strcmp(mpeg4Codec->CE_CodecName, videnc1->codecName))) { - gint mpegversion = 4; --- -cgit v0.8.3.1-30-gff3a diff --git a/recipes/ti/gstreamer-ti/omap3/gstreamer-ti-rc.sh b/recipes/ti/gstreamer-ti/omap3/gstreamer-ti-rc.sh deleted file mode 100644 index cd9358f50c..0000000000 --- a/recipes/ti/gstreamer-ti/omap3/gstreamer-ti-rc.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# configure kernel modules to run gst-ti plugins elements -# - -load_module() { - echo - echo -n "Running /usr/share/ti/gst/omap3530/loadmodules.sh" - sh /usr/share/ti/gst/omap3530/loadmodules.sh -} - -unload_module() { - rmmod cmemk - rmmod lpm_omap3530 - rmmod dsplinkk - rmmod sdmak -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - ;; - restart) - echo -n "Unloading kernel module ..." - unload_module - echo " done" - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/omap3/loadmodules.sh b/recipes/ti/gstreamer-ti/omap3/loadmodules.sh index e4d592fff7..eb7588347b 100644 --- a/recipes/ti/gstreamer-ti/omap3/loadmodules.sh +++ b/recipes/ti/gstreamer-ti/omap3/loadmodules.sh @@ -1,11 +1,13 @@ #!/bin/sh - # # CMEM Allocation # 1x5250000 Circular buffer # 6x829440,1x691200 Video buffers (max D1 PAL) # 1x345600 Underlying software components (codecs, etc.) # 1x1 Dummy buffer used during final flush + +rmmod cmemk 2>/dev/null + modprobe cmemk allowOverlap=1 phys_start=0x86300000 phys_end=0x87300000 \ pools=1x5250000,6x829440,1x345600,1x691200,1x1 diff --git a/recipes/ti/gstreamer-ti/omap3evm/gstreamer-ti-rc.sh b/recipes/ti/gstreamer-ti/omap3evm/gstreamer-ti-rc.sh deleted file mode 100644 index da844f4f62..0000000000 --- a/recipes/ti/gstreamer-ti/omap3evm/gstreamer-ti-rc.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# configure kernel modules to run gst-ti plugins elements -# - -load_module() { - echo - echo -n "Running /usr/share/ti/gst/<platform>/loadmodule.sh" - echo " (skipped)" - # /usr/share/ti/gst/<platform>/loadmodule.sh -} - -case "$1" in - start) - echo -n "Loading kernel modules for gstreamer-ti... " - load_module - echo " done" - ;; - stop) - echo "Nothing to do" - ;; - restart) - echo "Nothing to do" - ;; - *) - echo "$0 <start/stop/restart>" - ;; -esac - diff --git a/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh b/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh index 64d3c933c4..95cfc3da3f 100644 --- a/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh +++ b/recipes/ti/gstreamer-ti/omapl138/loadmodules.sh @@ -3,6 +3,8 @@ # configure kernel modules for TI DSP based gstreamer plugin # +rmmod cmemk 2>/dev/null + modprobe cmemk phys_start=0xC2200000 phys_end=0xC3200000 \ pools=1x5250000,3x1048576,3x829440,1x256000,4x131072 diff --git a/recipes/ti/gstreamer-ti_svn.bb b/recipes/ti/gstreamer-ti_svn.bb index bb314edc15..baec23208b 100644 --- a/recipes/ti/gstreamer-ti_svn.bb +++ b/recipes/ti/gstreamer-ti_svn.bb @@ -4,18 +4,10 @@ PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" -SRCREV = "612" +SRCREV = "811" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ - file://0001-gstreamer-ti-tracker-1055.patch \ - file://0002-add-omapl138-support.patch \ - file://0003-add-omapl137-support.patch \ - file://0004-gstreamer-ti-dm6467-usesinglecsserver.patch \ - file://0005-remove-mp3-mime-type.patch \ - file://0006-gstreamer-ti-tracker-462.patch \ - file://mpeg2-caps.patch;striplevel=4 \ file://gstreamer-ti-rc.sh \ - file://gst-ti.sh \ " # use local loadmodules.sh for these platform @@ -23,10 +15,9 @@ SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto= SRC_URI_append_dm365 = " file://loadmodules.sh" SRC_URI_append_omapl137 = " file://loadmodules.sh" SRC_URI_append_omapl138 = " file://loadmodules.sh " - SRC_URI_append_omap3 = " file://loadmodules.sh " + # apply omapdmaifbsink patch on omap3 platform # NOTE: this patch need's X11 header/libs -SRC_URI_append_omap3 = " file://0007-add-omapdmaifbsink.patch" - +#SRC_URI_append_omap3 = " file://0001-add-omapdmaifbsink.patch" |