include $(TOPDIR)/rules.mk
PKG_NAME:=nginx
-PKG_VERSION:=1.19.6
-PKG_RELEASE:=2
+PKG_VERSION:=1.21.1
+PKG_RELEASE:=1
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/
-PKG_HASH:=b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5
+PKG_HASH:=68ba0311342115163a0354cad34f90c05a7e8bf689dc498abf07899eda155560
PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
Ansuel Smith <ansuelsmth@gmail.com>
Package/nginx-all-module/prerm = $(Package/nginx-ssl/prerm)
-define Build/Prepare
- $(Build/Prepare/Default)
- $(Prepare/nginx-naxsi)
- $(Prepare/lua-nginx)
- $(Prepare/nginx-brotli)
- $(Prepare/nginx-headers-more)
- $(Prepare/nginx-rtmp)
- $(Prepare/nginx-ts)
- $(Prepare/nginx-dav-ext-module)
- $(Prepare/nginx-ubus-module)
+define Download/nginx-headers-more
+ VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
+ SUBDIR:=nginx-headers-more
+ FILE:=headers-more-nginx-module-$$(VERSION).tar.xz
+ URL:=https://github.com/openresty/headers-more-nginx-module.git
+ MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd
+ PROTO:=git
endef
+define Prepare/nginx-headers-more
+ $(eval $(Download/nginx-headers-more))
+ xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
-ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
- define Download/nginx-headers-more
- VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
- SUBDIR:=nginx-headers-more
- FILE:=headers-more-nginx-module-$$(VERSION).tar.xz
- URL:=https://github.com/openresty/headers-more-nginx-module.git
- MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd
- PROTO:=git
- endef
- $(eval $(call Download,nginx-headers-more))
+define Download/nginx-brotli
+ VERSION:=e505dce68acc190cc5a1e780a3b0275e39f160ca
+ SUBDIR:=nginx-brotli
+ FILE:=ngx-brotli-module-$$(VERSION).tar.xz
+ URL:=https://github.com/google/ngx_brotli.git
+ MIRROR_HASH:=04847f11ef808fed50f44b2af0ef3abf59ff0ffc06dfc7394d9ab51d53fef31f
+ PROTO:=git
+endef
- define Prepare/nginx-headers-more
- $(eval $(Download/nginx-headers-more))
+define Prepare/nginx-brotli
+ $(eval $(Download/nginx-brotli))
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- endef
-endif
+endef
+define Download/nginx-rtmp
+ VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
+ SUBDIR:=nginx-rtmp
+ FILE:=ngx-rtmp-module-$$(VERSION).tar.xz
+ URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
+ MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
+ PROTO:=git
+endef
-ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
- define Download/nginx-brotli
- VERSION:=e505dce68acc190cc5a1e780a3b0275e39f160ca
- SUBDIR:=nginx-brotli
- FILE:=ngx-brotli-module-$$(VERSION).tar.xz
- URL:=https://github.com/google/ngx_brotli.git
- MIRROR_HASH:=04847f11ef808fed50f44b2af0ef3abf59ff0ffc06dfc7394d9ab51d53fef31f
- PROTO:=git
- endef
- $(eval $(call Download,nginx-brotli))
+define Prepare/nginx-rtmp
+ $(eval $(Download/nginx-rtmp))
+ xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
- define Prepare/nginx-brotli
- $(eval $(Download/nginx-brotli))
+define Download/nginx-ts
+ VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
+ SUBDIR:=nginx-ts
+ FILE:=ngx-ts-module-$$(VERSION).tar.xz
+ URL:=https://github.com/arut/nginx-ts-module.git
+ MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
+ PROTO:=git
+endef
+
+define Prepare/nginx-ts
+ $(eval $(Download/nginx-ts))
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- endef
-endif
+endef
+define Download/nginx-naxsi
+ VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
+ SUBDIR:=nginx-naxsi
+ FILE:=nginx-naxsi-module-$$(VERSION).tar.xz
+ URL:=https://github.com/nbs-system/naxsi.git
+ MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535
+ PROTO:=git
+endef
-ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
- define Download/nginx-rtmp
- VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
- SUBDIR:=nginx-rtmp
- FILE:=ngx-rtmp-module-$$(VERSION).tar.xz
- URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
- MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
- PROTO:=git
- endef
- $(eval $(call Download,nginx-rtmp))
+define Prepare/nginx-naxsi
+ $(eval $(Download/nginx-naxsi))
+ xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
- define Prepare/nginx-rtmp
- $(eval $(Download/nginx-rtmp))
+define Download/lua-nginx
+ VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
+ SUBDIR:=lua-nginx
+ FILE:=lua-nginx-module-$$(VERSION).tar.xz
+ URL:=https://github.com/openresty/lua-nginx-module.git
+ MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395
+ PROTO:=git
+endef
+
+define Prepare/lua-nginx
+ $(eval $(Download/lua-nginx))
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- $(call PatchDir,$(PKG_BUILD_DIR)/nginx-rtmp,./patches-rtmp-nginx)
- endef
-endif
+endef
+define Download/nginx-dav-ext-module
+ VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
+ SUBDIR:=nginx-dav-ext-module
+ FILE:=nginx-dav-ext-module-$$(VERSION).tar.xz
+ URL:=https://github.com/arut/nginx-dav-ext-module.git
+ MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
+ PROTO:=git
+endef
-ifeq ($(CONFIG_NGINX_TS_MODULE),y)
- define Download/nginx-ts
- VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
- SUBDIR:=nginx-ts
- FILE:=ngx-ts-module-$$(VERSION).tar.xz
- URL:=https://github.com/arut/nginx-ts-module.git
- MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
- PROTO:=git
- endef
- $(eval $(call Download,nginx-ts))
+define Prepare/nginx-dav-ext-module
+ $(eval $(Download/nginx-dav-ext-module))
+ xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+endef
- define Prepare/nginx-ts
- $(eval $(Download/nginx-ts))
+define Download/nginx-ubus-module
+ VERSION:=b2d7260dcb428b2fb65540edb28d7538602b4a26
+ SUBDIR:=nginx-ubus-module
+ FILE:=nginx-ubus-module-$$(VERSION).tar.xz
+ URL:=https://github.com/Ansuel/nginx-ubus-module.git
+ MIRROR_HASH:=472cef416d25effcac66c85417ab6596e634a7a64d45b709bb090892d567553c
+ PROTO:=git
+endef
+
+define Prepare/nginx-ubus-module
+ $(eval $(Download/nginx-ubus-module))
xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- endef
+endef
+
+define Build/Patch
+ $(if $(QUILT),rm -rf $(PKG_BUILD_DIR)/patches; mkdir -p $(PKG_BUILD_DIR)/patches)
+ $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
+ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" ""
+ $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
+endif
+ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
+ $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
endif
+ifneq "$(or $(CONFIG_NGINX_RTMP_MODULE),$(QUILT))" ""
+ $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
+endif
+ $(if $(QUILT),touch $(PKG_BUILD_DIR)/.quilt_used)
+endef
+define Quilt/Refresh/Package
+ $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nginx,nginx/)
+ $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/dav-nginx,dav-nginx/)
+ $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/lua-nginx,lua-nginx/)
+ $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rtmp-nginx,rtmp-nginx/)
+endef
+
+define Build/Prepare
+ rm -rf $(PKG_BUILD_DIR)
+ mkdir -p $(PKG_BUILD_DIR)
+ $(PKG_UNPACK)
ifeq ($(CONFIG_NGINX_NAXSI),y)
- define Download/nginx-naxsi
- VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
- SUBDIR:=nginx-naxsi
- FILE:=nginx-naxsi-module-$$(VERSION).tar.xz
- URL:=https://github.com/nbs-system/naxsi.git
- MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535
- PROTO:=git
- endef
$(eval $(call Download,nginx-naxsi))
+ $(Prepare/nginx-naxsi)
+endif
- define Prepare/nginx-naxsi
- $(eval $(Download/nginx-naxsi))
- xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- endef
+ifneq "$(or $(CONFIG_NGINX_LUA),$(QUILT))" ""
+ $(eval $(call Download,lua-nginx))
+ $(Prepare/lua-nginx)
endif
+ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
+ $(eval $(call Download,nginx-brotli))
+ $(Prepare/nginx-brotli)
+endif
-ifeq ($(CONFIG_NGINX_LUA),y)
- define Download/lua-nginx
- VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
- SUBDIR:=lua-nginx
- FILE:=lua-nginx-module-$$(VERSION).tar.xz
- URL:=https://github.com/openresty/lua-nginx-module.git
- MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395
- PROTO:=git
- endef
- $(eval $(call Download,lua-nginx))
+ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
+ $(eval $(call Download,nginx-headers-more))
+ $(Prepare/nginx-headers-more)
+endif
- define Prepare/lua-nginx
- $(eval $(Download/lua-nginx))
- xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- $(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
- endef
+ifneq "$(or $(CONFIG_NGINX_RTMP_MODULE),$(QUILT))" ""
+ $(eval $(call Download,nginx-rtmp))
+ $(Prepare/nginx-rtmp)
endif
+ifeq ($(CONFIG_NGINX_TS_MODULE),y)
+ $(eval $(call Download,nginx-ts))
+ $(Prepare/nginx-ts)
+endif
-ifeq ($(CONFIG_NGINX_DAV),y)
- define Download/nginx-dav-ext-module
- VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
- SUBDIR:=nginx-dav-ext-module
- FILE:=nginx-dav-ext-module-$$(VERSION).tar.xz
- URL:=https://github.com/arut/nginx-dav-ext-module.git
- MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
- PROTO:=git
- endef
+ifneq "$(or $(CONFIG_NGINX_DAV),$(QUILT))" ""
$(eval $(call Download,nginx-dav-ext-module))
-
- define Prepare/nginx-dav-ext-module
- $(eval $(Download/nginx-dav-ext-module))
- xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- $(call PatchDir,$(PKG_BUILD_DIR),./patches-dav-nginx)
- endef
+ $(Prepare/nginx-dav-ext-module)
endif
ifeq ($(CONFIG_NGINX_UBUS),y)
- define Download/nginx-ubus-module
- VERSION:=b2d7260dcb428b2fb65540edb28d7538602b4a26
- SUBDIR:=nginx-ubus-module
- FILE:=nginx-ubus-module-$$(VERSION).tar.xz
- URL:=https://github.com/Ansuel/nginx-ubus-module.git
- MIRROR_HASH:=472cef416d25effcac66c85417ab6596e634a7a64d45b709bb090892d567553c
- PROTO:=git
- endef
$(eval $(call Download,nginx-ubus-module))
-
- define Prepare/nginx-ubus-module
- $(eval $(Download/nginx-ubus-module))
- xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
- endef
+ $(Prepare/nginx-ubus-module)
endif
+ $(Build/Patch)
+endef
+
$(eval $(call BuildPackage,nginx-ssl))
$(eval $(call BuildPackage,nginx-all-module))
$(eval $(call BuildPackage,nginx-mod-luci))
ngx_rtmp_handler.c | 108 +++++++++++++++++++++---------------------
5 files changed, 68 insertions(+), 64 deletions(-)
-diff --git a/nginx-rtmp/ngx_rtmp.c b/nginx-rtmp/ngx_rtmp.c
-index ad671d475..011f3ad50 100644
---- a/ngx_rtmp.c
-+++ b/ngx_rtmp.c
-@@ -828,6 +828,7 @@ ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
- void *
- ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
- {
-+#if (NGX_HAVE_LITTLE_ENDIAN)
- u_char *d, *s;
-
- d = dst;
-@@ -836,6 +837,9 @@ ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
- while(s >= (u_char*)src) {
- *d++ = *s--;
- }
-+#else
-+ dst = ngx_cpymem(dst, src, n);
-+#endif
-
- return dst;
- }
-diff --git a/nginx-rtmp/ngx_rtmp.h b/nginx-rtmp/ngx_rtmp.h
-index f3a3d6f18..ddc30ea1c 100644
---- a/ngx_rtmp.h
-+++ b/ngx_rtmp.h
-@@ -427,22 +427,26 @@ void * ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n);
- static ngx_inline uint16_t
- ngx_rtmp_r16(uint16_t n)
- {
-- return (n << 8) | (n >> 8);
-+ return ntohs(n);
+--- a/nginx-rtmp/ngx_rtmp.c
++++ b/nginx-rtmp/ngx_rtmp.c
+@@ -825,22 +825,6 @@ ngx_rtmp_fire_event(ngx_rtmp_session_t *
}
- static ngx_inline uint32_t
- ngx_rtmp_r32(uint32_t n)
+-void *
+-ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
+-{
+- u_char *d, *s;
+-
+- d = dst;
+- s = (u_char*)src + n - 1;
+-
+- while(s >= (u_char*)src) {
+- *d++ = *s--;
+- }
+-
+- return dst;
+-}
+-
+-
+ static ngx_int_t
+ ngx_rtmp_init_process(ngx_cycle_t *cycle)
{
-- return (n << 24) | ((n << 8) & 0xff0000) | ((n >> 8) & 0xff00) | (n >> 24);
-+ return ntohl(n);
- }
+--- a/nginx-rtmp/ngx_rtmp.h
++++ b/nginx-rtmp/ngx_rtmp.h
+@@ -417,34 +417,33 @@ ngx_int_t ngx_rtmp_fire_event(ngx_rtmp_s
+ ngx_int_t ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size);
- static ngx_inline uint64_t
- ngx_rtmp_r64(uint64_t n)
+-/* Bit reverse: we need big-endians in many places */
+-void * ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n);
+-
+-#define ngx_rtmp_rcpymem(dst, src, n) \
+- (((u_char*)ngx_rtmp_rmemcpy(dst, src, n)) + (n))
+-
+-
+-static ngx_inline uint16_t
+-ngx_rtmp_r16(uint16_t n)
++/* Bit agnosticism: we need network to host byte-order conversion in many places */
++static ngx_inline uint64_t
++ntohll(uint64_t n)
{
-- return (uint64_t) ngx_rtmp_r32((uint32_t) n) << 32 |
-- ngx_rtmp_r32((uint32_t) (n >> 32));
+- return (n << 8) | (n >> 8);
+#if (NGX_HAVE_LITTLE_ENDIAN)
+ return (uint64_t) ntohl((uint32_t) n) << 32 |
+ ntohl((uint32_t) (n >> 32));
+#endif
}
+-
+ static ngx_inline uint32_t
+-ngx_rtmp_r32(uint32_t n)
++n3toh4(u_char* src)
+ {
+- return (n << 24) | ((n << 8) & 0xff0000) | ((n >> 8) & 0xff00) | (n >> 24);
++ return ((uint32_t)src[0]<<16)|((uint32_t)src[1]<<8)|src[2];
+ }
-diff --git a/nginx-rtmp/ngx_rtmp_amf.c b/nginx-rtmp/ngx_rtmp_amf.c
-index b904651dc..7c44519da 100644
---- a/ngx_rtmp_amf.c
-+++ b/ngx_rtmp_amf.c
-@@ -14,15 +14,11 @@
- static ngx_inline void*
- ngx_rtmp_amf_reverse_copy(void *dst, void* src, size_t len)
+-
+-static ngx_inline uint64_t
+-ngx_rtmp_r64(uint64_t n)
++static ngx_inline u_char*
++h4ton3(u_char* dst, uint32_t src)
{
+- return (uint64_t) ngx_rtmp_r32((uint32_t) n) << 32 |
+- ngx_rtmp_r32((uint32_t) (n >> 32));
+-}
++ dst[0]=(u_char)(src>>16);
++ dst[1]=(u_char)(src>>8);
++ dst[2]=(u_char)src;
+
++ return dst+3;
++}
+
+ /* Receiving messages */
+ ngx_int_t ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
+--- a/nginx-rtmp/ngx_rtmp_amf.c
++++ b/nginx-rtmp/ngx_rtmp_amf.c
+@@ -10,23 +10,6 @@
+ #include "ngx_rtmp.h"
+ #include <string.h>
+
+-
+-static ngx_inline void*
+-ngx_rtmp_amf_reverse_copy(void *dst, void* src, size_t len)
+-{
- size_t k;
-
- if (dst == NULL || src == NULL) {
- return NULL;
- }
-
+- if (dst == NULL || src == NULL) {
+- return NULL;
+- }
+-
- for(k = 0; k < len; ++k) {
- ((u_char*)dst)[k] = ((u_char*)src)[len - 1 - k];
- }
-+ ngx_rtmp_rmemcpy(dst, src, len);
+-
+- return dst;
+-}
+-
+ #define NGX_RTMP_AMF_DEBUG_SIZE 72
+
+ #ifdef NGX_DEBUG
+@@ -207,7 +190,7 @@ ngx_rtmp_amf_read_object(ngx_rtmp_amf_ct
+ return NGX_ERROR;
+ }
+
+- ngx_rtmp_amf_reverse_copy(&len, buf, 2);
++ len=ntohs(*(uint16_t*)&buf[0]);
+
+ if (!len)
+ break;
+@@ -258,7 +241,7 @@ ngx_rtmp_amf_read_array(ngx_rtmp_amf_ctx
+ if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK)
+ return NGX_ERROR;
+
+- ngx_rtmp_amf_reverse_copy(&len, buf, 4);
++ len=ntohl(*(uint32_t*)&buf[0]);
+
+ for (n = 0; n < len; ++n) {
+ if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
+@@ -352,10 +335,9 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ct
+
+ switch (type) {
+ case NGX_RTMP_AMF_NUMBER:
+- if (ngx_rtmp_amf_get(ctx, buf, 8) != NGX_OK) {
++ if (ngx_rtmp_amf_get(ctx, data, 8) != NGX_OK) {
+ return NGX_ERROR;
+ }
+- ngx_rtmp_amf_reverse_copy(data, buf, 8);
+ break;
+
+ case NGX_RTMP_AMF_BOOLEAN:
+@@ -368,7 +350,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ct
+ if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
+ return NGX_ERROR;
+ }
+- ngx_rtmp_amf_reverse_copy(&len, buf, 2);
++ len=ntohs(*(uint16_t*)buf);
+
+ if (data == NULL) {
+ rc = ngx_rtmp_amf_get(ctx, data, len);
+@@ -438,14 +420,14 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ct
+ if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
+ return NGX_ERROR;
+ }
+- ngx_rtmp_amf_reverse_copy(data, buf, 2);
++ *(uint16_t*)data=ntohs(*(uint16_t*)buf);
+ break;
+
+ case NGX_RTMP_AMF_INT32:
+ if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK) {
+ return NGX_ERROR;
+ }
+- ngx_rtmp_amf_reverse_copy(data, buf, 4);
++ *(uint32_t*)data=ntohs(*(uint32_t*)buf);
+ break;
+
+ case NGX_RTMP_AMF_END:
+@@ -476,9 +458,8 @@ ngx_rtmp_amf_write_object(ngx_rtmp_amf_c
+
+ len = (uint16_t) elts[n].name.len;
+
+- if (ngx_rtmp_amf_put(ctx,
+- ngx_rtmp_amf_reverse_copy(buf,
+- &len, 2), 2) != NGX_OK)
++ *(uint16_t*)buf = htons(len);
++ if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+@@ -509,9 +490,8 @@ ngx_rtmp_amf_write_array(ngx_rtmp_amf_ct
+ u_char buf[4];
+
+ len = nelts;
+- if (ngx_rtmp_amf_put(ctx,
+- ngx_rtmp_amf_reverse_copy(buf,
+- &len, 4), 4) != NGX_OK)
++ *(uint32_t*)buf = htonl(len);
++ if (ngx_rtmp_amf_put(ctx, buf, 4) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+@@ -554,9 +534,7 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *c
+
+ switch(type) {
+ case NGX_RTMP_AMF_NUMBER:
+- if (ngx_rtmp_amf_put(ctx,
+- ngx_rtmp_amf_reverse_copy(buf,
+- data, 8), 8) != NGX_OK)
++ if (ngx_rtmp_amf_put(ctx, data, 8) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+@@ -573,9 +551,8 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *c
+ len = (uint16_t) ngx_strlen((u_char*) data);
+ }
+
+- if (ngx_rtmp_amf_put(ctx,
+- ngx_rtmp_amf_reverse_copy(buf,
+- &len, 2), 2) != NGX_OK)
++ *(uint16_t*)buf = htons(len);
++ if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+@@ -621,18 +598,16 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *c
+ break;
+
+ case NGX_RTMP_AMF_INT16:
+- if (ngx_rtmp_amf_put(ctx,
+- ngx_rtmp_amf_reverse_copy(buf,
+- data, 2), 2) != NGX_OK)
++ *(uint16_t*)buf = htons(*(uint16_t*)data);
++ if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+ break;
- return dst;
+ case NGX_RTMP_AMF_INT32:
+- if (ngx_rtmp_amf_put(ctx,
+- ngx_rtmp_amf_reverse_copy(buf,
+- data, 4), 4) != NGX_OK)
++ *(uint32_t*)buf = htonl(*(uint32_t*)data);
++ if (ngx_rtmp_amf_put(ctx, buf, 4) != NGX_OK)
+ {
+ return NGX_ERROR;
+ }
+--- a/nginx-rtmp/ngx_rtmp_flv_module.c
++++ b/nginx-rtmp/ngx_rtmp_flv_module.c
+@@ -102,7 +102,7 @@ ngx_rtmp_flv_fill_index(ngx_rtmp_amf_ctx
+ return NGX_ERROR;
+ }
+
+- ngx_rtmp_rmemcpy(&nelts, b->pos + ctx->offset, 4);
++ nelts=htonl(*(uint32_t*)(b->pos + ctx->offset));
+
+ idx->nelts = nelts;
+ idx->offset = ctx->offset + 4;
+@@ -201,11 +201,7 @@ ngx_rtmp_flv_init_index(ngx_rtmp_session
+ static double
+ ngx_rtmp_flv_index_value(void *src)
+ {
+- double v;
+-
+- ngx_rtmp_rmemcpy(&v, src, 8);
+-
+- return v;
++ return *(double*)src;
}
-diff --git a/nginx-rtmp/ngx_rtmp_flv_module.c b/nginx-rtmp/ngx_rtmp_flv_module.c
-index 4776e5419..76ce64752 100644
---- a/ngx_rtmp_flv_module.c
-+++ b/ngx_rtmp_flv_module.c
-@@ -445,7 +445,7 @@ ngx_rtmp_flv_send(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t *ts)
- ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
- ngx_rtmp_rmemcpy(&h.timestamp, ngx_rtmp_flv_header + 4, 3);
+
+@@ -352,8 +348,7 @@ ngx_rtmp_flv_read_meta(ngx_rtmp_session_
+ h.msid = NGX_RTMP_MSID;
+ h.csid = NGX_RTMP_CSID_AMF;
+
+- size = 0;
+- ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
++ size = n3toh4(ngx_rtmp_flv_header + 1);
+
+ ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+ "flv: metadata size=%D", size);
+@@ -440,12 +435,9 @@ ngx_rtmp_flv_send(ngx_rtmp_session_t *s,
+ h.msid = NGX_RTMP_MSID;
+ h.type = ngx_rtmp_flv_header[0];
+
+- size = 0;
+-
+- ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
+- ngx_rtmp_rmemcpy(&h.timestamp, ngx_rtmp_flv_header + 4, 3);
+-
- ((u_char *) &h.timestamp)[3] = ngx_rtmp_flv_header[7];
++ size = n3toh4(ngx_rtmp_flv_header + 1);
++ h.timestamp = n3toh4(ngx_rtmp_flv_header + 4);
+ h.timestamp |= ((uint32_t) ngx_rtmp_flv_header[7] << 24);
ctx->offset += (sizeof(ngx_rtmp_flv_header) + size + 4);
-diff --git a/nginx-rtmp/ngx_rtmp_handler.c b/nginx-rtmp/ngx_rtmp_handler.c
-index c6b43c8bc..5611ec88c 100644
---- a/ngx_rtmp_handler.c
-+++ b/ngx_rtmp_handler.c
+--- a/nginx-rtmp/ngx_rtmp_handler.c
++++ b/nginx-rtmp/ngx_rtmp_handler.c
@@ -200,7 +200,7 @@ ngx_rtmp_recv(ngx_event_t *rev)
ngx_rtmp_stream_t *st, *st0;
ngx_chain_t *in, *head;
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, c->log, 0, "RTMP extended timestamp %uD", (uint32_t)timestamp);
}
-@@ -584,7 +581,7 @@ ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+@@ -584,7 +581,7 @@ ngx_rtmp_prepare_message(ngx_rtmp_sessio
ngx_rtmp_header_t *lh, ngx_chain_t *out)
{
ngx_chain_t *l;
ngx_int_t hsize, thsize, nbufs;
uint32_t mlen, timestamp, ext_timestamp;
static uint8_t hdrsize[] = { 12, 8, 4, 1 };
-@@ -677,33 +674,36 @@ ngx_rtmp_prepare_message(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+@@ -677,33 +674,36 @@ ngx_rtmp_prepare_message(ngx_rtmp_sessio
/* message header */
if (fmt <= 2) {
/* This CONTRADICTS the standard
* but that's the way flash client
-
-From 7fb255e6700bc11955d276183be9bf01a5227c05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Bub=C3=ADk?= <jan.bubik@technodat.cz>
-Date: Wed, 13 May 2020 22:41:31 +0200
-Subject: [PATCH 2/3] arut's 205664d8c5e040a61b36ae0b74ddf17bc16d2150 [fixed
- sending protocol messages]
-
----
- ngx_rtmp_send.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/nginx-rtmp/ngx_rtmp_send.c b/nginx-rtmp/ngx_rtmp_send.c
-index 69dfed955..764e9ef6f 100644
---- a/ngx_rtmp_send.c
-+++ b/ngx_rtmp_send.c
+--- a/nginx-rtmp/ngx_rtmp_send.c
++++ b/nginx-rtmp/ngx_rtmp_send.c
@@ -33,13 +33,13 @@
*(__b->last++) = (u_char)(utype);
#define NGX_RTMP_USER_END(s) \
ngx_rtmp_prepare_message(s, &__h, NULL, __l); \
-
-From 96ffb76f8d758a9a05580c7d538e2555aeb042af Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jan=20Bub=C3=ADk?= <jan.bubik@technodat.cz>
-Date: Fri, 15 May 2020 02:19:24 +0200
-Subject: [PATCH 3/3] More LE/BE compatibility
-
----
- hls/ngx_rtmp_hls_module.c | 20 +++-
- ngx_rtmp.c | 20 ----
- ngx_rtmp.h | 39 +++----
- ngx_rtmp_amf.c | 55 +++------
- ngx_rtmp_bitop.h | 2 +-
- ngx_rtmp_eval.c | 2 +-
- ngx_rtmp_flv_module.c | 18 +--
- ngx_rtmp_handshake.c | 6 +-
- ngx_rtmp_mp4_module.c | 240 +++++++++++++++++++-------------------
- ngx_rtmp_receive.c | 37 ++----
- ngx_rtmp_record_module.c | 42 ++-----
- 11 files changed, 201 insertions(+), 280 deletions(-)
-
-diff --git a/nginx-rtmp/hls/ngx_rtmp_hls_module.c b/nginx-rtmp/hls/ngx_rtmp_hls_module.c
-index fbf2bcbf3..ff2b0f7b3 100644
---- a/hls/ngx_rtmp_hls_module.c
-+++ b/hls/ngx_rtmp_hls_module.c
-@@ -296,7 +296,7 @@ static ngx_command_t ngx_rtmp_hls_commands[] = {
+--- a/nginx-rtmp/hls/ngx_rtmp_hls_module.c
++++ b/nginx-rtmp/hls/ngx_rtmp_hls_module.c
+@@ -296,7 +296,7 @@ static ngx_command_t ngx_rtmp_hls_comman
ngx_conf_set_enum_slot,
NGX_RTMP_APP_CONF_OFFSET,
offsetof(ngx_rtmp_hls_app_conf_t, allow_client_cache),
{ ngx_string("hls_variant"),
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_1MORE,
-@@ -816,7 +816,7 @@ ngx_rtmp_hls_append_sps_pps(ngx_rtmp_session_t *s, ngx_buf_t *out)
+@@ -816,7 +816,7 @@ ngx_rtmp_hls_append_sps_pps(ngx_rtmp_ses
return NGX_ERROR;
}
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"hls: header NAL length: %uz", (size_t) len);
-@@ -2072,7 +2072,21 @@ ngx_rtmp_hls_video(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+@@ -2072,7 +2072,21 @@ ngx_rtmp_hls_video(ngx_rtmp_session_t *s
}
len = 0;
if (len == 0) {
continue;
-diff --git a/nginx-rtmp/ngx_rtmp.c b/nginx-rtmp/ngx_rtmp.c
-index 011f3ad50..e138f1209 100644
---- a/ngx_rtmp.c
-+++ b/ngx_rtmp.c
-@@ -825,26 +825,6 @@ ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
- }
-
-
--void *
--ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n)
--{
--#if (NGX_HAVE_LITTLE_ENDIAN)
-- u_char *d, *s;
--
-- d = dst;
-- s = (u_char*)src + n - 1;
--
-- while(s >= (u_char*)src) {
-- *d++ = *s--;
-- }
--#else
-- dst = ngx_cpymem(dst, src, n);
--#endif
--
-- return dst;
--}
--
--
- static ngx_int_t
- ngx_rtmp_init_process(ngx_cycle_t *cycle)
- {
-diff --git a/nginx-rtmp/ngx_rtmp.h b/nginx-rtmp/ngx_rtmp.h
-index ddc30ea1c..e88de4380 100644
---- a/ngx_rtmp.h
-+++ b/ngx_rtmp.h
-@@ -417,29 +417,9 @@ ngx_int_t ngx_rtmp_fire_event(ngx_rtmp_session_t *s, ngx_uint_t evt,
- ngx_int_t ngx_rtmp_set_chunk_size(ngx_rtmp_session_t *s, ngx_uint_t size);
-
-
--/* Bit reverse: we need big-endians in many places */
--void * ngx_rtmp_rmemcpy(void *dst, const void* src, size_t n);
--
--#define ngx_rtmp_rcpymem(dst, src, n) \
-- (((u_char*)ngx_rtmp_rmemcpy(dst, src, n)) + (n))
--
--
--static ngx_inline uint16_t
--ngx_rtmp_r16(uint16_t n)
--{
-- return ntohs(n);
--}
--
--
--static ngx_inline uint32_t
--ngx_rtmp_r32(uint32_t n)
--{
-- return ntohl(n);
--}
--
--
-+/* Bit agnosticism: we need network to host byte-order conversion in many places */
- static ngx_inline uint64_t
--ngx_rtmp_r64(uint64_t n)
-+ntohll(uint64_t n)
- {
- #if (NGX_HAVE_LITTLE_ENDIAN)
- return (uint64_t) ntohl((uint32_t) n) << 32 |
-@@ -449,6 +429,21 @@ ngx_rtmp_r64(uint64_t n)
- #endif
- }
-
-+static ngx_inline uint32_t
-+n3toh4(u_char* src)
-+{
-+ return ((uint32_t)src[0]<<16)|((uint32_t)src[1]<<8)|src[2];
-+}
-+
-+static ngx_inline u_char*
-+h4ton3(u_char* dst, uint32_t src)
-+{
-+ dst[0]=(u_char)(src>>16);
-+ dst[1]=(u_char)(src>>8);
-+ dst[2]=(u_char)src;
-+
-+ return dst+3;
-+}
-
- /* Receiving messages */
- ngx_int_t ngx_rtmp_receive_message(ngx_rtmp_session_t *s,
-diff --git a/nginx-rtmp/ngx_rtmp_amf.c b/nginx-rtmp/ngx_rtmp_amf.c
-index 7c44519da..465dc01cb 100644
---- a/ngx_rtmp_amf.c
-+++ b/ngx_rtmp_amf.c
-@@ -10,19 +10,6 @@
- #include "ngx_rtmp.h"
- #include <string.h>
-
--
--static ngx_inline void*
--ngx_rtmp_amf_reverse_copy(void *dst, void* src, size_t len)
--{
-- if (dst == NULL || src == NULL) {
-- return NULL;
-- }
--
-- ngx_rtmp_rmemcpy(dst, src, len);
--
-- return dst;
--}
--
- #define NGX_RTMP_AMF_DEBUG_SIZE 72
-
- #ifdef NGX_DEBUG
-@@ -203,7 +190,7 @@ ngx_rtmp_amf_read_object(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
- return NGX_ERROR;
- }
-
-- ngx_rtmp_amf_reverse_copy(&len, buf, 2);
-+ len=ntohs(*(uint16_t*)&buf[0]);
-
- if (!len)
- break;
-@@ -254,7 +241,7 @@ ngx_rtmp_amf_read_array(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
- if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK)
- return NGX_ERROR;
-
-- ngx_rtmp_amf_reverse_copy(&len, buf, 4);
-+ len=ntohl(*(uint32_t*)&buf[0]);
-
- for (n = 0; n < len; ++n) {
- if (ngx_rtmp_amf_read(ctx, n < nelts ? &elts[n] : NULL, 1) != NGX_OK)
-@@ -348,10 +335,9 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
-
- switch (type) {
- case NGX_RTMP_AMF_NUMBER:
-- if (ngx_rtmp_amf_get(ctx, buf, 8) != NGX_OK) {
-+ if (ngx_rtmp_amf_get(ctx, data, 8) != NGX_OK) {
- return NGX_ERROR;
- }
-- ngx_rtmp_amf_reverse_copy(data, buf, 8);
- break;
-
- case NGX_RTMP_AMF_BOOLEAN:
-@@ -364,7 +350,7 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
- if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
- return NGX_ERROR;
- }
-- ngx_rtmp_amf_reverse_copy(&len, buf, 2);
-+ len=ntohs(*(uint16_t*)buf);
-
- if (data == NULL) {
- rc = ngx_rtmp_amf_get(ctx, data, len);
-@@ -434,14 +420,14 @@ ngx_rtmp_amf_read(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_amf_elt_t *elts,
- if (ngx_rtmp_amf_get(ctx, buf, 2) != NGX_OK) {
- return NGX_ERROR;
- }
-- ngx_rtmp_amf_reverse_copy(data, buf, 2);
-+ *(uint16_t*)data=ntohs(*(uint16_t*)buf);
- break;
-
- case NGX_RTMP_AMF_INT32:
- if (ngx_rtmp_amf_get(ctx, buf, 4) != NGX_OK) {
- return NGX_ERROR;
- }
-- ngx_rtmp_amf_reverse_copy(data, buf, 4);
-+ *(uint32_t*)data=ntohs(*(uint32_t*)buf);
- break;
-
- case NGX_RTMP_AMF_END:
-@@ -472,9 +458,8 @@ ngx_rtmp_amf_write_object(ngx_rtmp_amf_ctx_t *ctx,
-
- len = (uint16_t) elts[n].name.len;
-
-- if (ngx_rtmp_amf_put(ctx,
-- ngx_rtmp_amf_reverse_copy(buf,
-- &len, 2), 2) != NGX_OK)
-+ *(uint16_t*)buf = htons(len);
-+ if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
- {
- return NGX_ERROR;
- }
-@@ -505,9 +490,8 @@ ngx_rtmp_amf_write_array(ngx_rtmp_amf_ctx_t *ctx,
- u_char buf[4];
-
- len = nelts;
-- if (ngx_rtmp_amf_put(ctx,
-- ngx_rtmp_amf_reverse_copy(buf,
-- &len, 4), 4) != NGX_OK)
-+ *(uint32_t*)buf = htonl(len);
-+ if (ngx_rtmp_amf_put(ctx, buf, 4) != NGX_OK)
- {
- return NGX_ERROR;
- }
-@@ -550,9 +534,7 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
-
- switch(type) {
- case NGX_RTMP_AMF_NUMBER:
-- if (ngx_rtmp_amf_put(ctx,
-- ngx_rtmp_amf_reverse_copy(buf,
-- data, 8), 8) != NGX_OK)
-+ if (ngx_rtmp_amf_put(ctx, data, 8) != NGX_OK)
- {
- return NGX_ERROR;
- }
-@@ -569,9 +551,8 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
- len = (uint16_t) ngx_strlen((u_char*) data);
- }
-
-- if (ngx_rtmp_amf_put(ctx,
-- ngx_rtmp_amf_reverse_copy(buf,
-- &len, 2), 2) != NGX_OK)
-+ *(uint16_t*)buf = htons(len);
-+ if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
- {
- return NGX_ERROR;
- }
-@@ -617,18 +598,16 @@ ngx_rtmp_amf_write(ngx_rtmp_amf_ctx_t *ctx,
- break;
-
- case NGX_RTMP_AMF_INT16:
-- if (ngx_rtmp_amf_put(ctx,
-- ngx_rtmp_amf_reverse_copy(buf,
-- data, 2), 2) != NGX_OK)
-+ *(uint16_t*)buf = htons(*(uint16_t*)data);
-+ if (ngx_rtmp_amf_put(ctx, buf, 2) != NGX_OK)
- {
- return NGX_ERROR;
- }
- break;
-
- case NGX_RTMP_AMF_INT32:
-- if (ngx_rtmp_amf_put(ctx,
-- ngx_rtmp_amf_reverse_copy(buf,
-- data, 4), 4) != NGX_OK)
-+ *(uint32_t*)buf = htonl(*(uint32_t*)data);
-+ if (ngx_rtmp_amf_put(ctx, buf, 4) != NGX_OK)
- {
- return NGX_ERROR;
- }
-diff --git a/nginx-rtmp/ngx_rtmp_bitop.h b/nginx-rtmp/ngx_rtmp_bitop.h
-index c954a35f3..25133d284 100644
---- a/ngx_rtmp_bitop.h
-+++ b/ngx_rtmp_bitop.h
-@@ -40,7 +40,7 @@ uint64_t ngx_rtmp_bit_read_golomb(ngx_rtmp_bit_reader_t *br);
+--- a/nginx-rtmp/ngx_rtmp_bitop.h
++++ b/nginx-rtmp/ngx_rtmp_bitop.h
+@@ -40,7 +40,7 @@ uint64_t ngx_rtmp_bit_read_golomb(ngx_rt
((uint32_t) ngx_rtmp_bit_read(br, 32))
#define ngx_rtmp_bit_read_64(br) \
#endif /* _NGX_RTMP_BITOP_H_INCLUDED_ */
-diff --git a/nginx-rtmp/ngx_rtmp_eval.c b/nginx-rtmp/ngx_rtmp_eval.c
-index 1e5195a90..7ee7c7bac 100644
---- a/ngx_rtmp_eval.c
-+++ b/ngx_rtmp_eval.c
-@@ -166,7 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in, ngx_rtmp_eval_t **e, ngx_str_t *out,
+--- a/nginx-rtmp/ngx_rtmp_eval.c
++++ b/nginx-rtmp/ngx_rtmp_eval.c
+@@ -166,7 +166,7 @@ ngx_rtmp_eval(void *ctx, ngx_str_t *in,
state = ESCAPE;
continue;
}
case ESCAPE:
ngx_rtmp_eval_append(&b, &c, 1, log);
state = NORMAL;
-diff --git a/nginx-rtmp/ngx_rtmp_flv_module.c b/nginx-rtmp/ngx_rtmp_flv_module.c
-index 76ce64752..cd5162f7d 100644
---- a/ngx_rtmp_flv_module.c
-+++ b/ngx_rtmp_flv_module.c
-@@ -102,7 +102,7 @@ ngx_rtmp_flv_fill_index(ngx_rtmp_amf_ctx_t *ctx, ngx_rtmp_flv_index_t *idx)
- return NGX_ERROR;
- }
-
-- ngx_rtmp_rmemcpy(&nelts, b->pos + ctx->offset, 4);
-+ nelts=htonl(*(uint32_t*)(b->pos + ctx->offset));
-
- idx->nelts = nelts;
- idx->offset = ctx->offset + 4;
-@@ -201,11 +201,7 @@ ngx_rtmp_flv_init_index(ngx_rtmp_session_t *s, ngx_chain_t *in)
- static double
- ngx_rtmp_flv_index_value(void *src)
- {
-- double v;
--
-- ngx_rtmp_rmemcpy(&v, src, 8);
--
-- return v;
-+ return *(double*)src;
- }
-
-
-@@ -352,8 +348,7 @@ ngx_rtmp_flv_read_meta(ngx_rtmp_session_t *s, ngx_file_t *f)
- h.msid = NGX_RTMP_MSID;
- h.csid = NGX_RTMP_CSID_AMF;
-
-- size = 0;
-- ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
-+ size = n3toh4(ngx_rtmp_flv_header + 1);
-
- ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
- "flv: metadata size=%D", size);
-@@ -440,11 +435,8 @@ ngx_rtmp_flv_send(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_uint_t *ts)
- h.msid = NGX_RTMP_MSID;
- h.type = ngx_rtmp_flv_header[0];
-
-- size = 0;
--
-- ngx_rtmp_rmemcpy(&size, ngx_rtmp_flv_header + 1, 3);
-- ngx_rtmp_rmemcpy(&h.timestamp, ngx_rtmp_flv_header + 4, 3);
--
-+ size = n3toh4(ngx_rtmp_flv_header + 1);
-+ h.timestamp = n3toh4(ngx_rtmp_flv_header + 4);
- h.timestamp |= ((uint32_t) ngx_rtmp_flv_header[7] << 24);
-
- ctx->offset += (sizeof(ngx_rtmp_flv_header) + size + 4);
-diff --git a/nginx-rtmp/ngx_rtmp_handshake.c b/nginx-rtmp/ngx_rtmp_handshake.c
-index 409d9a0dd..8590cdcb2 100644
---- a/ngx_rtmp_handshake.c
-+++ b/ngx_rtmp_handshake.c
-@@ -264,7 +264,8 @@ ngx_rtmp_handshake_create_challenge(ngx_rtmp_session_t *s,
+--- a/nginx-rtmp/ngx_rtmp_handshake.c
++++ b/nginx-rtmp/ngx_rtmp_handshake.c
+@@ -264,7 +264,8 @@ ngx_rtmp_handshake_create_challenge(ngx_
b = s->hs_buf;
b->last = b->pos = b->start;
*b->last++ = '\x03';
b->last = ngx_cpymem(b->last, version, 4);
ngx_rtmp_fill_random_buffer(b);
++b->pos;
-@@ -292,8 +293,7 @@ ngx_rtmp_handshake_parse_challenge(ngx_rtmp_session_t *s,
+@@ -292,8 +293,7 @@ ngx_rtmp_handshake_parse_challenge(ngx_r
return NGX_ERROR;
}
++b->pos;
p = b->pos + 4;
ngx_log_debug5(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
-diff --git a/nginx-rtmp/ngx_rtmp_mp4_module.c b/nginx-rtmp/ngx_rtmp_mp4_module.c
-index 0259ca2f6..e39bb1bdb 100644
---- a/ngx_rtmp_mp4_module.c
-+++ b/ngx_rtmp_mp4_module.c
-@@ -528,9 +528,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+--- a/nginx-rtmp/ngx_rtmp_mp4_module.c
++++ b/nginx-rtmp/ngx_rtmp_mp4_module.c
+@@ -528,9 +528,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session
}
pos += 12;
break;
case 1:
-@@ -539,9 +539,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -539,9 +539,9 @@ ngx_rtmp_mp4_parse_mdhd(ngx_rtmp_session
}
pos += 20;
break;
default:
-@@ -616,11 +616,11 @@ ngx_rtmp_mp4_parse_video(ngx_rtmp_session_t *s, u_char *pos, u_char *last,
+@@ -616,11 +616,11 @@ ngx_rtmp_mp4_parse_video(ngx_rtmp_sessio
pos += 24;
pos += 52;
-@@ -660,19 +660,19 @@ ngx_rtmp_mp4_parse_audio(ngx_rtmp_session_t *s, u_char *pos, u_char *last,
+@@ -660,19 +660,19 @@ ngx_rtmp_mp4_parse_audio(ngx_rtmp_sessio
pos += 8;
pos += 4;
-@@ -862,7 +862,7 @@ ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -862,7 +862,7 @@ ngx_rtmp_mp4_parse_es(ngx_rtmp_session_t
return NGX_ERROR;
}
pos += 2;
flags = *(uint8_t *) pos;
-@@ -1018,13 +1018,13 @@ ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1018,13 +1018,13 @@ ngx_rtmp_mp4_parse_stsc(ngx_rtmp_session
t->chunks = (ngx_rtmp_mp4_chunks_t *) pos;
return NGX_OK;
}
-@@ -1049,13 +1049,13 @@ ngx_rtmp_mp4_parse_stts(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1049,13 +1049,13 @@ ngx_rtmp_mp4_parse_stts(ngx_rtmp_session
t->times = (ngx_rtmp_mp4_times_t *) pos;
return NGX_OK;
}
-@@ -1080,13 +1080,13 @@ ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1080,13 +1080,13 @@ ngx_rtmp_mp4_parse_ctts(ngx_rtmp_session
t->delays = (ngx_rtmp_mp4_delays_t *) pos;
return NGX_OK;
}
-@@ -1111,13 +1111,13 @@ ngx_rtmp_mp4_parse_stss(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1111,13 +1111,13 @@ ngx_rtmp_mp4_parse_stss(ngx_rtmp_session
t->keys = (ngx_rtmp_mp4_keys_t *) pos;
return NGX_OK;
}
-@@ -1145,18 +1145,18 @@ ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1145,18 +1145,18 @@ ngx_rtmp_mp4_parse_stsz(ngx_rtmp_session
if (pos + sizeof(*t->sizes) <= last && t->sizes->sample_size) {
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"mp4: sizes size=%uD",
return NGX_OK;
}
-@@ -1181,14 +1181,14 @@ ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1181,14 +1181,14 @@ ngx_rtmp_mp4_parse_stz2(ngx_rtmp_session
t->sizes2 = (ngx_rtmp_mp4_sizes2_t *) pos;
return NGX_OK;
}
-@@ -1213,13 +1213,13 @@ ngx_rtmp_mp4_parse_stco(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1213,13 +1213,13 @@ ngx_rtmp_mp4_parse_stco(ngx_rtmp_session
t->offsets = (ngx_rtmp_mp4_offsets_t *) pos;
return NGX_OK;
}
-@@ -1244,13 +1244,13 @@ ngx_rtmp_mp4_parse_co64(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1244,13 +1244,13 @@ ngx_rtmp_mp4_parse_co64(ngx_rtmp_session
t->offsets64 = (ngx_rtmp_mp4_offsets64_t *) pos;
return NGX_OK;
}
-@@ -1275,7 +1275,7 @@ ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s, u_char *pos, u_char *last)
+@@ -1275,7 +1275,7 @@ ngx_rtmp_mp4_parse(ngx_rtmp_session_t *s
}
hdr = (uint32_t *) pos;
tag = hdr[1];
if (pos + size > last) {
-@@ -1318,11 +1318,11 @@ ngx_rtmp_mp4_next_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1318,11 +1318,11 @@ ngx_rtmp_mp4_next_time(ngx_rtmp_session_
cr = &t->cursor;
return NGX_ERROR;
}
-@@ -1330,22 +1330,22 @@ ngx_rtmp_mp4_next_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1330,22 +1330,22 @@ ngx_rtmp_mp4_next_time(ngx_rtmp_session_
te = &t->times->entries[cr->time_pos];
cr->last_timestamp = cr->timestamp;
cr->time_pos++;
cr->time_count = 0;
}
-@@ -1370,8 +1370,8 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
+@@ -1370,8 +1370,8 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_
te = t->times->entries;
if (cr->timestamp + dt >= timestamp) {
if (te->sample_delta == 0) {
-@@ -1379,24 +1379,24 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
+@@ -1379,24 +1379,24 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_
}
cr->time_count = (timestamp - cr->timestamp) /
return NGX_ERROR;
}
-@@ -1405,10 +1405,10 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t,
+@@ -1405,10 +1405,10 @@ ngx_rtmp_mp4_seek_time(ngx_rtmp_session_
"mp4: track#%ui seek time[%ui] [%ui/%uD][%ui/%uD]=%uD "
"t=%uD",
t->id, cr->pos, cr->time_pos,
cr->timestamp);
return NGX_OK;
-@@ -1433,44 +1433,44 @@ ngx_rtmp_mp4_update_offset(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1433,44 +1433,44 @@ ngx_rtmp_mp4_update_offset(ngx_rtmp_sess
chunk = cr->chunk - 1;
if (t->offsets) {
cr->offset);
return NGX_OK;
-@@ -1493,11 +1493,11 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1493,11 +1493,11 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session
cr = &t->cursor;
return NGX_ERROR;
}
-@@ -1506,13 +1506,13 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1506,13 +1506,13 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session
cr->chunk_count++;
cr->chunk_pos++;
ce = nce;
}
-@@ -1527,10 +1527,10 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1527,10 +1527,10 @@ ngx_rtmp_mp4_next_chunk(ngx_rtmp_session
ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"mp4: track#%ui chunk[%ui/%uD][%uD..%ui][%ui/%uD]",
t->id, cr->chunk_pos,
if (new_chunk) {
-@@ -1558,12 +1558,12 @@ ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1558,12 +1558,12 @@ ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session
ce = t->chunks->entries;
pos = 0;
if (pos + dpos > cr->pos) {
break;
-@@ -1578,20 +1578,20 @@ ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1578,20 +1578,20 @@ ngx_rtmp_mp4_seek_chunk(ngx_rtmp_session
return NGX_ERROR;
}
return ngx_rtmp_mp4_update_offset(s, t);
}
-@@ -1608,7 +1608,7 @@ ngx_rtmp_mp4_next_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1608,7 +1608,7 @@ ngx_rtmp_mp4_next_size(ngx_rtmp_session_
if (t->sizes) {
if (t->sizes->sample_size) {
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"mp4: track#%ui size fix=%uz",
-@@ -1619,32 +1619,32 @@ ngx_rtmp_mp4_next_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1619,32 +1619,32 @@ ngx_rtmp_mp4_next_size(ngx_rtmp_session_
cr->size_pos++;
return NGX_ERROR;
}
-@@ -1672,7 +1672,7 @@ ngx_rtmp_mp4_seek_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1672,7 +1672,7 @@ ngx_rtmp_mp4_seek_size(ngx_rtmp_session_
if (t->sizes) {
if (t->sizes->sample_size) {
cr->offset += cr->size * cr->chunk_count;
-@@ -1683,37 +1683,37 @@ ngx_rtmp_mp4_seek_size(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1683,37 +1683,37 @@ ngx_rtmp_mp4_seek_size(ngx_rtmp_session_
return NGX_OK;
}
return NGX_ERROR;
}
-@@ -1744,11 +1744,11 @@ ngx_rtmp_mp4_next_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1744,11 +1744,11 @@ ngx_rtmp_mp4_next_key(ngx_rtmp_session_t
cr->key_pos++;
}
cr->key = 0;
-@@ -1756,13 +1756,13 @@ ngx_rtmp_mp4_next_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1756,13 +1756,13 @@ ngx_rtmp_mp4_next_key(ngx_rtmp_session_t
}
ke = &t->keys->entries[cr->key_pos];
cr->key ? "match" : "miss");
return NGX_OK;
-@@ -1782,27 +1782,27 @@ ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1782,27 +1782,27 @@ ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t
return NGX_OK;
}
cr->key = 1;
/* TODO: range version needed */
-@@ -1810,13 +1810,13 @@ ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1810,13 +1810,13 @@ ngx_rtmp_mp4_seek_key(ngx_rtmp_session_t
ngx_rtmp_mp4_next_time(s, t);
}
cr->key ? "match" : "miss");
return NGX_OK;
-@@ -1835,11 +1835,11 @@ ngx_rtmp_mp4_next_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1835,11 +1835,11 @@ ngx_rtmp_mp4_next_delay(ngx_rtmp_session
return NGX_OK;
}
return NGX_OK;
}
-@@ -1847,29 +1847,29 @@ ngx_rtmp_mp4_next_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1847,29 +1847,29 @@ ngx_rtmp_mp4_next_delay(ngx_rtmp_session
cr->delay_count++;
de = &t->delays->entries[cr->delay_pos];
return NGX_OK;
}
-@@ -1891,12 +1891,12 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1891,12 +1891,12 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session
pos = 0;
de = t->delays->entries;
break;
}
-@@ -1905,11 +1905,11 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1905,11 +1905,11 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session
de++;
}
return NGX_OK;
}
-@@ -1917,9 +1917,9 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session_t *s, ngx_rtmp_mp4_track_t *t)
+@@ -1917,9 +1917,9 @@ ngx_rtmp_mp4_seek_delay(ngx_rtmp_session
ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"mp4: track#%ui seek delay[%ui/%uD][%ui/%uD]=%ui",
t->id, cr->delay_pos,
return NGX_OK;
}
-@@ -2348,7 +2348,7 @@ ngx_rtmp_mp4_init(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_int_t aindex,
+@@ -2348,7 +2348,7 @@ ngx_rtmp_mp4_init(ngx_rtmp_session_t *s,
return NGX_ERROR;
}
shift = sizeof(hdr);
if (size == 1) {
-@@ -2362,7 +2362,7 @@ ngx_rtmp_mp4_init(ngx_rtmp_session_t *s, ngx_file_t *f, ngx_int_t aindex,
+@@ -2362,7 +2362,7 @@ ngx_rtmp_mp4_init(ngx_rtmp_session_t *s,
return NGX_ERROR;
}
shift += sizeof(extended_size);
} else if (size == 0) {
-diff --git a/nginx-rtmp/ngx_rtmp_receive.c b/nginx-rtmp/ngx_rtmp_receive.c
-index 73d617cf2..9c8705691 100644
---- a/ngx_rtmp_receive.c
-+++ b/ngx_rtmp_receive.c
-@@ -17,7 +17,6 @@ ngx_rtmp_protocol_message_handler(ngx_rtmp_session_t *s,
+--- a/nginx-rtmp/ngx_rtmp_receive.c
++++ b/nginx-rtmp/ngx_rtmp_receive.c
+@@ -17,7 +17,6 @@ ngx_rtmp_protocol_message_handler(ngx_rt
ngx_rtmp_header_t *h, ngx_chain_t *in)
{
ngx_buf_t *b;
uint32_t val;
uint8_t limit;
-@@ -30,11 +29,7 @@ ngx_rtmp_protocol_message_handler(ngx_rtmp_session_t *s,
+@@ -30,11 +29,7 @@ ngx_rtmp_protocol_message_handler(ngx_rt
return NGX_OK;
}
switch(h->type) {
case NGX_RTMP_MSG_CHUNK_SIZE:
-@@ -88,7 +83,6 @@ ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+@@ -88,7 +83,6 @@ ngx_rtmp_user_message_handler(ngx_rtmp_s
ngx_chain_t *in)
{
ngx_buf_t *b;
uint16_t evt;
uint32_t val;
-@@ -101,21 +95,13 @@ ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+@@ -101,21 +95,13 @@ ngx_rtmp_user_message_handler(ngx_rtmp_s
return NGX_OK;
}
switch(evt) {
case NGX_RTMP_USER_STREAM_BEGIN:
-@@ -164,12 +150,7 @@ ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
+@@ -164,12 +150,7 @@ ngx_rtmp_user_message_handler(ngx_rtmp_s
return NGX_OK;
}
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"receive: set_buflen msid=%uD buflen=%uD",
-@@ -240,18 +221,20 @@ ngx_rtmp_fetch_uint8(ngx_chain_t **in, uint8_t *ret)
+@@ -240,18 +221,20 @@ ngx_rtmp_fetch_uint8(ngx_chain_t **in, u
static ngx_int_t
ngx_rtmp_fetch_uint32(ngx_chain_t **in, uint32_t *ret, ngx_int_t n)
{
return NGX_OK;
}
-diff --git a/nginx-rtmp/ngx_rtmp_record_module.c b/nginx-rtmp/ngx_rtmp_record_module.c
-index c7db8edfa..abba56e15 100644
---- a/ngx_rtmp_record_module.c
-+++ b/ngx_rtmp_record_module.c
-@@ -454,7 +454,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
+--- a/nginx-rtmp/ngx_rtmp_record_module.c
++++ b/nginx-rtmp/ngx_rtmp_record_module.c
+@@ -454,7 +454,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
ngx_err_t err;
ngx_str_t path;
ngx_int_t mode, create_mode;
off_t file_size;
uint32_t tag_size, mlen, timestamp;
-@@ -551,11 +551,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
+@@ -551,11 +551,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
goto done;
}
if (tag_size == 0 || tag_size + 4 > file_size) {
file_size = 0;
-@@ -569,11 +565,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
+@@ -569,11 +565,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
goto done;
}
if (tag_size != mlen + 11) {
ngx_log_error(NGX_LOG_CRIT, s->connection->log, ngx_errno,
-@@ -582,11 +574,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
+@@ -582,11 +574,7 @@ ngx_rtmp_record_node_open(ngx_rtmp_sessi
goto done;
}
done:
rctx->file.offset = file_size;
-@@ -891,7 +879,7 @@ ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
+@@ -891,7 +879,7 @@ ngx_rtmp_record_write_frame(ngx_rtmp_ses
ngx_rtmp_header_t *h, ngx_chain_t *in,
ngx_int_t inc_nframes)
{
uint32_t timestamp, tag_size;
ngx_rtmp_record_app_conf_t *rracf;
-@@ -937,16 +925,10 @@ ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
+@@ -937,16 +925,10 @@ ngx_rtmp_record_write_frame(ngx_rtmp_ses
*ph++ = (u_char)h->type;
- *ph++ = p[2];
- *ph++ = p[1];
- *ph++ = p[0];
-+ ph = h4ton3(ph, h->mlen);
-
+-
- p = (u_char*)×tamp;
- *ph++ = p[2];
- *ph++ = p[1];
- *ph++ = p[0];
- *ph++ = p[3];
++ ph = h4ton3(ph, h->mlen);
++
+ ph = h4ton3(ph, timestamp);
+ *ph++ = (u_char)(timestamp>>24);
*ph++ = 0;
*ph++ = 0;
-@@ -985,12 +967,8 @@ ngx_rtmp_record_write_frame(ngx_rtmp_session_t *s,
+@@ -985,12 +967,8 @@ ngx_rtmp_record_write_frame(ngx_rtmp_ses
/* write tag size */
ph = hdr;
git.99rst.org / openwrt-packages.git / commitdiff