Skip to content

Instantly share code, notes, and snippets.

Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ohga/fa47a92487e51b0a61d71da1d19b0ad6 to your computer and use it in GitHub Desktop.
Save ohga/fa47a92487e51b0a61d71da1d19b0ad6 to your computer and use it in GitHub Desktop.
diff --git a/hls/ngx_rtmp_hls_module.c b/hls/ngx_rtmp_hls_module.c
index d41daaa..8c1a834 100644
--- a/hls/ngx_rtmp_hls_module.c
+++ b/hls/ngx_rtmp_hls_module.c
@@ -2322,7 +2322,7 @@ ngx_rtmp_hls_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
name.data[name.len - 2] == 't' &&
name.data[name.len - 1] == 's')
{
- max_age = playlen / 500;
+ max_age = playlen / 100;
} else if (name.len >= 5 && name.data[name.len - 5] == '.' &&
name.data[name.len - 4] == 'm' &&
@@ -2330,14 +2330,14 @@ ngx_rtmp_hls_cleanup_dir(ngx_str_t *ppath, ngx_msec_t playlen)
name.data[name.len - 2] == 'u' &&
name.data[name.len - 1] == '8')
{
- max_age = playlen / 500;
+ max_age = playlen / 100;
} else if (name.len >= 4 && name.data[name.len - 4] == '.' &&
name.data[name.len - 3] == 'k' &&
name.data[name.len - 2] == 'e' &&
name.data[name.len - 1] == 'y')
{
- max_age = playlen / 500;
+ max_age = playlen / 100;
} else {
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ngx_cycle->log, 0,
diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c
index d0ee9c8..f5089ce 100644
--- a/ngx_rtmp_live_module.c
+++ b/ngx_rtmp_live_module.c
@@ -1138,11 +1138,12 @@ ngx_rtmp_live_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ss->current_time = cs->timestamp;
}
- if (data) {
- ngx_rtmp_free_shared_chain(cscf, data);
- }
-
- if (rpkt && !data) {
+// if (data) {
+// ngx_rtmp_free_shared_chain(cscf, data);
+// }
+//
+// if (rpkt && !data) {
+ if (rpkt) {
ngx_rtmp_free_shared_chain(cscf, rpkt);
}
@ohga
Copy link
Author

ohga commented Oct 13, 2017

https://github.com/sergey-dryabzhinsky/nginx-rtmp-module を使うほうがいい、たぶん。

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment