diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-08-26 11:34:23 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-08-26 11:34:23 +0200 |
| commit | bac5eef9c8a73672ee114926011addabb36610eb (patch) | |
| tree | fbfc79e876b7e18a0871099a909035d50303e58c | |
| parent | af56cd467bcc76f5499199fb1f14252abe1e1e2a (diff) | |
dvsdk: merge in new versions from arago and clean them up a bit
41 files changed, 756 insertions, 608 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index 46ac3884cc..4fd52bbef2 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2730,6 +2730,10 @@ sha256=18f72b922a9a346f6c43b20fd86eba76cfd27a8d118ea32fa879050ddebe0267 md5=64f61b08d091625c0912cb9de33242af sha256=506e07715028811b8d945c85c54ae07bc33bdd8afff1611cbb30d154ba86d04e +[http://install.source.dir.com/bios_setuplinux_5_33_04.bin] +md5=fcffe1618f20024fd6580f47cdc0059b +sha256=2c1e7feec569a19d3093b136da6aa03574f94052810fe7a78cc81eb37adda24b + [ftp://ftp.gnu.org/gnu/bison/bison-2.0.tar.gz] md5=c17f964fd5504b88b07a183420de25e3 sha256=31b816846903d319a6f6cd1c9aada5ff83914206cb7df69c235ae909785109a1 @@ -4282,6 +4286,10 @@ sha256=8b718c344cf19417447cbc16867d2e04434654c13b330598b96720ead146b961 md5=0aa2f94c39123f1a0352983e5366179c sha256=4bab529afa00cafde3bc5df2769578c88438f80c5152d4257cd0e86986f95bc4 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/dvsdk/DVSDK_3_00/latest//exports/cs1omap3530_setuplinux_1_00_01.bin] +md5=779415872c771b580e4c6d10346b3a79 +sha256=0903c37aaa9ced2c12a9e7d4a418b7d57d5a92a0f1451afd29f70bd0da240bc8 + [http://downloads.sourceforge.net/cscope/cscope-15.5.tar.gz] md5=beb6032a301bb11524aec74bfb5e4840 sha256=be49cda0a9d33add89cabe0dfcef436a2863a7b0b833767875e0b7a6e8b4c4d1 @@ -4978,6 +4986,10 @@ sha256=39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4 md5=f6221188bea76b7aaf0c45e9bcf26329 sha256=f1a6dea51be9798903a0543fb50f463b0594b1f11b897bc50e40825fb7527c61 +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/S1SDKLNX/DVSDK_2_00/exports/dm6446_codecs_setuplinux_2_00_00_22.bin] +md5=2ce99015bb1ed1df0491403c5e8d99fb +sha256=6467ea4854abbff3cbc224df1f163d01c7fb387f15483129a40a1f68e6742b62 + [http://dmalloc.com/releases/dmalloc-5.5.2.tgz] md5=f92e5606c23a8092f3d5694e8d1c932e sha256=d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a @@ -5214,6 +5226,10 @@ sha256=15dd793e32fc9aba1266c2ccb8e98856c61be2e9de214285aa09152a47da1836 md5=2b53c067c683266379dddbb38e65cb45 sha256=b1a0508444241c61585321eaadc32f476ef441f267636fbd0fb2f0c7ebf0fcbb +[http://install.source.dir.com/dsplink_1_61_03.tar.gz] +md5=9df12389c8b955b5f8cfefe6df20b1d6 +sha256=1037b9cb872590356d055dbf8006e25d68370721e0e5b4518529495db6de70d9 + [http://home.comcast.net/~SCSIguy/SCSI_FAQ/RMiller_Tools/ftp/dt/dt-source.tar.gz] md5=5776233a2d301a50b314306538257a45 sha256=2f27fda643093e07161d128a9cc23cf30c0387f87cd911b904d84217f60a9a2a @@ -21978,6 +21994,10 @@ sha256=e8890518a8818e72d44daa1448246df8a6b5958215835f4c72abc833077d1f68 md5=86a847f3128a43a9cf23b7029a656f50 sha256=0b0a2807a6a96918ac799a86094ec3e8e2c892be0fd679a4232c2a77f2f61732 +[http://download.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2] +md5=ceef10579a75c92483171f3bd7f77df2 +sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7 + [http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2] md5=ceef10579a75c92483171f3bd7f77df2 sha256=3467ce2f70a9a3fbbf8d4d97355a2f334a6351baa6722251403637a8cbebf6b7 @@ -23762,6 +23782,10 @@ sha256=6b964fb220a46438adf6ec37082da66332a3ce74ca4913b863b17d9ab720681f md5=5bfeaacb628b56005a8865a177af01e4 sha256=fcfa98e2c8ff18e8e6d5b2ff5e94f20b719150fe7bb4a130cfa360e02df2156a +[http://install.source.dir.com/ti_cgt_c6000_6.1.9_setup_linux_x86.bin] +md5=8354845032c0ce8e3da3f250505d0e21 +sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0 + [http://www.openzaurus.org/download/3.5.4/sources/tickypip-0.1.2.tar.gz] md5=5a085296b1147fe970a256a9b2d0f91f sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34 @@ -25634,6 +25658,10 @@ sha256=4511dc4df6ebb320a4a516b3b712c86f6924e5ee9832618f58ebba06c64712ea md5=8f0f8af016b97fb612ec11afaaf5a9e7 sha256=d398bfb7a5d9657b802db835c28db892ec8fe54cf332420edef0b3ba1c231fcb +[http://software-dl.ti.com/dsps/dsps_public_sw/sdo_sb/targetcontent/rtsc/xdctools_3_15//exports/xdctools_setuplinux_3_15_01_59.bin] +md5=c7cd094cdc49459018b6f0e1eb95af30 +sha256=0d5fbc8cfdaa968090ad11b0b84cfb122e2a1c54c4d261fd722b27c6d6972c23 + [http://gpe.linuxtogo.org/download/source/xdemineur-2.1.1.tar.bz2] md5=b3884eaec59a63691f66bc29ce57a56d sha256=75378ad3eacbe32c625de3b4af3e1f6fc9772ab45c1cd1393483d95ac4da3b22 diff --git a/recipes/dvsdk/README b/recipes/dvsdk/README new file mode 100644 index 0000000000..fa1b481f68 --- /dev/null +++ b/recipes/dvsdk/README @@ -0,0 +1,30 @@ +Depending on platform you need to download one or more components from the external URL and put in downloads directory. + +DM355 +----- + - Code Engine 2.24 + +OMAP3530/DM6446 +------ + - Code Engine 2.24 + - DSP/BIOS Link for Linux 1.61.03 + - DSP/BIOS 5.33.04 + - C6000 Code Generation Tools v6.1.9 Linux + +URL's: +------ +* CE 2.24 (codec_engine_2_24.tar.gz) + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/CE/ce_2_24/index.html + +* DSP/BIOS 5.33.04 (bios_setuplinux_5_33_04.bin) + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/bios/bios_5_33/bios_5_33_04/index_external.html + +* DSP/BIOS Link for Linux 1.61.03 (dsplink_1_61_03.tar.gz) + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/link/link_1_60/index.html + +* C6000 Code Generation Tools v6.1.9 Linux (ti_cgt_c6000_6.1.9_setup_linux_x86.bin) + https://www-a.ti.com/downloads/sds_support/TICodegenerationTools/download.htm + +* Generic download URI + http://software-dl.ti.com/dsps/dsps_registered_sw/sdo_sb/targetcontent/ + diff --git a/recipes/dvsdk/files/cmem-remove-show-pte-function.patch b/recipes/dvsdk/files/cmem-remove-show-pte-function.patch new file mode 100644 index 0000000000..2d0fe672ef --- /dev/null +++ b/recipes/dvsdk/files/cmem-remove-show-pte-function.patch @@ -0,0 +1,56 @@ +--- codec_engine_2_23_01/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.c 2009-04-20 14:43:31.000000000 -0400 ++++ codec_engine_2_23_01.new/cetools/packages/ti/sdo/linuxutils/cmem/src/module/cmemk.c 2009-07-28 10:48:38.000000000 -0400 +@@ -1018,53 +1018,6 @@ + } + + +-/* +- * This is useful to dump out the page tables associated with +- * 'addr' in mm 'mm'. +- */ +-void show_pte(struct mm_struct *mm, unsigned long addr) +-{ +- pgd_t *pgd; +- +- if (!mm) +- mm = &init_mm; +- +- printk(KERN_ALERT "pgd = %p\n", mm->pgd); +- pgd = pgd_offset(mm, addr); +- printk(KERN_ALERT "[%08lx] *pgd=%08lx", addr, pgd_val(*pgd)); +- +- do { +- pmd_t *pmd; +- pte_t *pte; +- +- if (pgd_none(*pgd)) +- break; +- +- if (pgd_bad(*pgd)) { +- printk("(bad)"); +- break; +- } +- +- pmd = pmd_offset(pgd, addr); +- +- if (pmd_none(*pmd)) +- break; +- +- if (pmd_bad(*pmd)) { +- printk("(bad)"); +- break; +- } +- +- /* We must not map this if we have highmem enabled */ +- pte = pte_offset_map(pmd, addr); +- printk(", *pte=%08lx", pte_val(*pte)); +- printk(", *ppte=%08lx", pte_val(pte[-PTRS_PER_PTE])); +- pte_unmap(pte); +- } while(0); +- +- printk("\n"); +-} +- + static int set_noncached(struct vm_area_struct *vma) + { + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); diff --git a/recipes/dvsdk/files/dvsdk-rules/Makefile b/recipes/dvsdk/files/dvsdk-rules/Makefile index edb74e0999..bc1eabf249 100644 --- a/recipes/dvsdk/files/dvsdk-rules/Makefile +++ b/recipes/dvsdk/files/dvsdk-rules/Makefile @@ -6,20 +6,20 @@ REPOSITORIES:=$(addsuffix /packages, $(COMPONENTS)) CHECKLIST:=$(REPOSITORIES) $(CODEGEN_INSTALL_DIR)/bin/cl6x $(MVTOOL_PREFIX)gcc $(LINUXKERNEL_INSTALL_DIR)/Documentation $(DEMO_INSTALL_DIR)/$(PLATFORM) $(PSP_INSTALL_DIR)/docs -.PHONY: all clean everything clobber help cmem cmem_clean dmai dmai_clean demos demos_clean examples examples_clean dvtb dvtb_clean dm355mm dm355mm_clean dsplink dsplink_arm dsplink_dsp dsplink_samples dsplink_clean codecs codecs_clean linux linux_clean psp_examples psp_clean info check install +.PHONY: all clean everything clobber help cmem cmem_clean dmai dmai_clean dm355mm dm355mm_clean dsplink dsplink_arm dsplink_dsp dsplink_samples dsplink_clean codecs codecs_clean linux linux_clean info check install #============================================================================== # Set up platform dependent variables. #============================================================================== ifeq ($(PLATFORM),dm6446) -LINUXKERNEL_CONFIG=davinci_dm644x_defconfig +LINUXKERNEL_CONFIG=davinci_all_defconfig LINUXSAMPLES_PLATFORM=dm644x DSPLINK_CONFIG=--platform=DAVINCI --nodsp=1 --dspcfg_0=DM6446GEMSHMEM --dspos_0=DSPBIOS5XX --gppos=MVL5G --comps=ponslrm DSPLINK_MODULE=$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/DAVINCI/RELEASE/dsplinkk.ko DMAI_PLATFORM=dm6446_al else ifeq ($(PLATFORM),dm6467) -LINUXKERNEL_CONFIG=davinci_dm6467_defconfig +LINUXKERNEL_CONFIG=davinci_all_defconfig LINUXSAMPLES_PLATFORM=dm646x DSPLINK_CONFIG=--platform=DAVINCIHD --nodsp=1 --dspcfg_0=DM6467GEMSHMEM --dspos_0=DSPBIOS5XX --gppos=MVL5G --comps=ponslrm DSPLINK_MODULE=$(LINK_INSTALL_DIR)/packages/dsplink/gpp/export/BIN/Linux/DAVINCIHD/RELEASE/dsplinkk.ko @@ -38,22 +38,22 @@ endif #============================================================================== # The default build target. #============================================================================== -all: check cmem dm355mm dmai demos examples dvtb +all: check cmem dm355mm dmai #============================================================================== # Clean up the targets built by 'make all'. #============================================================================== -clean: cmem_clean dm355mm_clean dmai_clean demos_clean examples_clean dvtb_clean +clean: cmem_clean dm355mm_clean dmai_clean #============================================================================== # Build everything rebuildable. #============================================================================== -everything: check codecs linux dsplink psp_examples all +everything: check codecs linux dsplink all #============================================================================== # Clean up all targets. #============================================================================== -clobber: clean dsplink_clean linux_clean codecs_clean psp_clean +clobber: clean dsplink_clean linux_clean codecs_clean #============================================================================== # A help message target. @@ -63,48 +63,36 @@ help: @echo "Available build targets are:" @echo @echo " check : Make sure Rules.make is set up properly" - @echo " info : List versions of DVSDK components" + @echo " info : List versions of DVSDK components" @echo @echo " all : Build the components below" @echo " clean : Remove files generated by the 'all' target" @echo - @echo " cmem : Build the CMEM kernel module for $(PLATFORM)" - @echo " cmem_clean : Remove generated cmem files." + @echo " cmem : Build the CMEM kernel module for $(PLATFORM)" + @echo " cmem_clean : Remove generated cmem files." @echo - @echo " dmai : Build DMAI for $(PLATFORM)_al" - @echo " dmai_clean : Remove generated DMAI files." - @echo - @echo " demos : Build the DVSDK demos for $(PLATFORM)" - @echo " demos_clean : Remove generated DVSDK demo files." - @echo - @echo " examples : Build examples for $(PLATFORM)" - @echo " examples_clean : Build examples for $(PLATFORM)" - @echo - @echo " dvtb : Build DVTB for $(PLATFORM)" - @echo " dvtb_clean : Remove generated DVTB files" + @echo " dmai : Build DMAI for $(PLATFORM)_al" + @echo " dmai_clean : Remove generated DMAI files." @echo @echo " dm355mm : Build the dm355mm kernel module" - @echo " dm355mm_clean : Remove generated dm355mm files" + @echo " dm355mm_clean : Remove generated dm355mm files" @echo @echo "The following targets have to be explicitly built and cleaned:" @echo - @echo " everything : Rebuild everything including below targets" + @echo " everything : Rebuild everything including below targets" @echo " clobber : Remove all generated files" @echo @echo " dsplink : Configure and build DSP Link for $(PLATFORM) ARM and DSP" - @echo " dsplink_arm : Configure and build DSP Link for $(PLATFORM) ARM" - @echo " dsplink_dsp : Configure and build DSP Link for $(PLATFORM) DSP" - @echo " dsplink_samples : Build DSP Link ARM and DSP sample applications for $(PLATFORM)" - @echo " dsplink_clean : Remove generated DSP Link files" + @echo " dsplink_arm : Configure and build DSP Link for $(PLATFORM) ARM" + @echo " dsplink_dsp : Configure and build DSP Link for $(PLATFORM) DSP" + @echo " dsplink_samples : Build DSP Link ARM and DSP sample applications " + @echo " dsplink_clean : Remove generated DSP Link files" @echo @echo " codecs : Build codec servers for $(PLATFORM)" - @echo " codecs_clean : Remove generated codec server files" + @echo " codecs_clean : Remove generated codec server files" @echo @echo " linux : Build Linux kernel uImage for $(PLATFORM)" - @echo " linux_clean : Remove generated Linux kernel files" - @echo - @echo " psp_examples : Build Linux examples for $(PLATFORM)" - @echo " psp_clean : Build Linux examples for $(PLATFORM)" + @echo " linux_clean : Remove generated Linux kernel files" @echo @echo " install : Install binaries to $(EXEC_DIR)" @echo @@ -122,28 +110,6 @@ check: @CHECKLIST="$(CHECKLIST)" $(DVSDK_INSTALL_DIR)/bin/check.sh #============================================================================== -# Build the dvsdk demos for the configured platform. Also, an explicit cleanup -# target is defined. -#============================================================================== -demos: - $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM) - -demos_clean: - $(MAKE) -C $(DEMO_INSTALL_DIR)/$(PLATFORM) clean - -#============================================================================== -# Build the Digital Video Test Bench for the configured platform. Also, an -# explicit cleanup target is defined. -#============================================================================== -dvtb: - $(MAKE) -C $(DVTB_INSTALL_DIR) $(PLATFORM) - @echo - @echo "dvtb can be found under $(DVTB_INSTALL_DIR)/packages/ti/sdo/dvtb/$(PLATFORM)/bin" - -dvtb_clean: - $(MAKE) -C $(DVTB_INSTALL_DIR) clean - -#============================================================================== # Build the Linux kernel. Also, an explicit cleanup target is defined. #============================================================================== linux: @@ -156,17 +122,6 @@ linux_clean: $(MAKE) -C $(LINUXKERNEL_INSTALL_DIR) CROSS_COMPILE=$(MVTOOL_PREFIX) clean #============================================================================== -# Build the PSP Linux examples. Also, an explicit cleanup target is defined. -#============================================================================== -psp_examples: - $(MAKE) -C $(PSP_INSTALL_DIR)/examples PLATFORM=$(LINUXSAMPLES_PLATFORM) LINUXKERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) CROSS_COMPILE=$(MVTOOL_PREFIX) - @echo - @echo "PSP examples can be found under $(PSP_INSTALL_DIR)/examples/$(LINUXSAMPLES_PLATFORM)" - -psp_clean: - $(MAKE) -C $(PSP_INSTALL_DIR)/examples PLATFORM=$(LINUXSAMPLES_PLATFORM) LINUXKERNEL_INSTALL_DIR=$(LINUXKERNEL_INSTALL_DIR) clean - -#============================================================================== # Build the CMEM kernel module for the configured platform, and make sure the # kernel_binaries directory is kept in sync. Also, an explicit cleanup target # is defined. @@ -216,34 +171,24 @@ ifeq ($(PLATFORM),dm355) endif #============================================================================== -# Build the DVSDK examples for the configured platform. Also, an explicit -# cleanup target is defined. -#============================================================================== -examples: - $(MAKE) -C examples/$(PLATFORM) - -examples_clean: - $(MAKE) -C examples/$(PLATFORM) clean - -#============================================================================== # Build the Davinci Multimedia Application Interface for the configured # platform. Also, an explicit cleanup target is defined. #============================================================================== dmai: @$(MAKE) -C $(DMAI_INSTALL_DIR) PLATFORM=${DMAI_PLATFORM} \ CE_INSTALL_DIR_${DMAI_PLATFORM}=$(CE_INSTALL_DIR) \ - CODEC_INSTALL_DIR_${DMAI_PLATFORM}=$(CODEC_INSTALL_DIR) \ - LINK_INSTALL_DIR_${DMAI_PLATFORM}=$(LINK_INSTALL_DIR) \ - CMEM_INSTALL_DIR_${DMAI_PLATFORM}=$(CMEM_INSTALL_DIR) \ - FC_INSTALL_DIR_${DMAI_PLATFORM}=$(FC_INSTALL_DIR) \ - LPM_INSTALL_DIR_${DMAI_PLATFORM}=$(LPM_INSTALL_DIR) \ - XDAIS_INSTALL_DIR_${DMAI_PLATFORM}=$(XDAIS_INSTALL_DIR) \ - BIOS_INSTALL_DIR_${DMAI_PLATFORM}=$(BIOS_INSTALL_DIR) \ - LINUXLIBS_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXLIBS_INSTALL_DIR)\ - LINUXKERNEL_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXKERNEL_INSTALL_DIR) \ - CROSS_COMPILE_${DMAI_PLATFORM}=$(CSTOOL_PREFIX) \ - XDC_INSTALL_DIR_${DMAI_PLATFORM}=$(XDC_INSTALL_DIR) \ - EXEC_DIR_${DMAI_PLATFORM}=$(EXEC_DIR) all + CODEC_INSTALL_DIR_${DMAI_PLATFORM}=$(CODEC_INSTALL_DIR) \ + LINK_INSTALL_DIR_${DMAI_PLATFORM}=$(LINK_INSTALL_DIR) \ + CMEM_INSTALL_DIR_${DMAI_PLATFORM}=$(CMEM_INSTALL_DIR) \ + FC_INSTALL_DIR_${DMAI_PLATFORM}=$(FC_INSTALL_DIR) \ + LPM_INSTALL_DIR_${DMAI_PLATFORM}=$(LPM_INSTALL_DIR) \ + XDAIS_INSTALL_DIR_${DMAI_PLATFORM}=$(XDAIS_INSTALL_DIR) \ + BIOS_INSTALL_DIR_${DMAI_PLATFORM}=$(BIOS_INSTALL_DIR) \ + LINUXLIBS_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXLIBS_INSTALL_DIR)\ + LINUXKERNEL_INSTALL_DIR_${DMAI_PLATFORM}=$(LINUXKERNEL_INSTALL_DIR) \ + CROSS_COMPILE_${DMAI_PLATFORM}=$(CSTOOL_PREFIX) \ + XDC_INSTALL_DIR_${DMAI_PLATFORM}=$(XDC_INSTALL_DIR) \ + EXEC_DIR_${DMAI_PLATFORM}=$(EXEC_DIR) all @echo @echo "DMAI applications can be found under $(DMAI_INSTALL_DIR)/packages/ti/sdo/dmai/apps" diff --git a/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch b/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch new file mode 100644 index 0000000000..852e60adbc --- /dev/null +++ b/recipes/dvsdk/files/gstreamer-ti-tracker-824.patch @@ -0,0 +1,125 @@ +diff -uNr ticodecplugin/src/gstticodecplugin_omap3530.cfg ticodecplugin.new/src/gstticodecplugin_omap3530.cfg +--- ticodecplugin/src/gstticodecplugin_omap3530.cfg 2009-06-10 17:29:59.000000000 -0500 ++++ ticodecplugin.new/src/gstticodecplugin_omap3530.cfg 2009-08-07 16:17:24.000000000 -0500 +@@ -12,8 +12,6 @@ + * + */ + +-prog.build.platform = "ti.platforms.evm3530"; +- + /* Load the Codec Engine 'Operating System Abstraction Layer' */ + var osalGlobal = xdc.useModule('ti.sdo.ce.osal.Global'); + +@@ -27,21 +25,15 @@ + /* + * ======== Engine Configuration ======== + */ +-var Engine = xdc.useModule('ti.sdo.ce.Engine'); +-var encEngine = Engine.createFromServer( +- "encode", +- "./encodeCombo.x64P", +- "ti.sdo.servers.encode" +- ); +-var decEngine = Engine.createFromServer( +- "decode", +- "./decodeCombo.x64P", +- "ti.sdo.servers.decode" ++var Engine = xdc.useModule('ti.sdo.ce.Engine'); ++var demoEngine = Engine.createFromServer( ++ "codecServer", ++ "./bin/cs.x64P", ++ "ti.sdo.server.cs" + ); + + /* Load support for the DMAI module */ + var DMAI = xdc.loadPackage('ti.sdo.dmai'); + +-/* Load support for user space DMA */ +-var SCPY = xdc.useModule("ti.sdo.fc.scpy.SCPY"); +-var SDMA = xdc.useModule("ti.sdo.linuxutils.sdma.SDMA"); ++var SCPY = xdc.useModule('ti.sdo.fc.scpy.SCPY'); ++var SDMA = xdc.useModule('ti.sdo.linuxutils.sdma.SDMA'); +diff -uNr ticodecplugin/src/gstticodecs_omap3530.c ticodecplugin.new/src/gstticodecs_omap3530.c +--- ticodecplugin/src/gstticodecs_omap3530.c 2009-06-10 17:29:59.000000000 -0500 ++++ ticodecplugin.new/src/gstticodecs_omap3530.c 2009-08-07 16:17:24.000000000 -0500 +@@ -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,59 +31,55 @@ + { + "AAC Audio Decoder", /* String name of codec used by plugin */ + "aachedec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG1L2 Audio Decoder", /* String name of codec used by plugin */ + "mp3dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "MPEG1L3 Audio Decoder", /* String name of codec used by plugin */ + "mp3dec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ +- }, { +- "WMA Audio Decoder", /* String name of codec used by plugin */ +- "wmadec", /* String name of codec used by CE */ +- decodeEngine /* Engine that contains this codec */ ++ 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 */ +- decodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, { + "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 */ +- decodeEngine /* Engine that contains this codec */ ++ 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 */ +- decodeEngine /* Engine that contains this codec */ ++ 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 */ +- encodeEngine /* 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 */ + }, + + /* Image Encoders */ + { + "JPEG Image Encoder", /* String name of codec used by plugin */ + "jpegenc", /* String name of codec used by CE */ +- encodeEngine /* Engine that contains this codec */ ++ codecServer /* Engine that contains this codec */ + }, + + { NULL } diff --git a/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch b/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch index 72a0ab319f..7c03641707 100644 --- a/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch +++ b/recipes/dvsdk/gstreamer-ti/codec_combo_directory_fix.patch @@ -21,8 +21,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6446.cfg ticodecplugin/src/ "./encodeCombo.x64P", "ti.sdo.servers.encode" ); -+encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; -+decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; ++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P"; ++ /* Load support for the 'Davinci Multimedia Application Interface' modules */ var DMAI = xdc.loadPackage('ti.sdo.dmai'); @@ -33,8 +33,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_dm6467.cfg ticodecplugin/src/ "./encodeCombo.x64P", "ti.sdo.servers.encode" ); -+encodeEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; -+decodeEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; ++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P"; ++ /* Load support for the 'Davinci Multimedia Application Interface' modules */ var DMAI = xdc.loadPackage('ti.sdo.dmai'); @@ -45,8 +45,8 @@ diff -Naur ticodecplugin.orig/src/gstticodecplugin_omap3530.cfg ticodecplugin/sr "./decodeCombo.x64P", "ti.sdo.servers.decode" ); -+encEngine.server = "/usr/share/ti-codec-combos/encodeCombo.x64P"; -+decEngine.server = "/usr/share/ti-codec-combos/decodeCombo.x64P"; ++codecServer.server = "/usr/share/ti-codec-combos/cs.x64P"; ++ /* Load support for the DMAI module */ var DMAI = xdc.loadPackage('ti.sdo.dmai'); diff --git a/recipes/dvsdk/gstreamer-ti_svn.bb b/recipes/dvsdk/gstreamer-ti_svn.bb index e1c4c1e2e9..7d13c7186a 100644 --- a/recipes/dvsdk/gstreamer-ti_svn.bb +++ b/recipes/dvsdk/gstreamer-ti_svn.bb @@ -1,47 +1,27 @@ DESCRIPTION = "Gstreamer plugin for TI Davinci and OMAP processors" +require ti-paths.inc + inherit autotools DEPENDS = "ti-dmai gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly" # Fetch source from svn repo -SRCREV = "308" +SRCREV = "285" SRC_URI = "svn://gforge.ti.com/svn/gstreamer_ti/trunk;module=gstreamer_ti;proto=https;user=anonymous;pswd='' \ -file://codec_combo_directory_fix.patch;patch=1 \ - " + file://gstreamer-ti-tracker-824.patch;patch=1 \ +" # Again, no '.' in PWD allowed :( -PR = "r24" +PR = "r28" PV = "svnr${SRCREV}" S = "${WORKDIR}/gstreamer_ti/ti_build/ticodecplugin" -installdir = "${datadir}/ti" - -META_SDK_PATH ?= "${CROSS_DIR}" |
