merge from allspace, to srs-librtmp, for vs2010

trunk/configure

@@ -300,7 +300,9 @@ GDBDebug=" -g -O0"
 # the warning level.
 WarnLevel=" -Wall"
 # the compile standard.
+if [ "$MSYSTEM" != "MINGW32" -a "$MSYSTEM" != "MINGW64" ]; then
 	CppStd="-ansi"
+fi
 # for library compile
 LibraryCompile=" -fPIC"
 # performance of gprof
@@ -355,7 +357,7 @@ if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh
 MODULE_ID="CORE"
 MODULE_DEPENDS=()
 ModuleLibIncs=(${SRS_OBJS_DIR})
-MODULE_FILES=("srs_core" "srs_core_autofree")
+MODULE_FILES=("srs_core" "srs_core_autofree" "srs_platform")
 CORE_INCS="src/core"; MODULE_DIR=${CORE_INCS} . auto/modules.sh
 CORE_OBJS="${MODULE_OBJS[@]}"
 #

trunk/src/core/srs_core.hpp

@@ -85,7 +85,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 // generated by configure.
 #include <srs_auto_headers.hpp>
-
+#include <srs_platform.hpp>
 // free the p and set to NULL.
 // p must be a T*.
 #define srs_freep(p) \

trunk/src/core/srs_platform.cpp

@@ -0,0 +1,407 @@
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include "srs_platform.hpp"
+
+
+#if defined(_WIN32) && !defined(__CYGWIN__)
+
+int socket_setup()
+{
+    WORD wVersionRequested;
+    WSADATA wsaData;
+    int err;
+
+	/* Use the MAKEWORD(lowbyte, highbyte) macro declared in Windef.h */
+    wVersionRequested = MAKEWORD(2, 2);
+
+    err = WSAStartup(wVersionRequested, &wsaData);
+    if (err != 0) {
+        /* Tell the user that we could not find a usable */
+        /* Winsock DLL.                                  */
+        //printf("WSAStartup failed with error: %d\n", err);
+        return -1;
+    }
+	return 0;
+}
+
+int socket_cleanup()
+{
+	WSACleanup();
+	return 0;
+}
+
+    int gettimeofday(struct timeval* tv, struct timezone* tz)
+    {  
+        time_t clock;
+        struct tm tm;
+        SYSTEMTIME win_time;
+    
+        GetLocalTime(&win_time);
+    
+        tm.tm_year = win_time.wYear - 1900;
+        tm.tm_mon = win_time.wMonth - 1;
+        tm.tm_mday = win_time.wDay;
+        tm.tm_hour = win_time.wHour;
+        tm.tm_min = win_time.wMinute;
+        tm.tm_sec = win_time.wSecond;
+        tm.tm_isdst = -1;
+    
+        clock = mktime(&tm);
+    
+        tv->tv_sec = (long)clock;
+        tv->tv_usec = win_time.wMilliseconds * 1000;
+    
+        return 0;
+    }
+	
+    pid_t getpid(void)
+    {
+        return (pid_t)GetCurrentProcessId();
+    }
+    
+    int usleep(useconds_t usec)
+    {
+        Sleep((DWORD)(usec / 1000));
+        return 0;
+    }
+    
+    ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
+    {
+        ssize_t nwrite = 0;
+        for (int i = 0; i < iovcnt; i++) {
+            const struct iovec* current = iov + i;
+    
+            int nsent = ::send(fd, (char*)current->iov_base, current->iov_len, 0);
+            if (nsent < 0) {
+                return nsent;
+            }
+    
+            nwrite += nsent;
+            if (nsent == 0) {
+                return nwrite;
+            }
+        }
+        return nwrite;
+    }
+
+    ////////////////////////   strlcpy.c (modified) //////////////////////////
+    
+    /*    $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $    */
+    
+    /*-
+     * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
+     *
+     * Permission to use, copy, modify, and distribute this software for any
+     * purpose with or without fee is hereby granted, provided that the above
+     * copyright notice and this permission notice appear in all copies.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+     * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+     * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+     */
+    
+    //#include <sys/cdefs.h> // ****
+    //#include <cstddef> // ****
+    // __FBSDID("$FreeBSD: stable/9/sys/libkern/strlcpy.c 243811 2012-12-03 18:08:44Z delphij $"); // ****
+    
+    // #include <sys/types.h> // ****
+    // #include <sys/libkern.h> // ****
+    
+    /*
+     * Copy src to string dst of size siz.  At most siz-1 characters
+     * will be copied.  Always NUL terminates (unless siz == 0).
+     * Returns strlen(src); if retval >= siz, truncation occurred.
+     */
+    
+    //#define __restrict // ****
+    
+    size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
+    {
+        char *d = dst;
+        const char *s = src;
+        size_t n = siz;
+    
+        /* Copy as many bytes as will fit */
+        if (n != 0) {
+            while (--n != 0) {
+                if ((*d++ = *s++) == '\0')
+                    break;
+            }
+        }
+    
+        /* Not enough room in dst, add NUL and traverse rest of src */
+        if (n == 0) {
+            if (siz != 0)
+                *d = '\0';        /* NUL-terminate dst */
+            while (*s++)
+                ;
+        }
+    
+        return(s - src - 1);    /* count does not include NUL */
+    }
+    
+    // http://www.cplusplus.com/forum/general/141779/////////////////////////   inet_ntop.c (modified) //////////////////////////
+    /*
+     * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
+     * Copyright (c) 1996-1999 by Internet Software Consortium.
+     *
+     * Permission to use, copy, modify, and distribute this software for any
+     * purpose with or without fee is hereby granted, provided that the above
+     * copyright notice and this permission notice appear in all copies.
+     *
+     * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
+     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+     * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
+     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+     * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+     */
+    
+    // #if defined(LIBC_SCCS) && !defined(lint) // ****
+    //static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
+    // #endif /* LIBC_SCCS and not lint */ // ****
+    // #include <sys/cdefs.h> // ****
+    // __FBSDID("$FreeBSD: stable/9/sys/libkern/inet_ntop.c 213103 2010-09-24 15:01:45Z attilio $"); // ****
+    
+    //#define _WIN32_WINNT _WIN32_WINNT_WIN8 // ****
+    //#include <Ws2tcpip.h> // ****
+    //#pragma comment(lib, "Ws2_32.lib") // ****
+    //#include <cstdio> // ****
+    
+    // #include <sys/param.h> // ****
+    // #include <sys/socket.h> // ****
+    // #include <sys/systm.h> // ****
+    
+    // #include <netinet/in.h> // ****
+    
+    /*%
+     * WARNING: Don't even consider trying to compile this on a system where
+     * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
+     */
+    
+    static char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
+    static char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
+    
+    /* char *
+     * inet_ntop(af, src, dst, size)
+     *    convert a network format address to presentation format.
+     * return:
+     *    pointer to presentation format address (`dst'), or NULL (see errno).
+     * author:
+     *    Paul Vixie, 1996.
+     */
+    const char* inet_ntop(int af, const void *src, char *dst, socklen_t size)
+    {
+        switch (af) {
+        case AF_INET:
+            return (inet_ntop4( (unsigned char*)src, (char*)dst, size)); // ****
+    #ifdef AF_INET6
+        //#error "IPv6 not supported"
+        //case AF_INET6:
+        //    return (char*)(inet_ntop6( (unsigned char*)src, (char*)dst, size)); // ****
+    #endif
+        default:
+            // return (NULL); // ****
+            return 0 ; // ****
+        }
+        /* NOTREACHED */
+    }
+    
+    /* const char *
+     * inet_ntop4(src, dst, size)
+     *    format an IPv4 address
+     * return:
+     *    `dst' (as a const)
+     * notes:
+     *    (1) uses no statics
+     *    (2) takes a u_char* not an in_addr as input
+     * author:
+     *    Paul Vixie, 1996.
+     */
+    static char * inet_ntop4(const u_char *src, char *dst, socklen_t size)
+    {
+        static const char fmt[128] = "%u.%u.%u.%u";
+        char tmp[sizeof "255.255.255.255"];
+        int l;
+    
+        l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); // ****
+        if (l <= 0 || (socklen_t) l >= size) {
+            return (NULL);
+        }
+        strlcpy(dst, tmp, size);
+        return (dst);
+    }
+    
+    /* const char *
+     * inet_ntop6(src, dst, size)
+     *    convert IPv6 binary address into presentation (printable) format
+     * author:
+     *    Paul Vixie, 1996.
+     */
+    static char * inet_ntop6(const u_char *src, char *dst, socklen_t size)
+    {
+        /*
+         * Note that int32_t and int16_t need only be "at least" large enough
+         * to contain a value of the specified size.  On some systems, like
+         * Crays, there is no such thing as an integer variable with 16 bits.
+         * Keep this in mind if you think this function should have been coded
+         * to use pointer overlays.  All the world's not a VAX.
+         */
+        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
+        struct { int base, len; } best, cur;
+    #define NS_IN6ADDRSZ 16
+    #define NS_INT16SZ 2
+        u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
+        int i;
+    
+        /*
+         * Preprocess:
+         *    Copy the input (bytewise) array into a wordwise array.
+         *    Find the longest run of 0x00's in src[] for :: shorthanding.
+         */
+        memset(words, '\0', sizeof words);
+        for (i = 0; i < NS_IN6ADDRSZ; i++)
+            words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
+        best.base = -1;
+        best.len = 0;
+        cur.base = -1;
+        cur.len = 0;
+        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
+            if (words[i] == 0) {
+                if (cur.base == -1)
+                    cur.base = i, cur.len = 1;
+                else
+                    cur.len++;
+            } else {
+                if (cur.base != -1) {
+                    if (best.base == -1 || cur.len > best.len)
+                        best = cur;
+                    cur.base = -1;
+                }
+            }
+        }
+        if (cur.base != -1) {
+            if (best.base == -1 || cur.len > best.len)
+                best = cur;
+        }
+        if (best.base != -1 && best.len < 2)
+            best.base = -1;
+    
+        /*
+         * Format the result.
+         */
+        tp = tmp;
+        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
+            /* Are we inside the best run of 0x00's? */
+            if (best.base != -1 && i >= best.base &&
+                i < (best.base + best.len)) {
+                if (i == best.base)
+                    *tp++ = ':';
+                continue;
+            }
+            /* Are we following an initial run of 0x00s or any real hex? */
+            if (i != 0)
+                *tp++ = ':';
+            /* Is this address an encapsulated IPv4? */
+            if (i == 6 && best.base == 0 && (best.len == 6 ||
+                (best.len == 7 && words[7] != 0x0001) ||
+                (best.len == 5 && words[5] == 0xffff))) {
+                if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
+                    return (NULL);
+                tp += strlen(tp);
+                break;
+            }
+            tp += sprintf(tp, "%x", words[i]); // ****
+        }
+        /* Was it a trailing run of 0x00's? */
+        if (best.base != -1 && (best.base + best.len) == 
+            (NS_IN6ADDRSZ / NS_INT16SZ))
+            *tp++ = ':';
+        *tp++ = '\0';
+    
+        /*
+         * Check for overflow, copy, and we're done.
+         */
+        if ((socklen_t)(tp - tmp) > size) {
+            return (NULL);
+        }
+        strcpy(dst, tmp);
+        return (dst);
+    }
+
+#define Set_errno(num) SetLastError((num))
+
+/* INVALID_SOCKET == INVALID_HANDLE_VALUE == (unsigned int)(~0) */
+/* SOCKET_ERROR == -1 */
+//#define ENOTSOCK WSAENOTSOCK
+//#define EINTR    WSAEINTR
+//#define ENOBUFS  WSAENOBUFS
+//#define EWOULDBLOCK           WSAEWOULDBLOCK
+#define EAFNOSUPPORT  WSAEAFNOSUPPORT
+/* from public\sdk\inc\crt\errno.h */
+#define ENOSPC          28
+
+/*
+ *
+ */
+/*
+#ifndef INET_ADDRSTRLEN
+#define INET_ADDRSTRLEN    16
+#endif
+
+static const char *
+inet_ntop_v4 (const void *src, char *dst, size_t size)
+{
+    const char digits[] = "0123456789";
+    int i;
+    struct in_addr *addr = (struct in_addr *)src;
+    u_long a = ntohl(addr->s_addr);
+    const char *orig_dst = dst;
+
+    if (size < INET_ADDRSTRLEN) {
+      Set_errno(ENOSPC);
+      return NULL;
+    }
+    for (i = 0; i < 4; ++i) {
+	int n = (a >> (24 - i * 8)) & 0xFF;
+	int non_zerop = 0;
+
+	if (non_zerop || n / 100 > 0) {
+	    *dst++ = digits[n / 100];
+	    n %= 100;
+	    non_zerop = 1;
+	}
+	if (non_zerop || n / 10 > 0) {
+	    *dst++ = digits[n / 10];
+	    n %= 10;
+	    non_zerop = 1;
+	}
+	*dst++ = digits[n];
+	if (i != 3)
+	    *dst++ = '.';
+    }
+    *dst++ = '\0';
+    return orig_dst;
+}
+
+const char *
+inet_ntop(int af, const void *src, char *dst, size_t size)
+{
+    switch (af) {
+    case AF_INET :
+	return inet_ntop_v4 (src, dst, size);
+    default :
+      Set_errno(EAFNOSUPPORT);
+      return NULL;
+    }
+}
+
+*/
+#endif
+

trunk/src/core/srs_platform.hpp

@@ -0,0 +1,80 @@
+#ifndef SRS_WIN_PORTING_H
+#define SRS_WIN_PORTING_H
+
+#if !defined(_WIN32) || defined(__CYGWIN__) 		/*not on windows or it's cygwin. _WIN32 includes both 32-bit and 64-bit*/
+
+#define SOCKET_ETIME		ETIME
+#define SOCKET_ECONNRESET   ECONNRESET
+
+#define SOCKET int
+#define SOCKET_ERRNO()	errno
+#define SOCKET_RESET(x) x=-1
+#define SOCKET_CLOSE(x) if(x>=0){::close(x);x=-1;}
+#define SOCKET_VALID(x) (x>=0)
+#define SOCKET_SETUP()   {}
+#define SOCKET_CLEANUP() {}
+
+#else /*on windows, but not on cygwin*/
+
+#include <sys/stat.h>
+#include <time.h>
+#include <winsock2.h>
+#include <stdint.h>
+
+#ifdef _MSC_VER		//for VS2010
+#include <io.h>
+#include <fcntl.h>
+#define S_IRUSR _S_IREAD
+#define S_IWUSR _S_IWRITE
+#define open _open
+#define close _close
+#define lseek _lseek
+#define write _write
+#define read _read
+
+typedef int ssize_t;
+typedef int pid_t;
+typedef int mode_t;
+typedef int64_t useconds_t;
+#endif
+
+#define S_IRGRP 0
+#define S_IWGRP 0
+#define S_IXGRP 0
+#define S_IRWXG 0
+#define S_IROTH 0
+#define S_IWOTH 0
+#define S_IXOTH 0
+#define S_IRWXO 0
+
+#define PRId64 "lld"
+
+#define SOCKET_ETIME		WSAETIMEDOUT
+#define SOCKET_ECONNRESET   WSAECONNRESET
+#define SOCKET_ERRNO()    WSAGetLastError()
+#define SOCKET_RESET(x) x=INVALID_SOCKET
+#define SOCKET_CLOSE(x) if(x!=INVALID_SOCKET){::closesocket(x);x=INVALID_SOCKET;}
+#define SOCKET_VALID(x) (x!=INVALID_SOCKET)
+#define SOCKET_BUFF(x)  ((char*)x)
+#define SOCKET_SETUP()	socket_setup()
+#define SOCKET_CLEANUP() socket_cleanup()
+
+typedef uint32_t u_int32_t;
+typedef uint8_t  u_int8_t;
+typedef int socklen_t;
+struct iovec {
+   void* iov_base; /* Starting address */
+   size_t iov_len; /* Length in bytes */
+};
+
+#define snprintf _snprintf
+ssize_t writev(int fd, const struct iovec *iov, int iovcnt);
+const char* inet_ntop(int af, const void *src, char *dst, socklen_t size);
+int gettimeofday(struct timeval* tv, struct timezone* tz);
+pid_t getpid(void);
+int usleep(useconds_t usec);
+int socket_setup();
+int socket_cleanup();
+#endif
+
+#endif //SRS_WIN_PORTING_H

trunk/src/kernel/srs_kernel_error.hpp

@@ -31,7 +31,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <srs_core.hpp>
 
 // success, ok
+#if !defined(_WIN32) || defined(__CYGWIN__)  //avoid redefine error on Windows
 #define ERROR_SUCCESS                       0
+#else
+#include <windows.h>
+#endif
 
 ///////////////////////////////////////////////////////
 // system error.

trunk/src/libs/srs_lib_simple_socket.cpp

@@ -45,22 +45,28 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 SimpleSocketStream::SimpleSocketStream()
 {
-    fd = -1;
+    //fd = -1;
+	SOCKET_RESET(fd);
     send_timeout = recv_timeout = ST_UTIME_NO_TIMEOUT;
     recv_bytes = send_bytes = 0;
+	SOCKET_SETUP();
 }
 
 SimpleSocketStream::~SimpleSocketStream()
 {
-    if (fd != -1) {
+    //if (fd != -1) {
-        ::close(fd);
+    //    ::close(fd);
-        fd = -1;
+    //    fd = -1;
-    }
+    //}
+	SOCKET_CLOSE(fd);
+	SOCKET_CLEANUP();
 }
 
 int SimpleSocketStream::create_socket()
 {
-    if((fd = ::socket(AF_INET, SOCK_STREAM, 0)) < 0){
+    //if((fd = ::socket(AF_INET, SOCK_STREAM, 0)) < 0){
+	fd = ::socket(AF_INET, SOCK_STREAM, 0);
+	if(!SOCKET_VALID(fd)){
         return ERROR_SOCKET_CREATE;
     }
 
@@ -95,12 +101,12 @@ int SimpleSocketStream::read(void* buf, size_t size, ssize_t* nread)
     // On success a non-negative integer indicating the number of bytes actually read is returned 
     // (a value of 0 means the network connection is closed or end of file is reached).
     if (nb_read <= 0) {
-        if (nb_read < 0 && errno == ETIME) {
+        if (nb_read < 0 && SOCKET_ERRNO() == SOCKET_ETIME) {
             return ERROR_SOCKET_TIMEOUT;
         }
         
         if (nb_read == 0) {
-            errno = ECONNRESET;
+            errno = SOCKET_ECONNRESET;
         }
         
         return ERROR_SOCKET_READ;
@@ -158,7 +164,7 @@ int SimpleSocketStream::writev(const iovec *iov, int iov_size, ssize_t* nwrite)
     // returned, and errno is set appropriately.
     if (nb_write <= 0) {
         // @see https://github.com/winlinvip/simple-rtmp-server/issues/200
-        if (nb_write < 0 && errno == ETIME) {
+        if (nb_write < 0 && SOCKET_ERRNO() == SOCKET_ETIME) {
             return ERROR_SOCKET_TIMEOUT;
         }
         
@@ -215,7 +221,7 @@ int SimpleSocketStream::write(void* buf, size_t size, ssize_t* nwrite)
     
     if (nb_write <= 0) {
         // @see https://github.com/winlinvip/simple-rtmp-server/issues/200
-        if (nb_write < 0 && errno == ETIME) {
+        if (nb_write < 0 && SOCKET_ERRNO() == SOCKET_ETIME) {
             return ERROR_SOCKET_TIMEOUT;
         }
         

trunk/src/libs/srs_lib_simple_socket.hpp

@@ -43,7 +43,7 @@ private:
     int64_t send_timeout;
     int64_t recv_bytes;
     int64_t send_bytes;
-    int fd;
+    SOCKET fd;
 public:
     SimpleSocketStream();
     virtual ~SimpleSocketStream();

trunk/src/libs/srs_librtmp.cpp

@@ -22,7 +22,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
 
 #include <srs_librtmp.hpp>
-
+#include <srs_platform.hpp>
 #include <stdlib.h>
 
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
@@ -109,30 +109,8 @@ struct Context
 
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
 #ifdef _WIN32
-    int gettimeofday(struct timeval* tv, struct timezone* tz)
-    {  
-        time_t clock;
-        struct tm tm;
-        SYSTEMTIME win_time;
-    
-        GetLocalTime(&win_time);
-    
-        tm.tm_year = win_time.wYear - 1900;
-        tm.tm_mon = win_time.wMonth - 1;
-        tm.tm_mday = win_time.wDay;
-        tm.tm_hour = win_time.wHour;
-        tm.tm_min = win_time.wMinute;
-        tm.tm_sec = win_time.wSecond;
-        tm.tm_isdst = -1;
-    
-        clock = mktime(&tm);
-    
-        tv->tv_sec = (long)clock;
-        tv->tv_usec = win_time.wMilliseconds * 1000;
-    
-        return 0;
-    }
 
+/*    
     int open(const char *pathname, int flags)
     {
         return open(pathname, flags, 0);
@@ -175,286 +153,8 @@ struct Context
     {
         return (ssize_t)fread(buf, count, 1, (FILE*)fd);
     }
-    
-    pid_t getpid(void)
-    {
-        return (pid_t)GetCurrentProcessId();
-    }
-    
-    int usleep(useconds_t usec)
-    {
-        Sleep((DWORD)(usec / 1000));
-        return 0;
-    }
-    
-    ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
-    {
-        ssize_t nwrite = 0;
-        for (int i = 0; i < iovcnt; i++) {
-            const struct iovec* current = iov + i;
-    
-            int nsent = ::send(fd, (char*)current->iov_base, current->iov_len, 0);
-            if (nsent < 0) {
-                return nsent;
-            }
-    
-            nwrite += nsent;
-            if (nsent == 0) {
-                return nwrite;
-            }
-        }
-        return nwrite;
-    }
-    
-    ////////////////////////   strlcpy.c (modified) //////////////////////////
-    
-    /*    $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $    */
-    
-    /*-
-     * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
-     *
-     * Permission to use, copy, modify, and distribute this software for any
-     * purpose with or without fee is hereby granted, provided that the above
-     * copyright notice and this permission notice appear in all copies.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-     * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-     * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */    
 
-    //#include <sys/cdefs.h> // ****
-    //#include <cstddef> // ****
-    // __FBSDID("$FreeBSD: stable/9/sys/libkern/strlcpy.c 243811 2012-12-03 18:08:44Z delphij $"); // ****
-    
-    // #include <sys/types.h> // ****
-    // #include <sys/libkern.h> // ****
-    
-    /*
-     * Copy src to string dst of size siz.  At most siz-1 characters
-     * will be copied.  Always NUL terminates (unless siz == 0).
-     * Returns strlen(src); if retval >= siz, truncation occurred.
-     */
-    
-    //#define __restrict // ****
-    
-    std::size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t siz)
-    {
-        char *d = dst;
-        const char *s = src;
-        size_t n = siz;
-    
-        /* Copy as many bytes as will fit */
-        if (n != 0) {
-            while (--n != 0) {
-                if ((*d++ = *s++) == '\0')
-                    break;
-            }
-        }
-    
-        /* Not enough room in dst, add NUL and traverse rest of src */
-        if (n == 0) {
-            if (siz != 0)
-                *d = '\0';        /* NUL-terminate dst */
-            while (*s++)
-                ;
-        }
-    
-        return(s - src - 1);    /* count does not include NUL */
-    }
-    
-    // http://www.cplusplus.com/forum/general/141779/////////////////////////   inet_ntop.c (modified) //////////////////////////
-    /*
-     * Copyright (c) 2004 by Internet Systems Consortium, Inc. ("ISC")
-     * Copyright (c) 1996-1999 by Internet Software Consortium.
-     *
-     * Permission to use, copy, modify, and distribute this software for any
-     * purpose with or without fee is hereby granted, provided that the above
-     * copyright notice and this permission notice appear in all copies.
-     *
-     * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES
-     * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-     * MERCHANTABILITY AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR
-     * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-     * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-     * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-     * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-     */
-    
-    // #if defined(LIBC_SCCS) && !defined(lint) // ****
-    //static const char rcsid[] = "$Id: inet_ntop.c,v 1.3.18.2 2005/11/03 23:02:22 marka Exp $";
-    // #endif /* LIBC_SCCS and not lint */ // ****
-    // #include <sys/cdefs.h> // ****
-    // __FBSDID("$FreeBSD: stable/9/sys/libkern/inet_ntop.c 213103 2010-09-24 15:01:45Z attilio $"); // ****
-    
-    //#define _WIN32_WINNT _WIN32_WINNT_WIN8 // ****
-    //#include <Ws2tcpip.h> // ****
-    #pragma comment(lib, "Ws2_32.lib") // ****
-    //#include <cstdio> // ****
-    
-    // #include <sys/param.h> // ****
-    // #include <sys/socket.h> // ****
-    // #include <sys/systm.h> // ****
-    
-    // #include <netinet/in.h> // ****
-    
-    /*%
-     * WARNING: Don't even consider trying to compile this on a system where
-     * sizeof(int) < 4.  sizeof(int) > 4 is fine; all the world's not a VAX.
-     */
-    
-    static char *inet_ntop4(const u_char *src, char *dst, socklen_t size);
-    static char *inet_ntop6(const u_char *src, char *dst, socklen_t size);
-    
-    /* char *
-     * inet_ntop(af, src, dst, size)
-     *    convert a network format address to presentation format.
-     * return:
-     *    pointer to presentation format address (`dst'), or NULL (see errno).
-     * author:
-     *    Paul Vixie, 1996.
-     */
-    const char* inet_ntop(int af, const void *src, char *dst, socklen_t size)
-    {
-        switch (af) {
-        case AF_INET:
-            return (inet_ntop4( (unsigned char*)src, (char*)dst, size)); // ****
-    #ifdef AF_INET6
-        #error "IPv6 not supported"
-        //case AF_INET6:
-        //    return (char*)(inet_ntop6( (unsigned char*)src, (char*)dst, size)); // ****
-    #endif
-        default:
-            // return (NULL); // ****
-            return 0 ; // ****
-        }
-        /* NOTREACHED */
-    }
-    
-    /* const char *
-     * inet_ntop4(src, dst, size)
-     *    format an IPv4 address
-     * return:
-     *    `dst' (as a const)
-     * notes:
-     *    (1) uses no statics
-     *    (2) takes a u_char* not an in_addr as input
-     * author:
-     *    Paul Vixie, 1996.
-     */
-    static char * inet_ntop4(const u_char *src, char *dst, socklen_t size)
-    {
-        static const char fmt[128] = "%u.%u.%u.%u";
-        char tmp[sizeof "255.255.255.255"];
-        int l;
-    
-        l = snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2], src[3]); // ****
-        if (l <= 0 || (socklen_t) l >= size) {
-            return (NULL);
-        }
-        strlcpy(dst, tmp, size);
-        return (dst);
-    }
-    
-    /* const char *
-     * inet_ntop6(src, dst, size)
-     *    convert IPv6 binary address into presentation (printable) format
-     * author:
-     *    Paul Vixie, 1996.
-     */
-    static char * inet_ntop6(const u_char *src, char *dst, socklen_t size)
-    {
-        /*
-         * Note that int32_t and int16_t need only be "at least" large enough
-         * to contain a value of the specified size.  On some systems, like
-         * Crays, there is no such thing as an integer variable with 16 bits.
-         * Keep this in mind if you think this function should have been coded
-         * to use pointer overlays.  All the world's not a VAX.
-         */
-        char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp;
-        struct { int base, len; } best, cur;
-    #define NS_IN6ADDRSZ 16
-    #define NS_INT16SZ 2
-        u_int words[NS_IN6ADDRSZ / NS_INT16SZ];
-        int i;
-    
-        /*
-         * Preprocess:
-         *    Copy the input (bytewise) array into a wordwise array.
-         *    Find the longest run of 0x00's in src[] for :: shorthanding.
-         */
-        memset(words, '\0', sizeof words);
-        for (i = 0; i < NS_IN6ADDRSZ; i++)
-            words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3));
-        best.base = -1;
-        best.len = 0;
-        cur.base = -1;
-        cur.len = 0;
-        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-            if (words[i] == 0) {
-                if (cur.base == -1)
-                    cur.base = i, cur.len = 1;
-                else
-                    cur.len++;
-            } else {
-                if (cur.base != -1) {
-                    if (best.base == -1 || cur.len > best.len)
-                        best = cur;
-                    cur.base = -1;
-                }
-            }
-        }
-        if (cur.base != -1) {
-            if (best.base == -1 || cur.len > best.len)
-                best = cur;
-        }
-        if (best.base != -1 && best.len < 2)
-            best.base = -1;
-    
-        /*
-         * Format the result.
-         */
-        tp = tmp;
-        for (i = 0; i < (NS_IN6ADDRSZ / NS_INT16SZ); i++) {
-            /* Are we inside the best run of 0x00's? */
-            if (best.base != -1 && i >= best.base &&
-                i < (best.base + best.len)) {
-                if (i == best.base)
-                    *tp++ = ':';
-                continue;
-            }
-            /* Are we following an initial run of 0x00s or any real hex? */
-            if (i != 0)
-                *tp++ = ':';
-            /* Is this address an encapsulated IPv4? */
-            if (i == 6 && best.base == 0 && (best.len == 6 ||
-                (best.len == 7 && words[7] != 0x0001) ||
-                (best.len == 5 && words[5] == 0xffff))) {
-                if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp)))
-                    return (NULL);
-                tp += strlen(tp);
-                break;
-            }
-            tp += std::sprintf(tp, "%x", words[i]); // ****
-        }
-        /* Was it a trailing run of 0x00's? */
-        if (best.base != -1 && (best.base + best.len) == 
-            (NS_IN6ADDRSZ / NS_INT16SZ))
-            *tp++ = ':';
-        *tp++ = '\0';
-    
-        /*
-         * Check for overflow, copy, and we're done.
-         */
-        if ((socklen_t)(tp - tmp) > size) {
-            return (NULL);
-        }
-        strcpy(dst, tmp);
-        return (dst);
-    }
 #endif
 
 int srs_librtmp_context_parse_uri(Context* context) 

trunk/src/libs/srs_librtmp.hpp

@@ -30,8 +30,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <sys/types.h>
 
+
 // for srs-librtmp, @see https://github.com/winlinvip/simple-rtmp-server/issues/213
-#ifdef _WIN32
+#if 0
     #define _CRT_SECURE_NO_WARNINGS
     typedef unsigned long long u_int64_t;
     typedef long long int64_t;
@@ -72,6 +73,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     int usleep(useconds_t usec);
 #endif
 
+#if defined(_WIN32) && !defined(__CYGWIN__)
+#include <stdint.h>
+typedef uint32_t u_int32_t;
+#endif
+
 /**
 * srs-librtmp is a librtmp like library,
 * used to play/publish rtmp stream from/to rtmp server.

trunk/winbuild/srs-librtmp.def

@@ -0,0 +1,46 @@
+LIBRARY
+EXPORTS
+srs_rtmp_create
+srs_rtmp_create2
+srs_rtmp_destroy
+srs_rtmp_handshake
+srs_rtmp_connect_app
+srs_rtmp_connect_app2
+srs_rtmp_play_stream
+srs_rtmp_publish_stream
+srs_rtmp_read_packet
+srs_rtmp_write_packet
+srs_version_major
+srs_version_minor
+srs_version_revision
+srs_utils_parse_timestamp
+srs_human_format_time
+srs_human_print_rtmp_packet
+srs_rtmp_bandwidth_check
+;
+__srs_rtmp_do_simple_handshake
+__srs_rtmp_connect_server
+__srs_rtmp_dns_resolve
+
+;;;;;;;;for flv read/write;;;;;;;;
+srs_flv_open_read
+srs_flv_open_write
+srs_flv_close
+srs_flv_read_header
+srs_flv_read_tag_header
+srs_flv_read_tag_data
+srs_flv_write_header
+srs_flv_write_tag
+srs_flv_size_tag
+srs_flv_tellg
+srs_flv_lseek
+srs_flv_is_eof
+srs_flv_is_sequence_header
+srs_flv_is_keyframe
+
+;;;;;;;;for h264 read/write;;;;;;;;
+srs_h264_write_raw_frames
+srs_h264_is_dvbsp_error
+srs_h264_is_duplicated_sps_error
+srs_h264_is_duplicated_pps_error
+srs_h264_startswith_annexb

trunk/winbuild/srs-librtmp_vs2010.sln

@@ -0,0 +1,26 @@
+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srs-librtmp", "srs-librtmp_vs2010.vcxproj", "{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "srs_play", "srs_play.vcxproj", "{5149B9A9-5085-4A10-AD6F-23FBE6854390}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Release|Win32 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Debug|Win32.ActiveCfg = Debug|Win32
+		{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Debug|Win32.Build.0 = Debug|Win32
+		{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Release|Win32.ActiveCfg = Release|Win32
+		{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}.Release|Win32.Build.0 = Release|Win32
+		{5149B9A9-5085-4A10-AD6F-23FBE6854390}.Debug|Win32.ActiveCfg = Debug|Win32
+		{5149B9A9-5085-4A10-AD6F-23FBE6854390}.Debug|Win32.Build.0 = Debug|Win32
+		{5149B9A9-5085-4A10-AD6F-23FBE6854390}.Release|Win32.ActiveCfg = Release|Win32
+		{5149B9A9-5085-4A10-AD6F-23FBE6854390}.Release|Win32.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

trunk/winbuild/srs-librtmp_vs2010.vcxproj

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\core\srs_core.cpp" />
+    <ClCompile Include="..\src\core\srs_core_autofree.cpp" />
+    <ClCompile Include="..\src\core\srs_platform.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_buffer.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_codec.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_consts.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_error.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_file.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_flv.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_log.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_stream.cpp" />
+    <ClCompile Include="..\src\kernel\srs_kernel_utility.cpp" />
+    <ClCompile Include="..\src\libs\srs_librtmp.cpp" />
+    <ClCompile Include="..\src\libs\srs_lib_bandwidth.cpp" />
+    <ClCompile Include="..\src\libs\srs_lib_simple_socket.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_amf0.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_handshake.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_io.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_msg_array.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_rtmp.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_stack.cpp" />
+    <ClCompile Include="..\src\rtmp\srs_protocol_utility.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\core\srs_core.hpp" />
+    <ClInclude Include="..\src\core\srs_core_autofree.hpp" />
+    <ClInclude Include="..\src\core\srs_platform.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_buffer.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_codec.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_consts.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_error.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_file.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_flv.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_log.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_stream.hpp" />
+    <ClInclude Include="..\src\kernel\srs_kernel_utility.hpp" />
+    <ClInclude Include="..\src\libs\srs_librtmp.hpp" />
+    <ClInclude Include="..\src\libs\srs_lib_bandwidth.hpp" />
+    <ClInclude Include="..\src\libs\srs_lib_simple_socket.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_amf0.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_handshake.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_io.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_msg_array.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_rtmp.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_stack.hpp" />
+    <ClInclude Include="..\src\rtmp\srs_protocol_utility.hpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="srs-librtmp.def" />
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{051CC3D8-5A99-4534-90EE-AED40EDDEEB2}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>srslibrtmp</RootNamespace>
+    <ProjectName>srs-librtmp</ProjectName>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;SRSLIBRTMP_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src\rtmp;..\src\libs;..\src\kernel;..\src\core;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>srs-librtmp.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;SRSLIBRTMP_EXPORTS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src\rtmp;..\src\libs;..\src\kernel;..\src\core;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <ModuleDefinitionFile>srs-librtmp.def</ModuleDefinitionFile>
+      <AdditionalDependencies>ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

trunk/winbuild/srs-librtmp_vs2010.vcxproj.filters

@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="core">
+      <UniqueIdentifier>{8e33c6db-7a35-4d09-92d0-cc28491abbd6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="kernel">
+      <UniqueIdentifier>{eac81f26-3b4f-4905-85c5-2c0b915107b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="libs">
+      <UniqueIdentifier>{cbb45db3-c682-48bd-9a8c-1ae081aeddbf}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="rtmp">
+      <UniqueIdentifier>{6a284cec-b287-4aeb-b991-e11ebb4be6ec}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\core\srs_core.cpp">
+      <Filter>core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\core\srs_core_autofree.cpp">
+      <Filter>core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\core\srs_platform.cpp">
+      <Filter>core</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_buffer.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_codec.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_consts.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_error.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_file.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_flv.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_log.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_stream.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\kernel\srs_kernel_utility.cpp">
+      <Filter>kernel</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libs\srs_lib_bandwidth.cpp">
+      <Filter>libs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libs\srs_lib_simple_socket.cpp">
+      <Filter>libs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\libs\srs_librtmp.cpp">
+      <Filter>libs</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_amf0.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_handshake.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_io.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_msg_array.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_rtmp.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_stack.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\rtmp\srs_protocol_utility.cpp">
+      <Filter>rtmp</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\core\srs_core.hpp">
+      <Filter>core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core\srs_core_autofree.hpp">
+      <Filter>core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\core\srs_platform.hpp">
+      <Filter>core</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_buffer.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_codec.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_consts.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_error.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_file.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_flv.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_log.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_stream.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\kernel\srs_kernel_utility.hpp">
+      <Filter>kernel</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libs\srs_lib_bandwidth.hpp">
+      <Filter>libs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libs\srs_lib_simple_socket.hpp">
+      <Filter>libs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\libs\srs_librtmp.hpp">
+      <Filter>libs</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_amf0.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_handshake.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_io.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_msg_array.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_rtmp.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_stack.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\rtmp\srs_protocol_utility.hpp">
+      <Filter>rtmp</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="srs-librtmp.def" />
+  </ItemGroup>
+</Project>

trunk/winbuild/srs_auto_headers.hpp

@@ -0,0 +1,56 @@
+// auto generated by configure
+#ifndef SRS_AUTO_HEADER_HPP
+#define SRS_AUTO_HEADER_HPP
+
+#define SRS_AUTO_BUILD_TS "1416731672"
+#define SRS_AUTO_BUILD_DATE "2014-11-23 16:34:32"
+#define SRS_AUTO_UNAME "WIN_NT-6.1 WZY-PC2 1.0.18(0.48/3/2) 2012-11-21 22:34 i686 WINNT"
+#define SRS_AUTO_USER_CONFIGURE "--x86-x64  --export-librtmp-project=../srs-librtmp"
+#define SRS_AUTO_CONFIGURE "--prefix=/usr/local/srs --without-hls --without-dvr --without-nginx --without-ssl --without-ffmpeg --without-transcode --without-ingest --without-stat --without-http-callback --without-http-server --without-http-api --with-librtmp --with-research --without-utest --without-gperf --without-gmc --without-gmp --without-gcp --without-gprof --without-arm-ubuntu12 --without-mips-ubuntu12 --log-trace"
+
+#define SRS_AUTO_EMBEDED_TOOL_CHAIN "normal x86/x64 gcc"
+
+#undef SRS_AUTO_HTTP_PARSER
+#undef SRS_AUTO_HTTP_SERVER
+#undef SRS_AUTO_HTTP_API
+#undef SRS_AUTO_NGINX
+#undef SRS_AUTO_DVR
+#undef SRS_AUTO_HLS
+#undef SRS_AUTO_HTTP_CALLBACK
+#undef SRS_AUTO_SSL
+#undef SRS_AUTO_FFMPEG_TOOL
+#define SRS_AUTO_FFMPEG_STUB
+#undef SRS_AUTO_TRANSCODE
+#undef SRS_AUTO_INGEST
+#undef SRS_AUTO_STAT
+#undef SRS_AUTO_GPERF
+#undef SRS_AUTO_GPERF_MC
+#undef SRS_AUTO_GPERF_MP
+#undef SRS_AUTO_GPERF_CP
+#undef SRS_AUTO_EMBEDED_CPU
+#undef SRS_AUTO_ARM_UBUNTU12
+#undef SRS_AUTO_MIPS_UBUNTU12
+
+#undef SRS_AUTO_VERBOSE
+#undef SRS_AUTO_INFO
+#define SRS_AUTO_TRACE
+
+#define SRS_AUTO_PREFIX "/usr/local/srs"
+
+#define SRS_AUTO_CONSTRIBUTORS "\
+winlin<winlin@vip.126.com> \
+wenjie.zhao<740936897@qq.com> \
+xiangcheng.liu<liuxc0116@foxmail.com> \
+naijia.liu<youngcow@youngcow.net> \
+alcoholyi<alcoholyi@qq.com> \
+byteman<wangchen2011@gmail.com> \
+chad.wang<chad.wang.cn@gmail.com> \
+suhetao<suhetao@gmail.com> \
+Johnny<fengjihu@163.com> \
+karthikeyan<keyanmca@gmail.com> \
+StevenLiu<lq@chinaffmpeg.org> \
+zhengfl<zhengfl_1989@126.com> \
+"
+
+#endif
+

trunk/winbuild/srs_play.vcxproj

@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{5149B9A9-5085-4A10-AD6F-23FBE6854390}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>srs_play</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\src\core;..\src\libs;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>srs-librtmp.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>./debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\research\librtmp\srs_play.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

trunk/winbuild/srs_play.vcxproj.filters

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\research\librtmp\srs_play.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>