Skip to content

Commit ebd7acd

Browse files
committed
remove old record module
1 parent 29e345a commit ebd7acd

File tree

4 files changed

+0
-1471
lines changed

4 files changed

+0
-1471
lines changed

config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ RTMP_CORE_MODULES=" \
99
ngx_rtmp_cmd_module \
1010
ngx_rtmp_codec_module \
1111
ngx_rtmp_access_module \
12-
ngx_rtmp_record_module \
1312
ngx_rtmp_live_module \
1413
ngx_live_record_module \
1514
ngx_live_relay_module \
@@ -47,7 +46,6 @@ RTMP_DEPS=" \
4746
$ngx_addon_dir/ngx_rtmp.h \
4847
$ngx_addon_dir/ngx_rtmp_version.h \
4948
$ngx_addon_dir/ngx_rtmp_live_module.h \
50-
$ngx_addon_dir/ngx_rtmp_record_module.h \
5149
$ngx_addon_dir/ngx_rtmp_oclp_module.h \
5250
$ngx_addon_dir/ngx_rtmp_streams.h \
5351
$ngx_addon_dir/ngx_rtmp_bitop.h \
@@ -77,7 +75,6 @@ RTMP_CORE_SRCS=" \
7775
$ngx_addon_dir/ngx_rtmp_cmd_module.c \
7876
$ngx_addon_dir/ngx_rtmp_codec_module.c \
7977
$ngx_addon_dir/ngx_rtmp_access_module.c \
80-
$ngx_addon_dir/ngx_rtmp_record_module.c \
8178
$ngx_addon_dir/ngx_rtmp_live_module.c \
8279
$ngx_addon_dir/ngx_rtmp_bandwidth.c \
8380
$ngx_addon_dir/ngx_rtmp_exec_module.c \

ngx_rtmp_exec_module.c

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <ngx_config.h>
88
#include <ngx_core.h>
99
#include "ngx_rtmp_cmd_module.h"
10-
#include "ngx_rtmp_record_module.h"
1110
#include "ngx_rtmp_eval.h"
1211
#include "ngx_poold.h"
1312
#include <stdlib.h>
@@ -21,7 +20,6 @@
2120
static ngx_rtmp_publish_pt next_publish;
2221
static ngx_rtmp_play_pt next_play;
2322
static ngx_rtmp_close_stream_pt next_close_stream;
24-
static ngx_rtmp_record_done_pt next_record_done;
2523
#endif
2624

2725

@@ -1301,65 +1299,6 @@ ngx_rtmp_exec_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
13011299
next:
13021300
return next_close_stream(s, v);
13031301
}
1304-
1305-
1306-
static ngx_int_t
1307-
ngx_rtmp_exec_record_done(ngx_rtmp_session_t *s, ngx_rtmp_record_done_t *v)
1308-
{
1309-
u_char c;
1310-
ngx_uint_t ext, dir;
1311-
ngx_rtmp_exec_ctx_t *ctx;
1312-
ngx_rtmp_exec_app_conf_t *eacf;
1313-
1314-
if (s->interprocess) {
1315-
goto next;
1316-
}
1317-
1318-
eacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_exec_module);
1319-
if (eacf == NULL || !eacf->active) {
1320-
goto next;
1321-
}
1322-
1323-
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_exec_module);
1324-
if (ctx == NULL) {
1325-
goto next;
1326-
}
1327-
1328-
ctx->recorder = v->recorder;
1329-
ctx->path = v->path;
1330-
1331-
ctx->dirname.data = ctx->path.data;
1332-
ctx->dirname.len = 0;
1333-
1334-
for (dir = ctx->path.len; dir > 0; dir--) {
1335-
c = ctx->path.data[dir - 1];
1336-
if (c == '/' || c == '\\') {
1337-
ctx->dirname.len = dir - 1;
1338-
break;
1339-
}
1340-
}
1341-
1342-
ctx->filename.data = ctx->path.data + dir;
1343-
ctx->filename.len = ctx->path.len - dir;
1344-
1345-
ctx->basename = ctx->filename;
1346-
1347-
for (ext = ctx->filename.len; ext > 0; ext--) {
1348-
if (ctx->filename.data[ext - 1] == '.') {
1349-
ctx->basename.len = ext - 1;
1350-
break;
1351-
}
1352-
}
1353-
1354-
ngx_rtmp_exec_unmanaged(s, &eacf->conf[NGX_RTMP_EXEC_RECORD_DONE],
1355-
"record_done");
1356-
1357-
ngx_str_null(&v->recorder);
1358-
ngx_str_null(&v->path);
1359-
1360-
next:
1361-
return next_record_done(s, v);
1362-
}
13631302
#endif /* NGX_WIN32 */
13641303

13651304

@@ -1596,9 +1535,6 @@ ngx_rtmp_exec_postconfiguration(ngx_conf_t *cf)
15961535
next_close_stream = ngx_rtmp_close_stream;
15971536
ngx_rtmp_close_stream = ngx_rtmp_exec_close_stream;
15981537

1599-
next_record_done = ngx_rtmp_record_done;
1600-
ngx_rtmp_record_done = ngx_rtmp_exec_record_done;
1601-
16021538
#endif /* NGX_WIN32 */
16031539

16041540
return NGX_OK;

0 commit comments

Comments
 (0)