Skip to content

Commit aeae84b

Browse files
committed
removed cmd handler initialization in postconf & added global initializers
1 parent af5703b commit aeae84b

File tree

1 file changed

+45
-32
lines changed

1 file changed

+45
-32
lines changed

ngx_rtmp_cmd_module.c

Lines changed: 45 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,51 @@
1010
#define NGX_RTMP_CAPABILITIES 31
1111

1212

13-
ngx_rtmp_connect_pt ngx_rtmp_connect;
14-
ngx_rtmp_create_stream_pt ngx_rtmp_create_stream;
15-
ngx_rtmp_close_stream_pt ngx_rtmp_close_stream;
16-
ngx_rtmp_delete_stream_pt ngx_rtmp_delete_stream;
17-
ngx_rtmp_publish_pt ngx_rtmp_publish;
18-
ngx_rtmp_play_pt ngx_rtmp_play;
19-
ngx_rtmp_seek_pt ngx_rtmp_seek;
20-
ngx_rtmp_pause_pt ngx_rtmp_pause;
21-
22-
23-
ngx_rtmp_stream_begin_pt ngx_rtmp_stream_begin;
24-
ngx_rtmp_stream_eof_pt ngx_rtmp_stream_eof;
25-
ngx_rtmp_stream_dry_pt ngx_rtmp_stream_dry;
26-
ngx_rtmp_recorded_pt ngx_rtmp_recorded;
27-
ngx_rtmp_set_buflen_pt ngx_rtmp_set_buflen;
13+
static ngx_int_t ngx_rtmp_cmd_connect(ngx_rtmp_session_t *s,
14+
ngx_rtmp_connect_t *v);
15+
static ngx_int_t ngx_rtmp_cmd_create_stream(ngx_rtmp_session_t *s,
16+
ngx_rtmp_create_stream_t *v);
17+
static ngx_int_t ngx_rtmp_cmd_close_stream(ngx_rtmp_session_t *s,
18+
ngx_rtmp_close_stream_t *v);
19+
static ngx_int_t ngx_rtmp_cmd_delete_stream(ngx_rtmp_session_t *s,
20+
ngx_rtmp_delete_stream_t *v);
21+
static ngx_int_t ngx_rtmp_cmd_publish(ngx_rtmp_session_t *s,
22+
ngx_rtmp_publish_t *v);
23+
static ngx_int_t ngx_rtmp_cmd_play(ngx_rtmp_session_t *s,
24+
ngx_rtmp_play_t *v);
25+
static ngx_int_t ngx_rtmp_cmd_seek(ngx_rtmp_session_t *s,
26+
ngx_rtmp_seek_t *v);
27+
static ngx_int_t ngx_rtmp_cmd_pause(ngx_rtmp_session_t *s,
28+
ngx_rtmp_pause_t *v);
29+
30+
31+
static ngx_int_t ngx_rtmp_cmd_stream_begin(ngx_rtmp_session_t *s,
32+
ngx_rtmp_stream_begin_t *v);
33+
static ngx_int_t ngx_rtmp_cmd_stream_eof(ngx_rtmp_session_t *s,
34+
ngx_rtmp_stream_eof_t *v);
35+
static ngx_int_t ngx_rtmp_cmd_stream_dry(ngx_rtmp_session_t *s,
36+
ngx_rtmp_stream_dry_t *v);
37+
static ngx_int_t ngx_rtmp_cmd_recorded(ngx_rtmp_session_t *s,
38+
ngx_rtmp_recorded_t *v);
39+
static ngx_int_t ngx_rtmp_cmd_set_buflen(ngx_rtmp_session_t *s,
40+
ngx_rtmp_set_buflen_t *v);
41+
42+
43+
ngx_rtmp_connect_pt ngx_rtmp_connect = ngx_rtmp_cmd_connect;
44+
ngx_rtmp_create_stream_pt ngx_rtmp_create_stream = ngx_rtmp_cmd_create_stream;
45+
ngx_rtmp_close_stream_pt ngx_rtmp_close_stream = ngx_rtmp_cmd_close_stream;
46+
ngx_rtmp_delete_stream_pt ngx_rtmp_delete_stream = ngx_rtmp_cmd_delete_stream;
47+
ngx_rtmp_publish_pt ngx_rtmp_publish = ngx_rtmp_cmd_publish;
48+
ngx_rtmp_play_pt ngx_rtmp_play = ngx_rtmp_cmd_play;
49+
ngx_rtmp_seek_pt ngx_rtmp_seek = ngx_rtmp_cmd_seek;
50+
ngx_rtmp_pause_pt ngx_rtmp_pause = ngx_rtmp_cmd_pause;
51+
52+
53+
ngx_rtmp_stream_begin_pt ngx_rtmp_stream_begin = ngx_rtmp_cmd_stream_begin;
54+
ngx_rtmp_stream_eof_pt ngx_rtmp_stream_eof = ngx_rtmp_cmd_stream_eof;
55+
ngx_rtmp_stream_dry_pt ngx_rtmp_stream_dry = ngx_rtmp_cmd_stream_dry;
56+
ngx_rtmp_recorded_pt ngx_rtmp_recorded = ngx_rtmp_cmd_recorded;
57+
ngx_rtmp_set_buflen_pt ngx_rtmp_set_buflen = ngx_rtmp_cmd_set_buflen;
2858

2959

3060
static ngx_int_t ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf);
@@ -724,22 +754,5 @@ ngx_rtmp_cmd_postconfiguration(ngx_conf_t *cf)
724754
*ch = *bh;
725755
}
726756

727-
/* set initial handlers */
728-
729-
ngx_rtmp_connect = ngx_rtmp_cmd_connect;
730-
ngx_rtmp_create_stream = ngx_rtmp_cmd_create_stream;
731-
ngx_rtmp_close_stream = ngx_rtmp_cmd_close_stream;
732-
ngx_rtmp_delete_stream = ngx_rtmp_cmd_delete_stream;
733-
ngx_rtmp_publish = ngx_rtmp_cmd_publish;
734-
ngx_rtmp_play = ngx_rtmp_cmd_play;
735-
ngx_rtmp_seek = ngx_rtmp_cmd_seek;
736-
ngx_rtmp_pause = ngx_rtmp_cmd_pause;
737-
738-
ngx_rtmp_stream_begin = ngx_rtmp_cmd_stream_begin;
739-
ngx_rtmp_stream_eof = ngx_rtmp_cmd_stream_eof;
740-
ngx_rtmp_stream_dry = ngx_rtmp_cmd_stream_dry;
741-
ngx_rtmp_recorded = ngx_rtmp_cmd_recorded;
742-
ngx_rtmp_set_buflen = ngx_rtmp_cmd_set_buflen;
743-
744757
return NGX_OK;
745758
}

0 commit comments

Comments
 (0)