Merge pull request #46 from theantihero/revert-45-visiond_pc_ver

Revert "Visiond pc ver"
cfranyota · Mar 3, 2019 · b96ebef · b96ebef
2 parents 71134cc + ce3bf98
commit b96ebef
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 861 deletions.
diff --git a/phonelibs/json11/json11.o b/phonelibs/json11/json11.o
diff --git a/selfdrive/visiond/build_from_src.mk b/selfdrive/visiond/build_from_src.mk
@@ -38,35 +38,34 @@ ifeq ($(UNAME_S),Darwin)
              $(PHONELIBS)/zmq/mac/lib/libzmq.a
 
   OPENCL_LIBS = -framework OpenCL
-
-  PLATFORM_OBJS = camera_fake.o \
-                  ../common/visionbuf_cl.o
 else
-  # assuem x86_64 linux
+  LIBYUV_FLAGS = -I$(PHONELIBS)/libyuv/x64/include
+  LIBYUV_LIBS = $(PHONELIBS)/libyuv/x64/lib/libyuv.a
 
-  ZMQ_FLAGS = -I$(PHONELIBS)/zmq/aarch64/include
-  ZMQ_LIBS = -l:libczmq.a -l:libzmq.a -luuid
+  ZMQ_FLAGS = -I$(EXTERNAL)/zmq/include
+  ZMQ_LIBS = -L$(EXTERNAL)/zmq/lib \
+             -l:libczmq.a -l:libzmq.a
 
   OPENCL_LIBS = -lOpenCL
-
-  SNPE_FLAGS = -I$(SNPE_ROOT)/include/zdl
-  SNPE_LIBS = -L$(SNPE_ROOT)/lib/x86_64-linux-clang/ \
-              -lSNPE -lsymphony-cpu
-
-  CXXFLAGS += -I../common
-
-  PLATFORM_OBJS = camera_eon_stream.o
 endif
 
+  CURL_FLAGS = -I/usr/include/curl
+  CURL_LIBS = -lcurl -lz
+
   SSL_FLAGS = -I/usr/include/openssl/
   SSL_LIBS = -lssl -lcrypto
 
-  OTHER_LIBS = -lz -lm -lpthread -lavcodec -lavutil
+  OPENCV_FLAGS =
+  OPENCV_LIBS = -lopencv_video \
+                -lopencv_imgproc \
+                -lopencv_core
+  OTHER_LIBS = -lz -lm -lpthread
 
+  PLATFORM_OBJS = camera_fake.o \
+                  ../common/visionbuf_cl.o
 
   CFLAGS += -D_GNU_SOURCE \
             -DCLU_NO_CACHE
-  OBJS = visiond_pc.o
 else
 	# assume phone
 
@@ -103,15 +102,13 @@ else
   OTHER_LIBS = -lz -lcutils -lm -llog -lui -ladreno_utils
 
   PLATFORM_OBJS = camera_qcom.o \
-                  ../common/visionbuf_ion.o \
-                  ../common/visionimg.o
-
+                  ../common/visionbuf_ion.o
 
   CFLAGS += -DQCOM
   CXXFLAGS += -DQCOM
-  OBJS = visiond.o
 endif
 
+OBJS = visiond.o
 OUTPUT = visiond
 
 .PHONY: all
@@ -123,6 +120,7 @@ OBJS += $(PLATFORM_OBJS) \
         ../common/swaglog.o \
         ../common/ipc.o \
         ../common/visionipc.o \
+        ../common/visionimg.o \
         ../common/util.o \
         ../common/params.o \
         ../common/efd.o \

diff --git a/selfdrive/visiond/camera_eon_stream.cc b/selfdrive/visiond/camera_eon_stream.cc
diff --git a/selfdrive/visiond/camera_eon_stream.h b/selfdrive/visiond/camera_eon_stream.h
diff --git a/selfdrive/visiond/model.cc b/selfdrive/visiond/model.cc
@@ -1,7 +1,3 @@
-#include <string.h>
-#include <assert.h>
-#include <fcntl.h>
-#include <unistd.h>
 #include "common/timing.h"
 #include "model.h"
 
@@ -96,6 +92,5 @@ ModelData model_eval_frame(ModelState* s, cl_command_queue q,
 void model_free(ModelState* s) {
   model_input_free(&s->in);
   delete s->m;
-  free(s->output);
 }
 
diff --git a/selfdrive/visiond/monitoring.cc b/selfdrive/visiond/monitoring.cc
@@ -1,4 +1,3 @@
-#include <string.h>
 #include "monitoring.h"
 #include "common/mat.h"