1

Rules.make

@@ -1,31 +1,22 @@
 
 #¶ÔÓ¦ hi_comm.h enum sample_vi_mode_e
 #SENSOR_TYPE=OMNIVISION_OV9732_MIPI_720P_30FPS
-#SENSOR_TYPE=OMNIVISION_OV2710_MIPI_1080P_30FPS
+SENSOR_TYPE=OMNIVISION_OV2710_MIPI_1080P_30FPS
 #SENSOR_TYPE=APTINA_AR0130_DC_720P_30FPS
 #SENSOR_TYPE=SONY_IMX291_LVDS_1080P_30FPS
 #SENSOR_TYPE=SONY_IMX323_DC_1080P_30FPS
 #SENSOR_TYPE=SMARTSENS_SC1135_DC_960P_30FPS
 #SENSOR_TYPE=APTINA_AR0237_DC_1080P_30FPS
 #SENSOR_TYPE=OMNIVISION_OV4689_MIPI_4M_30FPS
 #SENSOR_TYPE=SMARTSENS_SC2135_DC_1080P_30FPS
-SENSOR_TYPE=SONY_IMX226_LVDS_12M_30FPS
+#SENSOR_TYPE=SONY_IMX226_LVDS_12M_30FPS
 export SENSOR_TYPE
 
-#HIARCH=hi3518ev200
-HIARCH=hi3516av200
+HIARCH=hi3518ev200
 export HIARCH
 
-ifeq ($(HIARCH), hi3518ev200)
-	CROSS_COMPILE=arm-hisiv300-linux-
-	PLATFORM=$(TOP_DIR)/soc/hi3518ev200
-endif
-
-ifeq ($(HIARCH), hi3516av200)
-	CROSS_COMPILE=arm-hisiv600-linux-
-	PLATFORM=$(TOP_DIR)/soc/hi3516av200
-endif
-
+CROSS_COMPILE=arm-hisiv300-linux-
+PLATFORM=$(TOP_DIR)/soc/hi3518ev200
 export PLATFORM
 
 
@@ -35,6 +26,7 @@ else ifeq ($(SENSOR_TYPE), OMNIVISION_OV9732_MIPI_720P_30FPS)
 	SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov9732_mipi
 else ifeq ($(SENSOR_TYPE), OMNIVISION_OV2710_MIPI_1080P_30FPS)
 	SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov2710_mipi
+	SENSOR_LIB=$(PLATFORM)/sensor/omnivision_ov2710_mipi/libsns_ov2710.a
 else ifeq ($(SENSOR_TYPE), SONY_IMX291_LVDS_1080P_30FPS)
 	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx291
 else ifeq ($(SENSOR_TYPE), SONY_IMX323_DC_1080P_30FPS)
@@ -53,50 +45,25 @@ endif
 export SENSOR_PATH
 export SENSOR_LIB
 
-ifeq ($(HIARCH), hi3518ev200)
-	LIBS+=$(PLATFORM)/libmpp.a
-	LIBS+=$(SENSOR_LIB)
-	LIBS+=$(PLATFORM)/mpp_lib/libmpi.a
-	LIBS+=$(PLATFORM)/mpp_lib/libive.a
-	LIBS+=$(PLATFORM)/mpp_lib/libmd.a
-	LIBS+=$(PLATFORM)/mpp_lib/libVoiceEngine.a
-	LIBS+=$(PLATFORM)/mpp_lib/libupvqe.a
-	LIBS+=$(PLATFORM)/mpp_lib/libdnvqe.a
-	LIBS+=$(PLATFORM)/mpp_lib/libisp.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hiae.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hiawb.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hiaf.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hidefog.a
-	LIBS+=$(PLATFORM)/common_lib/libcurl.a
-	LIBS+=$(PLATFORM)/common_lib/libdigest.a
-	LIBS+=$(PLATFORM)/common_lib/libixml.a
-	LIBS+=$(PLATFORM)/common_lib/libmd5.a
-	LIBS+=$(PLATFORM)/common_lib/libtinyxml.a
-	LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
-endif
-
-ifeq ($(HIARCH), hi3516av200)
-	LIBS+=$(PLATFORM)/libmpp.a
-	LIBS+=$(SENSOR_LIB)
-	LIBS+=$(PLATFORM)/mpp_lib/libmpi.a
-	LIBS+=$(PLATFORM)/mpp_lib/libive.a
-	LIBS+=$(PLATFORM)/mpp_lib/libmd.a
-	LIBS+=$(PLATFORM)/mpp_lib/libVoiceEngine.a
-	LIBS+=$(PLATFORM)/mpp_lib/libupvqe.a
-	LIBS+=$(PLATFORM)/mpp_lib/libdnvqe.a
-	LIBS+=$(PLATFORM)/mpp_lib/libisp.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hiae.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hiawb.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hiaf.a
-	LIBS+=$(PLATFORM)/mpp_lib/lib_hidefog.a
-	LIBS+=$(PLATFORM)/common_lib/libcurl.a
-	LIBS+=$(PLATFORM)/common_lib/libdigest.a
-	LIBS+=$(PLATFORM)/common_lib/libixml.a
-	LIBS+=$(PLATFORM)/common_lib/libmd5.a
-	LIBS+=$(PLATFORM)/common_lib/libtinyxml.a
-	LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
-endif
-
+LIBS+=$(PLATFORM)/libmpp.a
+LIBS+=$(SENSOR_LIB)
+LIBS+=$(PLATFORM)/mpp_lib/libmpi.a
+LIBS+=$(PLATFORM)/mpp_lib/libive.a
+LIBS+=$(PLATFORM)/mpp_lib/libmd.a
+LIBS+=$(PLATFORM)/mpp_lib/libVoiceEngine.a
+LIBS+=$(PLATFORM)/mpp_lib/libupvqe.a
+LIBS+=$(PLATFORM)/mpp_lib/libdnvqe.a
+LIBS+=$(PLATFORM)/mpp_lib/libisp.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiae.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiawb.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiaf.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hidefog.a
+LIBS+=$(PLATFORM)/common_lib/libcurl.a
+LIBS+=$(PLATFORM)/common_lib/libdigest.a
+LIBS+=$(PLATFORM)/common_lib/libixml.a
+LIBS+=$(PLATFORM)/common_lib/libmd5.a
+LIBS+=$(PLATFORM)/common_lib/libtinyxml.a
+#LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
 export LIBS
 
 CFLAGS += -g -Wall

hi3516av200.make

@@ -0,0 +1,83 @@
+
+#¶ÔÓ¦ hi_comm.h enum sample_vi_mode_e
+#SENSOR_TYPE=OMNIVISION_OV9732_MIPI_720P_30FPS
+#SENSOR_TYPE=OMNIVISION_OV2710_MIPI_1080P_30FPS
+#SENSOR_TYPE=APTINA_AR0130_DC_720P_30FPS
+#SENSOR_TYPE=SONY_IMX291_LVDS_1080P_30FPS
+#SENSOR_TYPE=SONY_IMX323_DC_1080P_30FPS
+#SENSOR_TYPE=SMARTSENS_SC1135_DC_960P_30FPS
+#SENSOR_TYPE=APTINA_AR0237_DC_1080P_30FPS
+#SENSOR_TYPE=OMNIVISION_OV4689_MIPI_4M_30FPS
+#SENSOR_TYPE=SMARTSENS_SC2135_DC_1080P_30FPS
+SENSOR_TYPE=SONY_IMX226_LVDS_12M_30FPS
+export SENSOR_TYPE
+
+HIARCH=hi3516av200
+export HIARCH
+
+CROSS_COMPILE=arm-hisiv600-linux-
+PLATFORM=$(TOP_DIR)/soc/hi3516av200
+export PLATFORM
+
+ifeq ($(SENSOR_TYPE), APTINA_AR0130_DC_720P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/ar0130
+else ifeq ($(SENSOR_TYPE), OMNIVISION_OV9732_MIPI_720P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov9732_mipi
+else ifeq ($(SENSOR_TYPE), OMNIVISION_OV2710_MIPI_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov2710_mipi
+else ifeq ($(SENSOR_TYPE), SONY_IMX291_LVDS_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx291
+else ifeq ($(SENSOR_TYPE), SONY_IMX323_DC_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx323_i2c
+else ifeq ($(SENSOR_TYPE), SMARTSENS_SC1135_DC_960P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sc1135
+else ifeq ($(SENSOR_TYPE), APTINA_AR0237_DC_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/aptina_ar0237
+else ifeq ($(SENSOR_TYPE), SMARTSENS_SC2135_DC_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sc2135
+else ifeq ($(SENSOR_TYPE), SONY_IMX226_LVDS_12M_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx226
+	SENSOR_LIB=$(PLATFORM)/sensor/sony_imx226/libsns_imx226.a
+endif
+
+export SENSOR_PATH
+export SENSOR_LIB
+
+LIBS+=$(PLATFORM)/libmpp.a
+LIBS+=$(SENSOR_LIB)
+LIBS+=$(PLATFORM)/mpp_lib/libmpi.a
+LIBS+=$(PLATFORM)/mpp_lib/libive.a
+LIBS+=$(PLATFORM)/mpp_lib/libmd.a
+LIBS+=$(PLATFORM)/mpp_lib/libVoiceEngine.a
+LIBS+=$(PLATFORM)/mpp_lib/libupvqe.a
+LIBS+=$(PLATFORM)/mpp_lib/libdnvqe.a
+LIBS+=$(PLATFORM)/mpp_lib/libisp.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiae.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiawb.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiaf.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hidefog.a
+LIBS+=$(PLATFORM)/common_lib/libcurl.a
+LIBS+=$(PLATFORM)/common_lib/libdigest.a
+LIBS+=$(PLATFORM)/common_lib/libixml.a
+LIBS+=$(PLATFORM)/common_lib/libmd5.a
+LIBS+=$(PLATFORM)/common_lib/libtinyxml.a
+LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
+export LIBS
+
+CFLAGS += -g -Wall
+CFLAGS += -DSENSOR_TYPE=$(SENSOR_TYPE)
+CFLAGS += -DHIARCH=$(HIARCH)
+CFLAGS += -I$(TOP_DIR)
+CFLAGS += -I$(TOP_DIR)/common_include
+CFLAGS += -I$(PLATFORM)
+CFLAGS += -I$(PLATFORM)/mpp_include
+export CFLAGS
+
+export CC=$(CROSS_COMPILE)gcc
+export CPP=$(CROSS_COMPILE)g++
+export CXX=$(CROSS_COMPILE)g++
+export LINK=$(CROSS_COMPILE)g++
+export STRIP=$(CROSS_COMPILE)strip
+export AR=$(CROSS_COMPILE)ar
+export RANLIB=$(CROSS_COMPILE)ranlib
+

hi3518ev200.make

@@ -0,0 +1,85 @@
+
+#¶ÔÓ¦ hi_comm.h enum sample_vi_mode_e
+#SENSOR_TYPE=OMNIVISION_OV9732_MIPI_720P_30FPS
+SENSOR_TYPE=OMNIVISION_OV2710_MIPI_1080P_30FPS
+#SENSOR_TYPE=APTINA_AR0130_DC_720P_30FPS
+#SENSOR_TYPE=SONY_IMX291_LVDS_1080P_30FPS
+#SENSOR_TYPE=SONY_IMX323_DC_1080P_30FPS
+#SENSOR_TYPE=SMARTSENS_SC1135_DC_960P_30FPS
+#SENSOR_TYPE=APTINA_AR0237_DC_1080P_30FPS
+#SENSOR_TYPE=OMNIVISION_OV4689_MIPI_4M_30FPS
+#SENSOR_TYPE=SMARTSENS_SC2135_DC_1080P_30FPS
+#SENSOR_TYPE=SONY_IMX226_LVDS_12M_30FPS
+export SENSOR_TYPE
+
+HIARCH=hi3518ev200
+export HIARCH
+
+CROSS_COMPILE=arm-hisiv300-linux-
+PLATFORM=$(TOP_DIR)/soc/hi3518ev200
+export PLATFORM
+
+
+ifeq ($(SENSOR_TYPE), APTINA_AR0130_DC_720P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/ar0130
+else ifeq ($(SENSOR_TYPE), OMNIVISION_OV9732_MIPI_720P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov9732_mipi
+else ifeq ($(SENSOR_TYPE), OMNIVISION_OV2710_MIPI_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/omnivision_ov2710_mipi
+	SENSOR_LIB=$(PLATFORM)/sensor/omnivision_ov2710_mipi/libsns_ov2710.a
+else ifeq ($(SENSOR_TYPE), SONY_IMX291_LVDS_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx291
+else ifeq ($(SENSOR_TYPE), SONY_IMX323_DC_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx323_i2c
+else ifeq ($(SENSOR_TYPE), SMARTSENS_SC1135_DC_960P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sc1135
+else ifeq ($(SENSOR_TYPE), APTINA_AR0237_DC_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/aptina_ar0237
+else ifeq ($(SENSOR_TYPE), SMARTSENS_SC2135_DC_1080P_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sc2135
+else ifeq ($(SENSOR_TYPE), SONY_IMX226_LVDS_12M_30FPS)
+	SENSOR_PATH := $(PLATFORM)/sensor/sony_imx226
+	SENSOR_LIB=$(PLATFORM)/sensor/sony_imx226/libsns_imx226.a
+endif
+
+export SENSOR_PATH
+export SENSOR_LIB
+
+LIBS+=$(PLATFORM)/libmpp.a
+LIBS+=$(SENSOR_LIB)
+LIBS+=$(PLATFORM)/mpp_lib/libmpi.a
+LIBS+=$(PLATFORM)/mpp_lib/libive.a
+LIBS+=$(PLATFORM)/mpp_lib/libmd.a
+LIBS+=$(PLATFORM)/mpp_lib/libVoiceEngine.a
+LIBS+=$(PLATFORM)/mpp_lib/libupvqe.a
+LIBS+=$(PLATFORM)/mpp_lib/libdnvqe.a
+LIBS+=$(PLATFORM)/mpp_lib/libisp.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiae.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiawb.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hiaf.a
+LIBS+=$(PLATFORM)/mpp_lib/lib_hidefog.a
+LIBS+=$(PLATFORM)/common_lib/libcurl.a
+LIBS+=$(PLATFORM)/common_lib/libdigest.a
+LIBS+=$(PLATFORM)/common_lib/libixml.a
+LIBS+=$(PLATFORM)/common_lib/libmd5.a
+LIBS+=$(PLATFORM)/common_lib/libtinyxml.a
+#LIBS+=$(PLATFORM)/common_lib/libturbojpeg.a
+export LIBS
+
+CFLAGS += -g -Wall
+CFLAGS += -DSENSOR_TYPE=$(SENSOR_TYPE)
+CFLAGS += -DHIARCH=$(HIARCH)
+CFLAGS += -I$(TOP_DIR)
+CFLAGS += -I$(TOP_DIR)/common_include
+CFLAGS += -I$(PLATFORM)
+CFLAGS += -I$(PLATFORM)/mpp_include
+export CFLAGS
+
+export CC=$(CROSS_COMPILE)gcc
+export CPP=$(CROSS_COMPILE)g++
+export CXX=$(CROSS_COMPILE)g++
+export LINK=$(CROSS_COMPILE)g++
+export STRIP=$(CROSS_COMPILE)strip
+export AR=$(CROSS_COMPILE)ar
+export RANLIB=$(CROSS_COMPILE)ranlib
+

sal_assist.c

@@ -1,4 +1,4 @@
-
+#ifdef hi3516av200
 #include "sal_standard.h"
 #include "sal_overlay.h"
 #include "sal_util.h"
@@ -27,4 +27,34 @@ int sal_assist()
 	return 0;
 }
 
+#endif
+
+#ifdef hi3518ev200
+#include "sal_standard.h"
+#include "sal_overlay.h"
+#include "sal_util.h"
+#include "sal_debug.h"
+#include "sal_bitmap.h"
+#include "sal_osd.h"
+#include "sal_config.h"
+#include "sal_statistics.h"
+#include "sal_isp.h"
+#include "sal_lbr.h"
+#include "sal_af.h"
+#include "sal_jpeg.h"
+
+/*
+* 解决编译问题
+* 此函数只是为了生成libipc.so的时候，把函数符号链接进libipc.so。
+* 如果不调用，那么生成libipc.so的时候，会自动剔除掉函数符号。暂不明原因
+*/
+
+int sal_assist()
+{
+    sal_jpeg_init(NULL);
+    sal_dr_init();
+
+    return 0;
+}
 
+#endif

sal_rtsp_process.c

@@ -388,7 +388,7 @@ static char* __MakeSdpH264(char* _szIp, unsigned char* _pu8Sps, unsigned int _u3
         "a=fmtp:96 packetization-mode=1; sprop-parameter-sets=%s,%s; profile-level-id=%s\r\n"
         "a=control:streamid=0\r\n"
         "m=audio 0 RTP/AVP 8\r\n"
-        "a=rtpmap:8 pcma/8000/1\r\n"
+        "a=rtpmap:8 pcma/8000/1\r\n" //8: g711a rtppayloadtype.pcma: g711a. 8000: 采样率. 1: 单声道
         "a=fmtp:8 octet-align=1\r\n"
         "a=framerate:25\r\n"
 /*

soc/hi3516av200/sensor/sony_imx226/Makefile

@@ -1,7 +1,7 @@
 #
 # sensor lib Makefile
 #
-
+export TOP_DIR=../../../../	
 include ../../../../Rules.make
 
 TARGETS := libsns_imx226.a