From f53d15843288ad550228041b14da568bd2e95f1f Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Thu, 2 Jan 2014 10:22:03 +0400 Subject: [PATCH 1/3] implemented play2 --- ngx_rtmp_cmd_module.c | 65 ++++++++++++++++++++++++++++++++++++++++++- ngx_rtmp_cmd_module.h | 4 +++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/ngx_rtmp_cmd_module.c b/ngx_rtmp_cmd_module.c index fc9e4f0..7184214 100644 --- a/ngx_rtmp_cmd_module.c +++ b/ngx_rtmp_cmd_module.c @@ -94,7 +94,7 @@ ngx_module_t ngx_rtmp_cmd_module = { }; -static void +void ngx_rtmp_cmd_fill_args(u_char name[NGX_RTMP_MAX_NAME], u_char args[NGX_RTMP_MAX_ARGS]) { @@ -578,6 +578,68 @@ ngx_rtmp_cmd_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v) } +static ngx_int_t +ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, + ngx_chain_t *in) +{ + static u_char old_name[NGX_RTMP_MAX_NAME]; + static u_char transition[NGX_RTMP_MAX_NAME]; + static ngx_rtmp_play_t v; + static ngx_rtmp_close_stream_t vc; + + static ngx_rtmp_amf_elt_t in_elts[] = { + + /* transaction is always 0 */ + { NGX_RTMP_AMF_NUMBER, + ngx_null_string, + NULL, 0 }, + + { NGX_RTMP_AMF_NUMBER, + ngx_null_string, + &v.start, 0 }, + + { NGX_RTMP_AMF_STRING, + ngx_null_string, + &old_name, sizeof(old_name) }, + + { NGX_RTMP_AMF_STRING, + ngx_null_string, + &v.name, sizeof(v.name) }, + + { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER, + ngx_null_string, + &v.duration, 0 }, + + { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_STRING, + ngx_null_string, + &transition, sizeof(transition) } + }; + + ngx_memzero(&v, sizeof(v)); + + if (ngx_rtmp_receive_amf(s, in, in_elts, + sizeof(in_elts) / sizeof(in_elts[0]))) + { + return NGX_ERROR; + } + + ngx_rtmp_cmd_fill_args(v.name, v.args); + + ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, + "play2: old_name='%s' name='%s' args='%s' " + "start=%i duration=%i transition='%s'", + old_name, v.name, v.args, (ngx_int_t) v.start, + (ngx_int_t) v.duration, transition); + + ngx_memzero(&vc, sizeof(vc)); + + /* close_stream should be synchronous */ + ngx_rtmp_close_stream(s, &vc); + + return ngx_rtmp_play(s, &v); +} + + static ngx_int_t ngx_rtmp_cmd_pause_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_chain_t *in) @@ -730,6 +792,7 @@ static ngx_rtmp_amf_handler_t ngx_rtmp_cmd_map[] = { { ngx_string("deleteStream"), ngx_rtmp_cmd_delete_stream_init }, { ngx_string("publish"), ngx_rtmp_cmd_publish_init }, { ngx_string("play"), ngx_rtmp_cmd_play_init }, + { ngx_string("play2"), ngx_rtmp_cmd_play2_init }, { ngx_string("seek"), ngx_rtmp_cmd_seek_init }, { ngx_string("pause"), ngx_rtmp_cmd_pause_init }, { ngx_string("pauseraw"), ngx_rtmp_cmd_pause_init }, diff --git a/ngx_rtmp_cmd_module.h b/ngx_rtmp_cmd_module.h index df88d81..4a0b955 100644 --- a/ngx_rtmp_cmd_module.h +++ b/ngx_rtmp_cmd_module.h @@ -97,6 +97,10 @@ typedef struct { } ngx_rtmp_set_buflen_t; +void ngx_rtmp_cmd_fill_args(u_char name[NGX_RTMP_MAX_NAME], + u_char args[NGX_RTMP_MAX_ARGS]); + + typedef ngx_int_t (*ngx_rtmp_connect_pt)(ngx_rtmp_session_t *s, ngx_rtmp_connect_t *v); typedef ngx_int_t (*ngx_rtmp_disconnect_pt)(ngx_rtmp_session_t *s); From ea1fe6eaf536290d1a4b5a71b2ccd7fd78f50993 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Mon, 13 Jan 2014 11:31:36 +0400 Subject: [PATCH 2/3] changed play2 arg format --- ngx_rtmp_cmd_module.c | 39 +++++++++++++++++---------------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/ngx_rtmp_cmd_module.c b/ngx_rtmp_cmd_module.c index 7184214..07e046c 100644 --- a/ngx_rtmp_cmd_module.c +++ b/ngx_rtmp_cmd_module.c @@ -582,11 +582,20 @@ static ngx_int_t ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_chain_t *in) { - static u_char old_name[NGX_RTMP_MAX_NAME]; - static u_char transition[NGX_RTMP_MAX_NAME]; static ngx_rtmp_play_t v; static ngx_rtmp_close_stream_t vc; + static ngx_rtmp_amf_elt_t in_obj[] = { + + { NGX_RTMP_AMF_NUMBER, + ngx_string("StartTime"), + &v.start, 0 }, + + { NGX_RTMP_AMF_STRING, + ngx_string("StreamName"), + &v.name, sizeof(v.name) }, + }; + static ngx_rtmp_amf_elt_t in_elts[] = { /* transaction is always 0 */ @@ -594,25 +603,13 @@ ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_null_string, NULL, 0 }, - { NGX_RTMP_AMF_NUMBER, + { NGX_RTMP_AMF_NULL, ngx_null_string, - &v.start, 0 }, + NULL, 0 }, - { NGX_RTMP_AMF_STRING, + { NGX_RTMP_AMF_OBJECT, ngx_null_string, - &old_name, sizeof(old_name) }, - - { NGX_RTMP_AMF_STRING, - ngx_null_string, - &v.name, sizeof(v.name) }, - - { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_NUMBER, - ngx_null_string, - &v.duration, 0 }, - - { NGX_RTMP_AMF_OPTIONAL | NGX_RTMP_AMF_STRING, - ngx_null_string, - &transition, sizeof(transition) } + &in_obj, sizeof(in_obj) } }; ngx_memzero(&v, sizeof(v)); @@ -626,10 +623,8 @@ ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, ngx_rtmp_cmd_fill_args(v.name, v.args); ngx_log_error(NGX_LOG_INFO, s->connection->log, 0, - "play2: old_name='%s' name='%s' args='%s' " - "start=%i duration=%i transition='%s'", - old_name, v.name, v.args, (ngx_int_t) v.start, - (ngx_int_t) v.duration, transition); + "play2: name='%s' args='%s' start=%i", + v.name, v.args, (ngx_int_t) v.start); ngx_memzero(&vc, sizeof(vc)); From 8a8f28f3b67d0177f79e754c478e845bac70eb58 Mon Sep 17 00:00:00 2001 From: Roman Arutyunyan Date: Mon, 13 Jan 2014 11:35:20 +0400 Subject: [PATCH 3/3] changed play2 arg format --- ngx_rtmp_cmd_module.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ngx_rtmp_cmd_module.c b/ngx_rtmp_cmd_module.c index 07e046c..8d30d56 100644 --- a/ngx_rtmp_cmd_module.c +++ b/ngx_rtmp_cmd_module.c @@ -588,11 +588,11 @@ ngx_rtmp_cmd_play2_init(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h, static ngx_rtmp_amf_elt_t in_obj[] = { { NGX_RTMP_AMF_NUMBER, - ngx_string("StartTime"), + ngx_string("start"), &v.start, 0 }, { NGX_RTMP_AMF_STRING, - ngx_string("StreamName"), + ngx_string("streamName"), &v.name, sizeof(v.name) }, };