[misc] update README files and fix some bugs when run on Windows.

Author: winshining

README.CN.md

@@ -130,8 +130,8 @@
 
 # nginx.conf实例
 
-    worker_processes  4;
-    worker_cpu_affinity  0001 0010 0100 1000;
+    worker_processes  4; #运行在Windows上时，设置为1，因为Windows不支持Unix domain socket
+    worker_cpu_affinity  0001 0010 0100 1000; #运行在Windows上时，省略此配置项
 
     error_log logs/error.log error;
 
@@ -181,9 +181,9 @@
         }
     }
 
-    rtmp_auto_push on;
+    rtmp_auto_push on; #Windows不支持
     rtmp_auto_push_reconnect 1s;
-    rtmp_socket_dir /tmp;
+    rtmp_socket_dir /tmp; #Windows不支持
 
     rtmp {
         out_queue   4096;

README.md

@@ -130,8 +130,8 @@ Since some players don't support HTTP chunked transmission, it's better **NOT**
 
 # Example nginx.conf
 
-    worker_processes  4;
-    worker_cpu_affinity  0001 0010 0100 1000;
+    worker_processes  4; #should be 1 for Windows, for it doesn't support Unix domain socket
+    worker_cpu_affinity  0001 0010 0100 1000; #should be eliminated for Windows
 
     error_log logs/error.log error;
 
@@ -182,9 +182,9 @@ Since some players don't support HTTP chunked transmission, it's better **NOT**
         }
     }
 
-    rtmp_auto_push on;
+    rtmp_auto_push on; #not supported by Windows
     rtmp_auto_push_reconnect 1s;
-    rtmp_socket_dir /tmp;
+    rtmp_socket_dir /tmp; #not supported by Windows
 
     rtmp {
         out_queue   4096;

ngx_http_flv_live_module.c

@@ -3,6 +3,9 @@
  * Copyright (C) Winshining
  */
 
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
 #include "ngx_http_flv_live_module.h"
 #include "ngx_rtmp_relay_module.h"
 
@@ -358,7 +361,7 @@ ngx_http_flv_live_send_tail(ngx_rtmp_session_t *s)
     buf_resp_hdr.pos = response_tail.data;
     buf_resp_hdr.last = response_tail.data + response_tail.len;
     buf_resp_hdr.start = buf_resp_hdr.pos;
-    buf_resp_hdr.end = buf_resp_hdr.end;
+    buf_resp_hdr.end = buf_resp_hdr.last;
 
     cl_resp_hdr.buf = &buf_resp_hdr;
     cl_resp_hdr.next = NULL;
@@ -1303,8 +1306,14 @@ ngx_http_flv_live_append_shared_bufs(ngx_rtmp_core_srv_conf_t *cscf,
 {
     ngx_chain_t        *tag, *chunk_head, *chunk_tail, chunk,
                        *iter, *last_in, **tail, prev_tag_size;
-    u_char             *pos, *p, chunk_item[ngx_strlen("1000003"CRLF) + 1];
-    uint32_t            data_size, tag_size, size;
+    u_char             *pos, *p,
+#if !(NGX_WIN32)
+                        chunk_item[ngx_strlen("0000000000000000" CRLF) + 1];
+#else
+                        chunk_item[19];
+#endif
+    uint32_t            data_size, size;
+    off_t               tag_size;
     ngx_buf_t           prev_tag_size_buf, chunk_buf;
 
     for (data_size = 0, iter = in, last_in = iter; iter; iter = iter->next) {
@@ -1372,7 +1381,7 @@ ngx_http_flv_live_append_shared_bufs(ngx_rtmp_core_srv_conf_t *cscf,
     /* add chunk header and tail */
     if (chunked) {
         /* 4 is the size of previous tag size itself */
-        *ngx_sprintf(chunk_item, "%xO"CRLF, tag_size + 4) = 0;
+        *ngx_sprintf(chunk_item, "%xO" CRLF, tag_size + 4) = 0;
 
         chunk_buf.start = chunk_item;
         chunk_buf.pos = chunk_buf.start;

ngx_http_flv_live_module.h

@@ -7,9 +7,6 @@
 #define _NGX_HTTP_FLV_LIVE_H_INCLUDED_
 
 
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include <ngx_http.h>
 #include "ngx_rtmp_cmd_module.h"
 #include "ngx_rtmp_live_module.h"
 #include "ngx_rtmp_codec_module.h"

ngx_rtmp_codec_module.c

@@ -242,12 +242,12 @@ ngx_rtmp_codec_video_is_combined_nals(ngx_chain_t *in, ngx_rtmp_session_t *s)
 }
 
 
-static inline ngx_int_t
+static ngx_inline ngx_int_t
 ngx_rtmp_get_codec_header_type(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
         ngx_chain_t *in)
 {
     if (ngx_rtmp_is_codec_header(in)) {
-        ngx_log_debug(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
                 "codec: a sequence header in chain");
 
         return NGX_RTMP_CODEC_SINGLE_SEQ_HEADER;
@@ -256,7 +256,7 @@ ngx_rtmp_get_codec_header_type(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
     if (h->type == NGX_RTMP_MSG_VIDEO &&
         ngx_rtmp_codec_video_is_combined_nals(in, s) == NGX_OK)
     {
-        ngx_log_debug(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+        ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
                 "codec: an AVC NALU or an AAC raw packet in chain");
 
         return NGX_RTMP_CODEC_COMBO_SEQ_HEADER;

ngx_rtmp_gop_cache_module.c

@@ -5,6 +5,9 @@
  */
 
 
+#include <ngx_config.h>
+#include <ngx_core.h>
+#include <ngx_http.h>
 #include "ngx_http_flv_live_module.h"
 #include "ngx_rtmp_gop_cache_module.h"
 

ngx_rtmp_gop_cache_module.h

@@ -8,13 +8,6 @@
 #define _NGX_RTMP_GOP_CACHE_H_INCLUDE_
 
 
-#include <ngx_config.h>
-#include <ngx_core.h>
-#include "ngx_rtmp_cmd_module.h"
-#include "ngx_rtmp_live_module.h"
-#include "ngx_rtmp_codec_module.h"
-
-
 #define NGX_GOP_CACHE_POOL_CREATE_SIZE          4096
 
 

ngx_rtmp_live_module.c

@@ -7,6 +7,7 @@
 
 #include <ngx_config.h>
 #include <ngx_core.h>
+#include <ngx_http.h>
 #include "ngx_rtmp_live_module.h"
 #include "ngx_rtmp_cmd_module.h"
 #include "ngx_rtmp_codec_module.h"