implemented streaming flvs from beginning till the end; no metadata & positioning so far

This commit is contained in:
Roman Arutyunyan 2012-07-04 12:34:23 +04:00
parent 19d3bd6cc9
commit 3caf2fd7b4
4 changed files with 336 additions and 1 deletions

2
config
View file

@ -12,6 +12,7 @@ CORE_MODULES="$CORE_MODULES
ngx_rtmp_relay_module \
ngx_rtmp_exec_module \
ngx_rtmp_codec_module \
ngx_rtmp_play_module \
"
@ -41,6 +42,7 @@ NGX_ADDON_SRCS="$NGX_ADDON_SRCS \
$ngx_addon_dir/ngx_rtmp_bandwidth.c \
$ngx_addon_dir/ngx_rtmp_exec_module.c \
$ngx_addon_dir/ngx_rtmp_codec_module.c \
$ngx_addon_dir/ngx_rtmp_play_module.c \
"
CFLAGS="$CFLAGS -I$ngx_addon_dir"

View file

@ -178,6 +178,9 @@ typedef struct {
ngx_str_t *addr_text;
int connected;
/* client buffer time in msec */
uint32_t buflen;
/* connection parameters */
ngx_str_t app;
ngx_str_t flashver;

330
ngx_rtmp_play_module.c Normal file
View file

@ -0,0 +1,330 @@
/*
* Copyright (c) 2012 Roman Arutyunyan
*/
#include "ngx_rtmp_cmd_module.h"
#include "ngx_rtmp_live_module.h"
static ngx_rtmp_play_pt next_play;
static ngx_rtmp_close_stream_pt next_close_stream;
static ngx_int_t ngx_rtmp_play_postconfiguration(ngx_conf_t *cf);
static void * ngx_rtmp_play_create_app_conf(ngx_conf_t *cf);
static char * ngx_rtmp_play_merge_app_conf(ngx_conf_t *cf,
void *parent, void *child);
typedef struct {
ngx_str_t root;
} ngx_rtmp_play_app_conf_t;
typedef struct {
ngx_file_t file;
ngx_uint_t offset;
ngx_event_t write_evt;
uint32_t last_audio;
uint32_t last_video;
ngx_uint_t msg_mask;
uint32_t epoch;
} ngx_rtmp_play_ctx_t;
#define NGX_RTMP_PLAY_BUFFER (1024*1024)
#define NGX_RTMP_PLAY_DEFAULT_BUFLEN 1000
static ngx_command_t ngx_rtmp_play_commands[] = {
{ ngx_string("play"),
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
ngx_conf_set_str_slot,
NGX_RTMP_APP_CONF_OFFSET,
offsetof(ngx_rtmp_play_app_conf_t, root),
NULL },
ngx_null_command
};
static ngx_rtmp_module_t ngx_rtmp_play_module_ctx = {
NULL, /* preconfiguration */
ngx_rtmp_play_postconfiguration, /* postconfiguration */
NULL, /* create main configuration */
NULL, /* init main configuration */
NULL, /* create server configuration */
NULL, /* merge server configuration */
ngx_rtmp_play_create_app_conf, /* create app configuration */
ngx_rtmp_play_merge_app_conf /* merge app configuration */
};
ngx_module_t ngx_rtmp_play_module = {
NGX_MODULE_V1,
&ngx_rtmp_play_module_ctx, /* module context */
ngx_rtmp_play_commands, /* module directives */
NGX_RTMP_MODULE, /* module type */
NULL, /* init master */
NULL, /* init module */
NULL, /* init process */
NULL, /* init thread */
NULL, /* exit thread */
NULL, /* exit process */
NULL, /* exit master */
NGX_MODULE_V1_PADDING
};
static void *
ngx_rtmp_play_create_app_conf(ngx_conf_t *cf)
{
ngx_rtmp_play_app_conf_t *pacf;
pacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_play_app_conf_t));
if (pacf == NULL) {
return NULL;
}
return pacf;
}
static char *
ngx_rtmp_play_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
{
ngx_rtmp_play_app_conf_t *prev = parent;
ngx_rtmp_play_app_conf_t *conf = child;
ngx_conf_merge_str_value(conf->root, prev->root, "");
return NGX_CONF_OK;
}
static ngx_int_t
ngx_rtmp_play_close_stream(ngx_rtmp_session_t *s, ngx_rtmp_close_stream_t *v)
{
ngx_rtmp_play_ctx_t *ctx;
ngx_rtmp_play_app_conf_t *pacf;
pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
if (pacf == NULL) {
goto next;
}
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
if (ctx == NULL) {
goto next;
}
if (ctx->file.fd != NGX_INVALID_FILE) {
ngx_close_file(ctx->file.fd);
}
if (ctx->write_evt.timer_set) {
ngx_del_timer(&ctx->write_evt);
}
if (ctx->write_evt.prev) {
ngx_delete_posted_event((&ctx->write_evt));
}
next:
return next_close_stream(s, v);
}
static void
ngx_rtmp_play_send(ngx_event_t *e)
{
ngx_rtmp_session_t *s;
ngx_rtmp_play_ctx_t *ctx;
uint8_t type;
uint32_t size;
uint32_t timestamp;
ngx_rtmp_header_t h, lh;
ngx_rtmp_core_srv_conf_t *cscf;
ngx_chain_t *out, in;
ngx_buf_t in_buf;
ssize_t n;
uint32_t buflen, end_timestamp;
static u_char header[11];
static u_char buffer[NGX_RTMP_PLAY_BUFFER];
s = e->data;
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
if (ctx == NULL) {
return;
}
n = ngx_read_file(&ctx->file, header, sizeof(header), ctx->offset);
if (n != sizeof(header)) {
return;
}
ctx->offset += sizeof(header);
ngx_memzero(&h, sizeof(h));
type = header[0];
size = 0;
ngx_rtmp_rmemcpy(&size, header + 1, 3);
ngx_rtmp_rmemcpy(&timestamp, header + 4, 3);
((u_char *) &timestamp)[3] = header[7];
if (type != NGX_RTMP_MSG_AUDIO && type != NGX_RTMP_MSG_VIDEO) {
/* TODO: make use of metadata */
ctx->offset += (size + 4);
return;
}
ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"play: type=%i offset=%ui size=%D timestamp=%D",
type, ctx->offset, size, timestamp);
h.type = type;
h.csid = (h.type == NGX_RTMP_MSG_AUDIO
? NGX_RTMP_LIVE_CSID_AUDIO
: NGX_RTMP_LIVE_CSID_VIDEO);
h.msid = NGX_RTMP_LIVE_MSID;
h.timestamp = timestamp + ctx->epoch;
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"play: h.timestamp=%D", h.timestamp);
lh = h;
lh.timestamp = (h.type == NGX_RTMP_MSG_AUDIO
? ctx->last_audio
: ctx->last_video);
if (size > sizeof(buffer)) {
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"play: too big message: %D", size);
return;
}
n = ngx_read_file(&ctx->file, buffer, size, ctx->offset);
if (n != size) {
return;
}
ctx->offset += (size + 4);
ngx_memzero(&in, sizeof(in));
ngx_memzero(&in_buf, sizeof(in_buf));
in.buf = &in_buf;
in_buf.pos = buffer;
in_buf.last = buffer + size;
out = ngx_rtmp_append_shared_bufs(cscf, NULL, &in);
ngx_rtmp_prepare_message(s, &h, ctx->msg_mask & (1 << h.type) ?
&lh : NULL, out);
ngx_rtmp_send_message(s, out, 0); /* TODO: priority */
ngx_rtmp_free_shared_chain(cscf, out);
ctx->msg_mask |= (1 << h.type);
if (h.type == NGX_RTMP_MSG_AUDIO) {
ctx->last_audio = h.timestamp;
} else {
ctx->last_video = h.timestamp;
}
buflen = (s->buflen ? s->buflen : NGX_RTMP_PLAY_DEFAULT_BUFLEN);
end_timestamp = (ngx_current_msec - s->epoch) + buflen;
if (h.timestamp < end_timestamp) {
ngx_post_event(e, &ngx_posted_events);
return;
}
ngx_add_timer(e, h.timestamp - end_timestamp);
}
static ngx_int_t
ngx_rtmp_play_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
{
ngx_rtmp_play_app_conf_t *pacf;
ngx_rtmp_play_ctx_t *ctx;
u_char *p;
ngx_event_t *e;
static u_char path[NGX_MAX_PATH];
pacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_play_module);
if (pacf == NULL || pacf->root.len == 0) {
goto next;
}
ngx_log_debug3(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"play: play: name='%s' start=%i duration=%i",
v->name, (ngx_int_t) v->start, (ngx_int_t) v->duration);
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_play_module);
if (ctx && (ctx->file.fd != NGX_INVALID_FILE
|| ctx->write_evt.timer_set))
{
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"play: already playing");
goto next;
}
if (ctx == NULL) {
ctx = ngx_palloc(s->connection->pool, sizeof(ngx_rtmp_play_ctx_t));
ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_play_module);
}
ngx_memzero(ctx, sizeof(*ctx));
ctx->file.log = s->connection->log;
/*TODO: escape*/
p = ngx_snprintf(path, sizeof(path), "%V/%s", &pacf->root, v->name);
*p = 0;
ctx->file.fd = ngx_open_file(path, NGX_FILE_RDONLY, NGX_FILE_OPEN,
NGX_FILE_DEFAULT_ACCESS);
if (ctx->file.fd == NGX_INVALID_FILE) {
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
"play: error opening file %s", path);
goto next;
}
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"play: opened file '%s'", path);
ctx->offset = 13; /* header 9 bytes + zero tag 4 bytes */
ctx->epoch = ngx_current_msec - s->epoch;
e = &ctx->write_evt;
e->data = s;
e->handler = ngx_rtmp_play_send;
e->log = s->connection->log;
ngx_post_event(e, &ngx_posted_events)
next:
return next_play(s, v);
}
static ngx_int_t
ngx_rtmp_play_postconfiguration(ngx_conf_t *cf)
{
next_play = ngx_rtmp_play;
ngx_rtmp_play = ngx_rtmp_play_play;
next_close_stream = ngx_rtmp_close_stream;
ngx_rtmp_close_stream = ngx_rtmp_play_close_stream;
return NGX_OK;
}

View file

@ -135,7 +135,7 @@ ngx_rtmp_user_message_handler(ngx_rtmp_session_t *s,
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"msid=%uD buflen: %uD (msec)", val, arg);
/*ngx_rtmp_send_user_stream_begin(s, val);*/
s->buflen = arg;
}
break;