[viewvideo] Move netcat image send inside viewvideo module

paparazzi · Feb 26, 2015 · 20c0c66 · 20c0c66
1 parent bc7feb5
commit 20c0c66
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 324 deletions.
diff --git a/conf/airframes/ENAC/quadrotor/ard2_base_digit.xml b/conf/airframes/ENAC/quadrotor/ard2_base_digit.xml
@@ -36,7 +36,9 @@
     <load name="agl_dist.xml">
       <define name="USE_SONAR"/>
     </load>
-    <load name="image_nc_send.xml"/>
+    <load name="video_rtp_stream.xml">
+      <configure name="VIEWVIDEO_USE_NC" value="TRUE"/>
+    </load>
     <load name="rotorcraft_cam.xml"/>
   </modules>
 

diff --git a/conf/modules/image_nc_send.xml b/conf/modules/image_nc_send.xml
diff --git a/conf/modules/video_rtp_stream.xml b/conf/modules/video_rtp_stream.xml
@@ -49,16 +49,19 @@
       VIEWVIDEO_BROADCAST   ?= $(MODEM_BROADCAST)
       VIEWVIDEO_DEV_LOWER   = $(shell echo $(VIEWVIDEO_DEV) | tr A-Z a-z)
 
-      STREAM_CFLAGS  = -DUSE_$(VIEWVIDEO_DEV) -DVIEWVIDEO_DEV=$(VIEWVIDEO_DEV_LOWER) -DVIEWVIDEO_PORT_OUT=$(VIEWVIDEO_PORT_OUT)
-      STREAM_CFLAGS += -D$(VIEWVIDEO_DEV)_PORT_OUT=$(VIEWVIDEO_PORT_OUT) -D$(VIEWVIDEO_DEV)_PORT_IN=$(VIEWVIDEO_PORT_IN)
-      STREAM_CFLAGS += -D$(VIEWVIDEO_DEV)_BROADCAST=$(VIEWVIDEO_BROADCAST) -D$(VIEWVIDEO_DEV)_HOST=\"$(VIEWVIDEO_HOST)\"
-      ap.CFLAGS += $(STREAM_CFLAGS)
+      VIEWVID_G_CFLAGS  = -DVIEWVIDEO_HOST=\"$(VIEWVIDEO_HOST)\" -DVIEWVIDEO_PORT_OUT=$(VIEWVIDEO_PORT_OUT)
+      VIEWVID_CFLAGS  = -DUSE_$(VIEWVIDEO_DEV) -DVIEWVIDEO_DEV=$(VIEWVIDEO_DEV_LOWER)
+      VIEWVID_CFLAGS += -D$(VIEWVIDEO_DEV)_PORT_OUT=$(VIEWVIDEO_PORT_OUT) -D$(VIEWVIDEO_DEV)_PORT_IN=$(VIEWVIDEO_PORT_IN)
+      VIEWVID_CFLAGS += -D$(VIEWVIDEO_DEV)_BROADCAST=$(VIEWVIDEO_BROADCAST) -D$(VIEWVIDEO_DEV)_HOST=\"$(VIEWVIDEO_HOST)\"
+      ifeq ($(VIEWVIDEO_USE_NC),)
+        ap.CFLAGS += $(VIEWVID_G_CFLAGS) $(VIEWVID_CFLAGS)
+      else
+        ap.CFLAGS += $(VIEWVID_G_CFLAGS) -DVIEWVIDEO_USE_NC
+      endif
     </raw>
 
     <!-- Random flags -->
-    <define name="pthread" type="raw"/>
     <define name="__USE_GNU"/>
-    <flag name="LDFLAGS" value="pthread"/>
     <flag name="LDFLAGS" value="lrt"/>
     <flag name="LDFLAGS" value="static-libgcc"/>
   </makefile>

diff --git a/sw/airborne/modules/computer_vision/image_nc_send.c b/sw/airborne/modules/computer_vision/image_nc_send.c
diff --git a/sw/airborne/modules/computer_vision/image_nc_send.h b/sw/airborne/modules/computer_vision/image_nc_send.h
diff --git a/sw/airborne/modules/computer_vision/image_nc_send_nps.c b/sw/airborne/modules/computer_vision/image_nc_send_nps.c