Add hisi-sample and change Makefile

hisi-osdrv2/Makefile

@@ -5,7 +5,7 @@
 # See /LICENSE for more information.
 #
 
-# 2018.06.09 
+# 2018.06.09
 # В будущем сделать зависимость от платформы Hisilicon и конкретной версии ядра
 # Включить сборку из исходников himm, некоторых модулей ябра и библиотек сенсоров
 
@@ -68,7 +68,8 @@ $(call Package/$(PKG_NAME)/default)
 	TITLE+= - tool package
 endef
 
-#PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+define Build/Prepare
+endef
 
 define Build/Configure
 endef

hisi-osdrv2/include/ringfifo.h

@@ -0,0 +1,11 @@
+struct ringbuf {
+    unsigned char *buffer;
+	int frame_type;
+    int size;
+};
+int addring (int i);
+int ringget(struct ringbuf *getinfo);
+void ringput(unsigned char *buffer,int size,int encode_type);
+void ringfree();
+void ringmalloc(int size);
+void ringreset();

hisi-osdrv2/include/rtputils.h

@@ -0,0 +1,36 @@
+#ifndef _RTPUTILS_H
+#define _RTPUTILS_H
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <sys/socket.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define MAX_RTP_PKT_LENGTH     1400
+
+#define H264                    96
+#define G711					97
+
+typedef enum
+{
+	_h264		= 0x100,
+	_h264nalu,
+	_mjpeg,
+	_g711		= 0x200,
+}EmRtpPayload;
+enum H264_FRAME_TYPE {FRAME_TYPE_I, FRAME_TYPE_P, FRAME_TYPE_B};
+
+unsigned int RtpCreate(unsigned int u32IP, int s32Port, EmRtpPayload emPayload);
+void RtpDelete(unsigned int u32Rtp);
+unsigned int RtpSend(unsigned int u32Rtp, char *pData, int s32DataSize, unsigned int u32TimeStamp);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _RTPUTILS_H */

hisi-osdrv2/include/rtspservice.h

@@ -0,0 +1,16 @@
+#ifndef _RTSP_H
+#define _RTSP_H
+#include "rtsputils.h"
+
+#define RTSP_DEBUG 1
+#define RTP_DEFAULT_PORT 5004
+
+void CallBackNotifyRtspExit(char s8IsExit);
+void *ThreadRtsp(void *pArgs);
+int rtsp_server(RTSP_buffer *rtsp);
+void IntHandl(int i);
+void UpdateSps(unsigned char *data,int len);
+void UpdatePps(unsigned char *data,int len);
+
+
+#endif /* _RTSP_H */

hisi-osdrv2/include/rtsputils.h

@@ -0,0 +1,236 @@
+#ifndef _RTSP_SERVICE_H
+#define _RTSP_SERVICE_H
+#include <time.h>
+#include <ctype.h>
+#include <sys/types.h>
+#include <math.h>
+#include <stdio.h>
+
+#define trace_point() 	do {printf("rtsp_tracepoint: %s,%s,%d\n",__FILE__,__FUNCTION__,__LINE__); } while(0)			//10728
+//#define trace_sleep() 	do {printf("rtsp_tracesleep: %s,%d\n",__FILE__,__LINE__); sleep(1);} while(0)  //10728
+//#define cz_trace		printf																		//10728
+//#define cz_trip	 		do {printf("!CAUTION!-CZ_TRIP-: %s,%d\n",__FILE__,__LINE__); } while(0)		//10728
+
+/*error codes define,yanf*/
+#define ERR_NOERROR          0
+#define ERR_GENERIC             -1
+#define ERR_NOT_FOUND       -2
+#define ERR_PARSE           -3
+#define ERR_ALLOC               -4
+#define ERR_INPUT_PARAM         -5
+#define ERR_NOT_SD          -6
+#define ERR_UNSUPPORTED_PT      -7
+#define ERR_EOF             -8
+#define ERR_FATAL                   -9
+#define ERR_CONNECTION_CLOSE        -10
+
+/* 消息头关键字 */
+#define HDR_CONTENTLENGTH "Content-Length"
+#define HDR_ACCEPT "Accept"
+#define HDR_ALLOW "Allow"
+#define HDR_BLOCKSIZE "Blocksize"
+#define HDR_CONTENTTYPE "Content-Type"
+#define HDR_DATE "Date"
+#define HDR_REQUIRE "Require"
+#define HDR_TRANSPORTREQUIRE "Transport-Require"
+#define HDR_SEQUENCENO "SequenceNo"
+#define HDR_CSEQ "CSeq"
+#define HDR_STREAM "Stream"
+#define HDR_SESSION "Session"
+#define HDR_TRANSPORT "Transport"
+#define HDR_RANGE "Range"
+#define HDR_USER_AGENT "User-Agent"
+
+
+/*rtsp方法*/
+#define RTSP_METHOD_MAXLEN 15
+#define RTSP_METHOD_DESCRIBE "DESCRIBE"
+#define RTSP_METHOD_ANNOUNCE "ANNOUNCE"
+#define RTSP_METHOD_GET_PARAMETERS "GET_PARAMETERS"
+#define RTSP_METHOD_OPTIONS "OPTIONS"
+#define RTSP_METHOD_PAUSE "PAUSE"
+#define RTSP_METHOD_PLAY "PLAY"
+#define RTSP_METHOD_RECORD "RECORD"
+#define RTSP_METHOD_REDIRECT "REDIRECT"
+#define RTSP_METHOD_SETUP "SETUP"
+#define RTSP_METHOD_SET_PARAMETER "SET_PARAMETER"
+#define RTSP_METHOD_TEARDOWN "TEARDOWN"
+
+
+/*rtsp方法记号ID*/
+#define RTSP_ID_DESCRIBE 0
+#define RTSP_ID_ANNOUNCE 1
+#define RTSP_ID_GET_PARAMETERS 2
+#define RTSP_ID_OPTIONS 3
+#define RTSP_ID_PAUSE 4
+#define RTSP_ID_PLAY 5
+#define RTSP_ID_RECORD 6
+#define RTSP_ID_REDIRECT 7
+#define RTSP_ID_SETUP 8
+#define RTSP_ID_SET_PARAMETER 9
+#define RTSP_ID_TEARDOWN 10
+
+/*		RTSP 相关		*/
+#define RTSP_not_full 0
+#define RTSP_method_rcvd 1
+#define RTSP_interlvd_rcvd 2
+
+#define RTSP_BUFFERSIZE 4096
+#define MAX_DESCR_LENGTH 4096
+
+/* Stati della macchina a stati del server rtsp*/
+#define INIT_STATE      0
+#define READY_STATE     1
+#define PLAY_STATE      2
+
+#define RTSP_VER "RTSP/1.0"
+
+#define RTSP_EL "\r\n"
+
+#define PACKAGE "sunshine"
+#define VERSION "1.11"
+
+//extern struct _tagStRtpHandle *HndRtp;
+
+
+typedef struct
+{
+        int RTP;
+        int RTCP;
+} port_pair;
+
+typedef enum{
+			RTP_no_transport=0,
+            RTP_rtp_avp,
+            RTP_rtp_avp_tcp
+		} rtp_type;
+
+typedef struct _RTP_transport
+{
+	rtp_type type;
+	int rtp_fd;
+//	int rtcp_fd_out;
+//	int rtcp_fd_in;
+	union{
+		struct {
+//				struct sockaddr rtp_peer;
+//				struct sockaddr rtcp_in_peer;
+//				struct sockaddr rtcp_out_peer;
+				port_pair cli_ports;
+				port_pair ser_ports;
+				unsigned char is_multicast;
+			} udp;
+		struct {
+				port_pair interleaved;
+				} tcp;
+            // other trasports here
+		} u;
+} RTP_transport;
+
+typedef struct _RTP_session {
+	struct _tagStRtpHandle *hndRtp;
+	RTP_transport transport;
+    unsigned char pause;
+    unsigned char started;
+    int sched_id;
+	struct _RTP_session *next;
+}RTP_session;
+
+typedef struct _RTSP_session {
+    int cur_state;   /*会话状态*/
+    int session_id; /*会话的ID*/
+
+    RTP_session *rtp_session; /*RTP会话*/
+
+    struct _RTSP_session *next; /*下一个会话的指针，构成链表结构*/
+} RTSP_session;
+
+//RTSP_buffer  RTSP客户端结构体，里面包含RTSP的接收，发送数据
+typedef struct _RTSP_buffer {
+    int fd;    /*socket文件描述符*/
+    unsigned int port;/*端口号*/
+
+    struct sockaddr stClientAddr;
+
+    char in_buffer[RTSP_BUFFERSIZE];/*接收缓冲区*/
+    unsigned int in_size;/*接收缓冲区的大小*/
+    char out_buffer[RTSP_BUFFERSIZE+MAX_DESCR_LENGTH];/*发送缓冲区*/
+    int out_size;/*发送缓冲区大小*/
+
+    unsigned int rtsp_cseq;/*序列号*/
+    char descr[MAX_DESCR_LENGTH];/*描述*/
+    RTSP_session *session_list;/*会话链表*/
+    struct _RTSP_buffer *next; /*指向下一个结构体，构成了链表结构*/
+} RTSP_buffer;
+
+/*			tcp相关				*/
+char *sock_ntop_host(const struct sockaddr *sa, socklen_t salen, char *str, size_t len);
+int tcp_accept(int fd);
+int tcp_connect(unsigned short port, char *addr);
+int tcp_listen(unsigned short port);
+int tcp_read(int fd, void *buffer, int nbytes, struct sockaddr *Addr);
+int tcp_send(int fd, void *dataBuf, unsigned int dataSize);
+int tcp_write(int fd, char *buffer, int nbytes);
+
+/*			schedule相关				*/
+#define MAX_PROCESS	1/*number of fork*/
+#define MAX_CONNECTION	10/*rtsp connection*/
+//#define ONE_FORK_MAX_CONNECTION ((int)(MAX_CONNECTION/MAX_PROCESS))/*rtsp connection for one fork*/
+
+typedef struct _play_args
+{
+    struct tm playback_time;                    /*回放时间*/
+    short playback_time_valid;                 /*回放时间是否合法*/
+    float start_time;                                   /*开始时间*/
+    short start_time_valid;                        /*开始时间是否合法*/
+    float end_time;                                     /*结束时间*/
+} stPlayArgs;
+
+typedef unsigned int (*RTP_play_action)(unsigned int u32Rtp, char *pData, int s32DataSize, unsigned int u32TimeStamp);
+
+typedef struct _schedule_list
+{
+    int valid;/*合法性标识*/
+	int BeginFrame;
+    RTP_session *rtp_session;/*RTP会话*/
+    RTP_play_action play_action;/*播放动作*/
+} stScheList;
+
+int ScheduleInit();
+void *schedule_do(void *nothing);
+int schedule_add(RTP_session *rtp_session/*,RTSP_session *rtsp_session*/);
+int schedule_start(int id,stPlayArgs *args);
+void schedule_stop(int id);
+int schedule_remove(int id);
+int schedule_resume(int id, stPlayArgs *args);
+
+typedef enum
+{
+    /*sender report,for transmission and reception statics from participants that are active senders*/
+    SR=200,
+    /*receiver report,for reception statistics from participants that are not active senders
+       and in combination with SR for    active senders reporting on more than 31 sources
+     */
+    RR=201,
+    SDES=202,/*Source description items, including CNAME,NAME,EMAIL,etc*/
+    BYE=203,/*Indicates end of participation*/
+    APP=204/*Application-specific functions*/
+} rtcp_pkt_type;
+
+
+/* Define default RTSP listening port */
+#define SERVER_RTSP_PORT_DEFAULT 554
+
+typedef struct _StServPrefs {
+    char hostname[256];
+    char serv_root[256];
+    char log[256];
+    unsigned int port;
+    unsigned int max_session;
+} StServPrefs;
+
+int send_reply(int err, char *addon, RTSP_buffer * rtsp);
+int bwrite(char *buffer, unsigned short len, RTSP_buffer * rtsp);
+const char *get_stat(int err);
+
+#endif

hisi-sample/Makefile

@@ -0,0 +1,46 @@
+#
+# Copyright (C) 2006-2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hisi-sample
+PKG_VERSION:=0.1
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Chertov Maxim <[email protected]>
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/$(PKG_NAME)
+	SECTION:=multimedia
+	CATEGORY:=Multimedia
+	TITLE:=Some samples for Hisilicon devices
+	SUBMENU:=Hisilicon OSDRV-2 for HI35_16C_18E_V200 with kernel 3.4.35
+	MAINTAINER:[email protected]
+	DEPENDS:=+hisi-osdrv2-lib +libpthread
+	#DEPENDS:=+libstdcpp +libyaml-cpp +libpthread  +hidrv
+endef
+
+define Package/$(PKG_NAME)/description
+	Some samples for Hisilicon devices
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rtsp-hisi $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/hijpg $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

hisi-sample/README.md

@@ -0,0 +1,28 @@
+rtsp-hisi
+=========
+
+rtsp-hisi - Simple RTSP daemon for Hisilicon devices
+
+
+License
+=======
+
+This sources is free software; you can redistribute it and/or modify it under the terms of
+the GNU Lesser General Public License as published by the Free Software Foundation;
+either version 2.1 of the License, or (at your option) any later version.
+
+You should have received a copy of the GNU Lesser General Public License along with this
+script; if not, please visit http://www.gnu.org/copyleft/gpl.html for more information.
+
+
+Usage
+=====
+
+More info for use rtsp-hisi on OpenWRT routers you can see [here (Russian)](http://zftlab.org)
+
+
+Links
+=====
+
+* [Original sources on GitHub from xibeilang524](https://github.com/xibeilang524/hi3518_h264/tree/master/rtspok_utf8)
+