merge
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
#define SPOOK_MAX_FRAME_SIZE 0/*352*288*3*/
|
||||
#define SPOOK_PORT 7070
|
||||
|
||||
//#define JPEG_ENCODER_NAME "jpeg_dvp"
|
||||
#define JPEG_ENCODER_NAME "jpeg_dvp"
|
||||
//#define JPEG_ENCODER2_NAME "jpeg_usb"
|
||||
|
||||
#define FILE_JPEG_ENCODER_NAME "jpeg_file"
|
||||
@@ -20,18 +20,18 @@
|
||||
|
||||
#define EXCHANGER_SLOT_SIZE 16
|
||||
|
||||
//#define RTSP_LIVE_PATH "/webcam" /* /webcam */
|
||||
#define RTSP_LIVE_PATH "/webcam" /* /webcam */
|
||||
//#define RTSP_LIVE_USB_PATH "/webcam2" /* /webcam */
|
||||
#define RTSP_WEB_PATH "/file" /* /webcam */
|
||||
//#define RTSP_WEB_PATH "/file" /* /webcam */
|
||||
|
||||
|
||||
//#define RTSP_LIVE_TRACK "jpeg_dvp"
|
||||
#define RTSP_LIVE_TRACK "jpeg_dvp"
|
||||
//#define RTSP_LIVE2_TRACK "jpeg_usb"
|
||||
#define RTSP_WEBFILE_TRACK "jpeg_file"
|
||||
//#define RTSP_WEBFILE_TRACK "jpeg_file"
|
||||
|
||||
|
||||
#define RTSP_LIVE_AUDIO_TRACK "audio"
|
||||
#define RTSP_WEBFILE_AUDIO_TRACK "audio_file"
|
||||
//#define RTSP_LIVE_AUDIO_TRACK "audio"
|
||||
//#define RTSP_WEBFILE_AUDIO_TRACK "audio_file"
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
@@ -361,7 +361,7 @@ static int unbase64( unsigned char *d, int len, int *remain )
|
||||
}
|
||||
|
||||
#if 0
|
||||
static unsigned char s_ptemp[300] = {"TEARDOWN rtsp://192.168.1.1:7070/webcam/ RTSP/1.0\r\nCSeq: 6\r\nUser-Agent: Lavf56.40.101\r\nSession: 9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9\r\n\r\n4A5A6A7A8A9\r\n\r\n"};
|
||||
static unsigned char s_ptemp[300] = {"TEARDOWN rtsp://192.168.4.1:7070/webcam/ RTSP/1.0\r\nCSeq: 6\r\nUser-Agent: Lavf56.40.101\r\nSession: 9B9C9D9E9FA0A1A2A3A4A5A6A7A8A9\r\n\r\n4A5A6A7A8A9\r\n\r\n"};
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@@ -160,31 +160,31 @@ extern void hw_memcpy(void *dest, const void *src, unsigned int size);
|
||||
#if IP_NAT
|
||||
#define PBUF_POOL_SIZE 32//pbuf pool size,PBUF_POOL
|
||||
#else
|
||||
#define PBUF_POOL_SIZE 6//pbuf pool size,PBUF_POOL
|
||||
#define PBUF_POOL_SIZE 16//pbuf pool size,PBUF_POOL
|
||||
#endif
|
||||
#endif//PBUF_POOL_SIZE
|
||||
|
||||
// One tcp_pcb_listen is needed for each TCPServer.
|
||||
// Each requires 72 bytes of RAM.
|
||||
#ifndef MEMP_NUM_TCP_PCB_LISTEN
|
||||
#define MEMP_NUM_TCP_PCB_LISTEN 2
|
||||
#define MEMP_NUM_TCP_PCB_LISTEN 4
|
||||
#endif
|
||||
|
||||
// One is tcp_pcb needed for each TCPSocket.
|
||||
// Each requires 196 bytes of RAM.
|
||||
#ifndef MEMP_NUM_TCP_PCB
|
||||
#define MEMP_NUM_TCP_PCB 4
|
||||
#define MEMP_NUM_TCP_PCB 12
|
||||
#endif
|
||||
// One udp_pcb is needed for each UDPSocket.
|
||||
// Each requires 84 bytes of RAM (total rounded to multiple of 512).
|
||||
#ifndef MEMP_NUM_UDP_PCB
|
||||
#define MEMP_NUM_UDP_PCB 4
|
||||
#define MEMP_NUM_UDP_PCB 8
|
||||
#endif
|
||||
|
||||
// Number of non-pool pbufs.
|
||||
// Each requires 92 bytes of RAM.
|
||||
#ifndef MEMP_NUM_PBUF
|
||||
#define MEMP_NUM_PBUF 10 //PBUF_REF/ROM
|
||||
#define MEMP_NUM_PBUF 32 //PBUF_REF/ROM
|
||||
#endif
|
||||
|
||||
// Each netbuf requires 64 bytes of RAM.
|
||||
@@ -296,7 +296,7 @@ extern void hw_memcpy(void *dest, const void *src, unsigned int size);
|
||||
// One netconn is needed for each UDPSocket, TCPSocket or TCPServer.
|
||||
// Each requires 236 bytes of RAM (total rounded to multiple of 512).
|
||||
#ifndef MEMP_NUM_NETCONN
|
||||
#define MEMP_NUM_NETCONN 6
|
||||
#define MEMP_NUM_NETCONN 12
|
||||
#endif
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user