diff --git a/ngx_rtmp_handler.c b/ngx_rtmp_handler.c index 9395be2..f8ae6a6 100644 --- a/ngx_rtmp_handler.c +++ b/ngx_rtmp_handler.c @@ -237,7 +237,7 @@ ngx_rtmp_init_session(ngx_connection_t *c) size = NGX_RTMP_HANDSHAKE_SIZE + 1; s->in_chunk_size = NGX_RTMP_DEFAULT_CHUNK_SIZE; - s->in_pool = ngx_create_pool(2 * size + sizeof(ngx_pool_t), c->log); + s->in_pool = ngx_create_pool(4096/*2 * size + sizeof(ngx_pool_t)*/, c->log); /* start handshake */ b = &s->hs_in_buf; diff --git a/ngx_rtmp_shared.c b/ngx_rtmp_shared.c index 5c3629d..0f6ae94 100644 --- a/ngx_rtmp_shared.c +++ b/ngx_rtmp_shared.c @@ -3,31 +3,21 @@ /* Store refcount in negative bytes of shared buffer */ -#define NGX_RTMP_REFCOUNT_TYPE uint32_t -#define NGX_RTMP_REFCOUNT_BYTES sizeof(NGX_RTMP_REFCOUNT_TYPE) +#define NGX_RTMP_REFCOUNT_TYPE uint32_t +#define NGX_RTMP_REFCOUNT_BYTES sizeof(NGX_RTMP_REFCOUNT_TYPE) -#define ngx_rtmp_ref(b) \ +#define ngx_rtmp_ref(b) \ *((NGX_RTMP_REFCOUNT_TYPE*)(b) - 1) -#define ngx_rtmp_ref_set(b, v) \ +#define ngx_rtmp_ref_set(b, v) \ ngx_rtmp_ref(b) = v -#define ngx_rtmp_ref_get(b) \ +#define ngx_rtmp_ref_get(b) \ ++ngx_rtmp_ref(b) -#define ngx_rtmp_ref_put(b) \ +#define ngx_rtmp_ref_put(b) \ --ngx_rtmp_ref(b) -/* -#define ngx_rtmp_ref_set(b, v) \ - *(int*)&((b)->tag) = v - -#define ngx_rtmp_ref_get(b) \ - (++*(int*)&((b)->tag)) - -#define ngx_rtmp_ref_put(b) \ - (--*(int*)&((b)->tag)) -*/ ngx_chain_t * ngx_rtmp_alloc_shared_buf(ngx_rtmp_core_srv_conf_t *cscf)