Merge pull request #6 from KirillSmirnov/master

Add webcam variants for all algorithms

Makefile

@@ -0,0 +1,7 @@
+all:
+	$(MAKE) -C trik/ov7670 $@
+	$(MAKE) -C trik/webcam $@
+
+clean:
+	$(MAKE) -C trik/ov7670 $@
+	$(MAKE) -C trik/webcam $@

README.md

@@ -1,5 +1,7 @@
-Build
-=====
-
-```
-make DEPOT_DSP=<path to TI tools>
+Build
+=====
+
+To build the project do:
+```
+make DEPOT=<path to TI tools>
+```

common.mk

@@ -0,0 +1,26 @@
+# your various installation directories
+ifeq ($(DEPOT),)
+$(error DEPOT variable is not set)
+endif
+
+BIOS_INSTALL_DIR    = $(DEPOT)/bios_6_37_05_35
+CE_INSTALL_DIR      = $(DEPOT)/codec_engine_3_23_00_07
+CG_INSTALL_DIR      = $(DEPOT)/ti-cgt-c6000_8.0.1
+CMEM_INSTALL_DIR    = $(DEPOT)/linuxutils_3_23_00_01
+FC_INSTALL_DIR      = $(DEPOT)/framework_components_3_24_02_15
+IMGLIB_INSTALL_DIR  = $(DEPOT)/c64plus-imglib_2_02_00_00
+IPC_INSTALL_DIR     = $(DEPOT)/ipc_1_25_03_15
+LINK_INSTALL_DIR    = $(DEPOT)/syslink_2_21_03_11
+OSAL_INSTALL_DIR    = $(DEPOT)/osal_1_24_00_09
+VLIB_INSTALL_DIR    = $(DEPOT)/vlib_c674x_3_1_0_9
+XDAIS_INSTALL_DIR   = $(DEPOT)/xdais_7_24_00_04
+XDC_INSTALL_DIR     = $(DEPOT)/xdctools_3_25_06_96
+
+CGTOOLS_C674 = $(CG_INSTALL_DIR)
+#uncomment this for verbose builds
+#XDCOPTIONS=v
+XDCARGS = CGTOOLS_C674=\"$(CGTOOLS_C674)\"
+
+THIS_PATH = $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
+XDCPATH   = $(CE_INSTALL_DIR)/packages;$(XDAIS_INSTALL_DIR)/packages;$(BIOS_INSTALL_DIR)/packages;$(LINK_INSTALL_DIR)/packages;$(IPC_INSTALL_DIR)/packages;$(FC_INSTALL_DIR)/packages;$(OSAL_INSTALL_DIR)/packages;$(CMEM_INSTALL_DIR)/packages;$(VLIB_INSTALL_DIR)/packages;$(IMGLIB_INSTALL_DIR);$(THIS_PATH)
+XDC       = $(XDC_INSTALL_DIR)/xdc

release/webcam/edge-line-sensor.xe674

@@ -0,0 +1 @@
+../../trik/webcam/edge_line_sensor/dsp_server/bin/dsp_server.xe674

release/webcam/jpeg-encoder.xe674

@@ -0,0 +1 @@
+../../trik/webcam/jpeg_encoder/dsp_server/bin/dsp_server.xe674

release/webcam/motion-sensor.xe674

@@ -0,0 +1 @@
+../../trik/webcam/motion_sensor/dsp_server/bin/dsp_server.xe674

release/webcam/mxn-sensor.xe674

@@ -0,0 +1 @@
+../../trik/webcam/mxn_sensor/dsp_server/bin/dsp_server.xe674

trik/ov7670/Makefile

@@ -8,7 +8,6 @@ SUBDIRSCMD =  $(patsubst %,%-$(CMD),$(SUBDIRS))
 
 all: subdirs$(CMD)
 
-
 clean:
 	$(MAKE) -C . CMD=clean
 

trik/ov7670/common/dsp_server/link.cmd.in

@@ -0,0 +1,4 @@
+/*
+ * Any additions to the generated linker-command files should be placed here
+ */
+-l @IMGLIB_INSTALL_DIR@/lib/target/imglib2_elf.lib --export=__c6xabi_divi --export=__c6xabi_remi

trik/ov7670/common/dsp_server/makefile

@@ -1,39 +1,15 @@
-include ../makefile
-# your various installation directories
-DEPOT_DSP?=/opt/trik-dsp
-#CODEC_DIR?=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))/../../../../
+include ../../../../common.mk
 
-XDC_INSTALL_DIR?=$(DEPOT_DSP)/xdctools_3_24_07_73
-CE_INSTALL_DIR?=$(DEPOT_DSP)/codec_engine_3_23_00_07
-BIOS_INSTALL_DIR?=$(DEPOT_DSP)/bios_6_37_05_35
-FC_INSTALL_DIR?=$(DEPOT_DSP)/framework_components_3_24_02_15
-XDAIS_INSTALL_DIR?=$(DEPOT_DSP)/xdais_7_23_00_06
-IPC_INSTALL_DIR?=$(DEPOT_DSP)/ipc_1_25_03_15
-LINK_INSTALL_DIR?=$(DEPOT_DSP)/syslink_2_21_03_11
-OSAL_INSTALL_DIR?=$(DEPOT_DSP)/osal_1_24_00_09
-CMEM_INSTALL_DIR?=$(DEPOT_DSP)/linuxutils_3_23_00_01
-DSPLIB_INSTALL_DIR?=$(DEPOT_DSP)/dsplib_3_1_1_1
-#IMGLIB_INSTALL_DIR?=$(DEPOT_DSP)/imglib_2_02_00_00
-IMGLIB_INSTALL_DIR?=$(DEPOT_DSP)/c64plus-imglib_2_02_00_00
-CODEGEN_INSTALL_DIR?=$(DEPOT_DSP)/cgt_c6000_7.4.2
-VLIB_INSTALL_DIR?=$(DEPOT_DSP)/vlib_c674x_3_1_0_9
+LINKCMD=../../common/dsp_server/link.cmd
 
-CGTOOLS_C674?=$(CODEGEN_INSTALL_DIR)
+.PHONY: all $(LINKCMD) clean
 
-#uncomment this for verbose builds
-XDCOPTIONS=v
+all: $(LINKCMD)
+	$(XDC) XDCOPTIONS=$(XDCOPTIONS) XDCARGS="$(XDCARGS)" --xdcpath="$(XDCPATH)"
 
-XDCARGS?=CGTOOLS_C674=\"$(CGTOOLS_C674)\"
-
-XDCPATH=^/..;$(CE_INSTALL_DIR)/packages;$(XDAIS_INSTALL_DIR)/packages;$(BIOS_INSTALL_DIR)/packages;$(LINK_INSTALL_DIR)/packages;$(IPC_INSTALL_DIR)/packages;$(FC_INSTALL_DIR)/packages;$(OSAL_INSTALL_DIR)/packages;$(CMEM_INSTALL_DIR)/packages;$(DSPLIB_INSTALL_DIR)/packages;$(VLIB_INSTALL_DIR)/packages;$(IMGLIB_INSTALL_DIR)
-
-XDC?=$(XDC_INSTALL_DIR)/xdc
-
-
-all:
-	$(XDC) XDCOPTIONS=$(XDCOPTIONS) XDCARGS="$(XDCARGS)" --xdcpath="$(XDCPATH)" release
+$(LINKCMD): $(LINKCMD).in
+	sed -e 's|@IMGLIB_INSTALL_DIR@|$(realpath $(IMGLIB_INSTALL_DIR))|g' $< > $@
 
 clean:
 	$(XDC) XDCOPTIONS=$(XDCOPTIONS) clean
-
-
+	rm -f $(LINKCMD)

trik/ov7670/common/makefile

@@ -1,29 +1,7 @@
-
-# your various installation directories
-DEPOT_DSP?=/opt/trik-dsp
-
-XDC_INSTALL_DIR?=$(DEPOT_DSP)/xdctools_3_25_06_96
-CODEGEN_INSTALL_DIR?=$(DEPOT_DSP)/ti-cgt-c6000_8.0.1
-CE_INSTALL_DIR?=$(DEPOT_DSP)/codec_engine_3_23_00_07
-XDAIS_INSTALL_DIR?=$(DEPOT_DSP)/xdais_7_24_00_04
-DSPLIB_INSTALL_DIR?=$(DEPOT_DSP)/dsplib_c674x_3_4_0_0
-IMGLIB_INSTALL_DIR?=$(DEPOT_DSP)/c64plus-imglib_2_02_00_00
-VLIB_INSTALL_DIR?=$(DEPOT_DSP)/vlib_c674x_3_3_0_3
-
-CGTOOLS_C674?=$(CODEGEN_INSTALL_DIR)
-
-#uncomment this for verbose builds
-XDCOPTIONS=v
-
-XDCARGS?=CGTOOLS_C674=\"$(CGTOOLS_C674)\"
-
-XDCPATH?=/home/me/trik/trik-media-sensors-dsp/;$(CE_INSTALL_DIR)/packages;$(XDAIS_INSTALL_DIR)/packages;$(DSPLIB_INSTALL_DIR)/packages;$(IMGLIB_INSTALL_DIR);$(VLIB_INSTALL_DIR)/packages
-
-XDC?=$(XDC_INSTALL_DIR)/xdc
+include ../../../common.mk
 
 all:
-	$(XDC) XDCOPTIONS=$(XDCOPTIONS) XDCARGS="$(XDCARGS)" --xdcpath="$(XDCPATH)" release
+	$(XDC) XDCOPTIONS=$(XDCOPTIONS) XDCARGS="$(XDCARGS)" --xdcpath="$(XDCPATH)"
 
 clean:
 	$(XDC) XDCOPTIONS=$(XDCOPTIONS) clean
-

trik/ov7670/edge_line_sensor/dsp_server/package.xdc

@@ -1,2 +1,2 @@
-package ov7670.edge_line_sensor.dsp_server [1, 0, 0] {
+package trik.ov7670.edge_line_sensor.dsp_server [1, 0, 0] {
 }

trik/ov7670/jpeg_encoder/dsp_server/package.xdc

@@ -1,2 +1,2 @@
-package ov7670.jpeg_encoder.dsp_server [1, 0, 0] {
+package trik.ov7670.jpeg_encoder.dsp_server [1, 0, 0] {
 }

trik/ov7670/line_sensor/dsp_server/package.xdc

@@ -1,2 +1,2 @@
-package ov7670.line_sensor.dsp_server [1, 0, 0] {
+package trik.ov7670.line_sensor.dsp_server [1, 0, 0] {
 }

trik/ov7670/motion_sensor/dsp_server/package.xdc

@@ -1,2 +1,2 @@
-package ov7670.motion_sensor.dsp_server [1, 0, 0] {
+package trik.ov7670.motion_sensor.dsp_server [1, 0, 0] {
 }

trik/ov7670/motion_sensor/package.xdc

@@ -2,6 +2,8 @@
  *  ======== package.xdc ========
  */
 
+requires ti.vlib;
+
 package trik.ov7670.motion_sensor [1, 0, 0] {
     module VIDTRANSCODE_CV;
 }

trik/ov7670/mxn_sensor/dsp_server/package.xdc

@@ -1,2 +1,2 @@
-package ov7670.mxn_sensor.dsp_server [1, 0, 0] {
+package trik.ov7670.mxn_sensor.dsp_server [1, 0, 0] {
 }

trik/webcam/Makefile

@@ -0,0 +1,21 @@
+SUBDIRS = edge_line_sensor line_sensor \
+		  mxn_sensor jpeg_encoder \
+		  motion_sensor object_sensor
+
+SUBDIRSCMD =  $(patsubst %,%-$(CMD),$(SUBDIRS))
+
+.PHONY: subdirs $(SUBDIRSCMD) $(SUBDIRS)
+
+all: subdirs$(CMD)
+
+clean:
+	$(MAKE) -C . CMD=clean
+
+
+subdirs$(CMD): $(SUBDIRS)
+
+
+$(SUBDIRS):
+	$(MAKE) -C $@ $(CMD)
+	$(MAKE) -C $@/dsp_server $(CMD)
+