mirror of
https://github.com/zotanmew/nginx-rtmp-module.git
synced 2024-05-15 08:21:09 +02:00
fixed playing H264: added streaming AVC sequence header to late clients
This commit is contained in:
parent
09eee918b9
commit
63e19f8d67
|
@ -10,27 +10,31 @@ const char * audio_codecs[] = {
|
|||
"",
|
||||
"ADPCM",
|
||||
"MP3",
|
||||
"",
|
||||
"",
|
||||
"LinearLE",
|
||||
"Nellymoser16",
|
||||
"Nellymoser8",
|
||||
"Nellymoser",
|
||||
"G711A",
|
||||
"G711U",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"HE-ACC",
|
||||
"AAC",
|
||||
"Speex",
|
||||
"",
|
||||
"",
|
||||
"MP3-8K",
|
||||
"DeviceSpecific",
|
||||
"Uncompressed"
|
||||
};
|
||||
|
||||
|
||||
const char * video_codecs[] = {
|
||||
"",
|
||||
"",
|
||||
"Jpeg",
|
||||
"Sorenson-H263",
|
||||
"ScreenVideo",
|
||||
"On2-VP6",
|
||||
"On2-VP6-Alpha",
|
||||
"",
|
||||
"ScreenVideo2",
|
||||
"H264",
|
||||
};
|
||||
|
||||
|
|
|
@ -225,7 +225,9 @@ ngx_rtmp_live_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
|
|||
ngx_rtmp_live_ctx_t *ctx, **cctx;
|
||||
ngx_rtmp_live_stream_t **stream;
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
ngx_rtmp_core_srv_conf_t *cscf;
|
||||
|
||||
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL) {
|
||||
goto next;
|
||||
|
@ -266,6 +268,10 @@ ngx_rtmp_live_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
|
|||
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: delete empty stream '%s'", ctx->stream->name);
|
||||
|
||||
if (ctx->stream->avc_header) {
|
||||
ngx_rtmp_free_shared_chain(cscf, ctx->stream->avc_header);
|
||||
}
|
||||
|
||||
stream = ngx_rtmp_live_get_stream(s, ctx->stream->name, 0);
|
||||
if (stream == NULL) {
|
||||
return NGX_ERROR;
|
||||
|
@ -293,6 +299,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
|||
ngx_rtmp_header_t ch, lh;
|
||||
ngx_uint_t prio, peer_prio;
|
||||
ngx_uint_t peers, dropped_peers;
|
||||
uint8_t flv_fmt;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL) {
|
||||
|
@ -351,6 +358,28 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
|||
peers = 0;
|
||||
dropped_peers = 0;
|
||||
|
||||
/* parse meta */
|
||||
if (in->buf->last - in->buf->pos >= 1) {
|
||||
flv_fmt = *in->buf->pos;
|
||||
if (h->type == NGX_RTMP_MSG_AUDIO) {
|
||||
ctx->stream->meta.audio_codec_id = (flv_fmt & 0xf0) >> 4;
|
||||
} else {
|
||||
ctx->stream->meta.video_codec_id = (flv_fmt & 0x0f);
|
||||
if (ctx->stream->meta.video_codec_id == 7
|
||||
&& in->buf->last - in->buf->pos >= 2
|
||||
&& in->buf->pos[1] == 0)
|
||||
{
|
||||
/* AVC/H264 sequence header;
|
||||
* save it for future */
|
||||
if (ctx->stream->avc_header) {
|
||||
ngx_rtmp_free_shared_chain(cscf, ctx->stream->avc_header);
|
||||
}
|
||||
ctx->stream->avc_header = out;
|
||||
ngx_rtmp_acquire_shared_chain(out);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* broadcast to all subscribers */
|
||||
for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
|
||||
if (pctx == ctx) {
|
||||
|
@ -371,6 +400,12 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
|||
pctx->msg_mask |= (1 << h->type);
|
||||
ngx_rtmp_send_message(ss, out_abs, prio);
|
||||
ngx_rtmp_free_shared_chain(cscf, out_abs);
|
||||
|
||||
/* send AVC/H264 header */
|
||||
if (ctx->stream->avc_header) {
|
||||
/*TODO: make it absolute & send instead of ythe above frame */
|
||||
ngx_rtmp_send_message(ss, ctx->stream->avc_header, prio);
|
||||
}
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
650
ngx_rtmp_live_module.c.orig
Normal file
650
ngx_rtmp_live_module.c.orig
Normal file
|
@ -0,0 +1,650 @@
|
|||
/*
|
||||
* Copyright (c) 2012 Roman Arutyunyan
|
||||
*/
|
||||
|
||||
|
||||
#include "ngx_rtmp_live_module.h"
|
||||
#include "ngx_rtmp_cmd_module.h"
|
||||
#include "ngx_rtmp_codecs.h"
|
||||
|
||||
|
||||
static ngx_rtmp_publish_pt next_publish;
|
||||
static ngx_rtmp_play_pt next_play;
|
||||
static ngx_rtmp_delete_stream_pt next_delete_stream;
|
||||
|
||||
|
||||
/* Chunk stream ids for output */
|
||||
#define NGX_RTMP_LIVE_CSID_AUDIO 6
|
||||
#define NGX_RTMP_LIVE_CSID_VIDEO 7
|
||||
#define NGX_RTMP_LIVE_MSID 1
|
||||
|
||||
|
||||
static ngx_int_t ngx_rtmp_live_postconfiguration(ngx_conf_t *cf);
|
||||
static void * ngx_rtmp_live_create_app_conf(ngx_conf_t *cf);
|
||||
static char * ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf,
|
||||
void *parent, void *child);
|
||||
|
||||
|
||||
#define NGX_RTMP_LIVE_TIME_ABSOLUTE 0x01
|
||||
#define NGX_RTMP_LIVE_TIME_RELATIVE 0x02
|
||||
|
||||
|
||||
static ngx_command_t ngx_rtmp_live_commands[] = {
|
||||
|
||||
{ ngx_string("live"),
|
||||
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
|
||||
ngx_conf_set_flag_slot,
|
||||
NGX_RTMP_APP_CONF_OFFSET,
|
||||
offsetof(ngx_rtmp_live_app_conf_t, live),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("stream_buckets"),
|
||||
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_live_app_conf_t, nbuckets),
|
||||
NULL },
|
||||
|
||||
{ ngx_string("buffer"),
|
||||
NGX_RTMP_MAIN_CONF|NGX_RTMP_SRV_CONF|NGX_RTMP_APP_CONF|NGX_CONF_TAKE1,
|
||||
ngx_conf_set_msec_slot,
|
||||
NGX_RTMP_APP_CONF_OFFSET,
|
||||
offsetof(ngx_rtmp_live_app_conf_t, buflen),
|
||||
NULL },
|
||||
|
||||
ngx_null_command
|
||||
};
|
||||
|
||||
|
||||
static ngx_rtmp_module_t ngx_rtmp_live_module_ctx = {
|
||||
NULL, /* preconfiguration */
|
||||
ngx_rtmp_live_postconfiguration, /* postconfiguration */
|
||||
NULL, /* create main configuration */
|
||||
NULL, /* init main configuration */
|
||||
NULL, /* create server configuration */
|
||||
NULL, /* merge server configuration */
|
||||
ngx_rtmp_live_create_app_conf, /* create app configuration */
|
||||
ngx_rtmp_live_merge_app_conf /* merge app configuration */
|
||||
};
|
||||
|
||||
|
||||
ngx_module_t ngx_rtmp_live_module = {
|
||||
NGX_MODULE_V1,
|
||||
&ngx_rtmp_live_module_ctx, /* module context */
|
||||
ngx_rtmp_live_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_live_create_app_conf(ngx_conf_t *cf)
|
||||
{
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
|
||||
lacf = ngx_pcalloc(cf->pool, sizeof(ngx_rtmp_live_app_conf_t));
|
||||
if (lacf == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
lacf->live = NGX_CONF_UNSET;
|
||||
lacf->nbuckets = NGX_CONF_UNSET;
|
||||
lacf->buflen = NGX_CONF_UNSET;
|
||||
|
||||
return lacf;
|
||||
}
|
||||
|
||||
|
||||
static char *
|
||||
ngx_rtmp_live_merge_app_conf(ngx_conf_t *cf, void *parent, void *child)
|
||||
{
|
||||
ngx_rtmp_live_app_conf_t *prev = parent;
|
||||
ngx_rtmp_live_app_conf_t *conf = child;
|
||||
|
||||
ngx_conf_merge_value(conf->live, prev->live, 0);
|
||||
ngx_conf_merge_value(conf->nbuckets, prev->nbuckets, 1024);
|
||||
ngx_conf_merge_msec_value(conf->buflen, prev->buflen, 0);
|
||||
|
||||
conf->pool = ngx_create_pool(4096, &cf->cycle->new_log);
|
||||
if (conf->pool == NULL) {
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
conf->streams = ngx_pcalloc(cf->pool,
|
||||
sizeof(ngx_rtmp_live_stream_t *) * conf->nbuckets);
|
||||
|
||||
return NGX_CONF_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_rtmp_live_stream_t **
|
||||
ngx_rtmp_live_get_stream(ngx_rtmp_session_t *s, u_char *name, int create)
|
||||
{
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
ngx_rtmp_live_stream_t **stream;
|
||||
size_t len;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
len = ngx_strlen(name);
|
||||
stream = &lacf->streams[ngx_hash_key(name, len) % lacf->nbuckets];
|
||||
|
||||
for (; *stream; stream = &(*stream)->next) {
|
||||
if (ngx_strcmp(name, (*stream)->name) == 0) {
|
||||
return stream;
|
||||
}
|
||||
}
|
||||
|
||||
if (!create) {
|
||||
return NULL;
|
||||
}
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: create stream '%s'", name);
|
||||
|
||||
if (lacf->free_streams) {
|
||||
*stream = lacf->free_streams;
|
||||
lacf->free_streams = lacf->free_streams->next;
|
||||
} else {
|
||||
*stream = ngx_palloc(lacf->pool, sizeof(ngx_rtmp_live_stream_t));
|
||||
}
|
||||
ngx_memzero(*stream, sizeof(ngx_rtmp_live_stream_t));
|
||||
ngx_memcpy((*stream)->name, name,
|
||||
ngx_min(sizeof((*stream)->name) - 1, len));
|
||||
(*stream)->epoch = ngx_current_msec;
|
||||
|
||||
return stream;
|
||||
}
|
||||
|
||||
|
||||
static void
|
||||
ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name,
|
||||
ngx_uint_t flags)
|
||||
{
|
||||
ngx_rtmp_live_ctx_t *ctx;
|
||||
ngx_rtmp_live_stream_t **stream;
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL) {
|
||||
return;
|
||||
}
|
||||
|
||||
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
|
||||
if (ctx == NULL) {
|
||||
ctx = ngx_pcalloc(s->connection->pool, sizeof(ngx_rtmp_live_ctx_t));
|
||||
ctx->session = s;
|
||||
ngx_rtmp_set_ctx(s, ctx, ngx_rtmp_live_module);
|
||||
}
|
||||
|
||||
if (ctx->stream) {
|
||||
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log,
|
||||
0, "live: already joined");
|
||||
return;
|
||||
}
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: join '%s'", name);
|
||||
|
||||
stream = ngx_rtmp_live_get_stream(s, name, 1);
|
||||
if (stream == NULL) {
|
||||
return;
|
||||
}
|
||||
if (flags & NGX_RTMP_LIVE_PUBLISHING) {
|
||||
if ((*stream)->flags & NGX_RTMP_LIVE_PUBLISHING) {
|
||||
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
|
||||
"live: already publishing");
|
||||
return;
|
||||
}
|
||||
(*stream)->flags |= NGX_RTMP_LIVE_PUBLISHING;
|
||||
}
|
||||
ctx->stream = *stream;
|
||||
ctx->flags = flags;
|
||||
ctx->next = (*stream)->ctx;
|
||||
(*stream)->ctx = ctx;
|
||||
|
||||
if (lacf->buflen) {
|
||||
s->out_buffer = 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_delete_stream(ngx_rtmp_session_t *s, ngx_rtmp_delete_stream_t *v)
|
||||
{
|
||||
ngx_rtmp_live_ctx_t *ctx, **cctx;
|
||||
ngx_rtmp_live_stream_t **stream;
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL) {
|
||||
goto next;
|
||||
}
|
||||
|
||||
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
|
||||
if (ctx == NULL) {
|
||||
goto next;
|
||||
}
|
||||
|
||||
if (ctx->stream == NULL) {
|
||||
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: not joined ");
|
||||
goto next;
|
||||
}
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: leave '%s'", ctx->stream->name);
|
||||
|
||||
if (ctx->stream->flags & NGX_RTMP_LIVE_PUBLISHING
|
||||
&& ctx->flags & NGX_RTMP_LIVE_PUBLISHING)
|
||||
{
|
||||
ctx->stream->flags &= ~NGX_RTMP_LIVE_PUBLISHING;
|
||||
}
|
||||
|
||||
for (cctx = &ctx->stream->ctx; *cctx; cctx = &(*cctx)->next) {
|
||||
if (*cctx == ctx) {
|
||||
*cctx = ctx->next;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (ctx->stream->ctx) {
|
||||
ctx->stream = NULL;
|
||||
goto next;
|
||||
}
|
||||
|
||||
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: delete empty stream '%s'", ctx->stream->name);
|
||||
|
||||
stream = ngx_rtmp_live_get_stream(s, ctx->stream->name, 0);
|
||||
if (stream == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
*stream = (*stream)->next;
|
||||
|
||||
ctx->stream->next = lacf->free_streams;
|
||||
lacf->free_streams = ctx->stream;
|
||||
ctx->stream = NULL;
|
||||
|
||||
next:
|
||||
return next_delete_stream(s, v);
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
||||
ngx_chain_t *in)
|
||||
{
|
||||
ngx_rtmp_live_ctx_t *ctx, *pctx;
|
||||
ngx_chain_t *out, *out_abs;
|
||||
ngx_rtmp_core_srv_conf_t *cscf;
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
ngx_rtmp_session_t *ss;
|
||||
ngx_rtmp_header_t ch, lh;
|
||||
ngx_uint_t prio, peer_prio;
|
||||
ngx_uint_t peers, dropped_peers;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL) {
|
||||
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: NULL application");
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
|
||||
if (!lacf->live
|
||||
|| in == NULL || in->buf == NULL
|
||||
|| ctx == NULL || ctx->stream == NULL
|
||||
|| (h->type != NGX_RTMP_MSG_VIDEO
|
||||
&& h->type != NGX_RTMP_MSG_AUDIO))
|
||||
{
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
if ((ctx->flags & NGX_RTMP_LIVE_PUBLISHING) == 0) {
|
||||
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: received audio/video from non-publisher");
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: av: %s timestamp=%uD",
|
||||
h->type == NGX_RTMP_MSG_VIDEO ? "video" : "audio",
|
||||
h->timestamp);
|
||||
|
||||
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
|
||||
|
||||
/* prepare output header */
|
||||
ngx_memzero(&ch, sizeof(ch));
|
||||
ngx_memzero(&lh, sizeof(lh));
|
||||
ch.timestamp = h->timestamp;
|
||||
ch.msid = NGX_RTMP_LIVE_MSID;
|
||||
ch.type = h->type;
|
||||
lh.msid = ch.msid;
|
||||
if (h->type == NGX_RTMP_MSG_VIDEO) {
|
||||
prio = ngx_rtmp_get_video_frame_type(in);
|
||||
ch.csid = NGX_RTMP_LIVE_CSID_VIDEO;
|
||||
lh.timestamp = ctx->last_video;
|
||||
ctx->last_video = ch.timestamp;
|
||||
} else {
|
||||
/* audio priority is the same as video key frame's */
|
||||
prio = NGX_RTMP_VIDEO_KEY_FRAME;
|
||||
ch.csid = NGX_RTMP_LIVE_CSID_AUDIO;
|
||||
lh.timestamp = ctx->last_audio;
|
||||
ctx->last_audio = ch.timestamp;
|
||||
}
|
||||
lh.csid = ch.csid;
|
||||
|
||||
out = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
|
||||
ngx_rtmp_prepare_message(s, &ch, &lh, out);
|
||||
|
||||
peers = 0;
|
||||
dropped_peers = 0;
|
||||
|
||||
/* broadcast to all subscribers */
|
||||
for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
|
||||
if (pctx == ctx) {
|
||||
continue;
|
||||
}
|
||||
++peers;
|
||||
ss = pctx->session;
|
||||
|
||||
/* send absolute frame */
|
||||
if ((pctx->msg_mask & (1 << h->type)) == 0) {
|
||||
ch.timestamp = ngx_current_msec - ss->epoch;
|
||||
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
|
||||
"live: av: abs %s timestamp=%uD",
|
||||
h->type == NGX_RTMP_MSG_VIDEO ? "video" : "audio",
|
||||
ch.timestamp);
|
||||
out_abs = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
|
||||
ngx_rtmp_prepare_message(s, &ch, NULL, out_abs);
|
||||
pctx->msg_mask |= (1 << h->type);
|
||||
ngx_rtmp_send_message(ss, out_abs, prio);
|
||||
ngx_rtmp_free_shared_chain(cscf, out_abs);
|
||||
continue;
|
||||
}
|
||||
|
||||
/* push buffered data */
|
||||
peer_prio = prio;
|
||||
/*
|
||||
if (lacf->buflen && h->timestamp >= pctx->next_push) {
|
||||
peer_prio = 0;
|
||||
pctx->next_push = h->timestamp + lacf->buflen;
|
||||
}*/
|
||||
if (ngx_rtmp_send_message(ss, out, peer_prio) != NGX_OK) {
|
||||
++pctx->dropped;
|
||||
++dropped_peers;
|
||||
}
|
||||
}
|
||||
ngx_rtmp_free_shared_chain(cscf, out);
|
||||
|
||||
ngx_rtmp_update_bandwidth(&ctx->stream->bw_in, h->mlen);
|
||||
ngx_rtmp_update_bandwidth(&ctx->stream->bw_out,
|
||||
h->mlen * (peers - dropped_peers));
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
|
||||
{
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
|
||||
if (lacf == NULL || !lacf->live) {
|
||||
goto next;
|
||||
}
|
||||
|
||||
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: publish: name='%s' type='%s'",
|
||||
v->name, v->type);
|
||||
|
||||
/* join stream as publisher */
|
||||
ngx_rtmp_live_join(s, v->name, NGX_RTMP_LIVE_PUBLISHING);
|
||||
|
||||
next:
|
||||
return next_publish(s, v);
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_play(ngx_rtmp_session_t *s, ngx_rtmp_play_t *v)
|
||||
{
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
|
||||
if (lacf == NULL || !lacf->live) {
|
||||
goto next;
|
||||
}
|
||||
|
||||
ngx_log_debug4(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: play: name='%s' start=%uD duration=%uD reset=%d",
|
||||
v->name, (uint32_t)v->start,
|
||||
(uint32_t)v->duration, (uint32_t)v->reset);
|
||||
|
||||
/* join stream as player */
|
||||
ngx_rtmp_live_join(s, v->name, 0);
|
||||
|
||||
next:
|
||||
return next_play(s, v);
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_ext_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
||||
ngx_chain_t *in, ngx_uint_t skip)
|
||||
{
|
||||
ngx_rtmp_live_app_conf_t *lacf;
|
||||
ngx_rtmp_live_ctx_t *ctx;
|
||||
ngx_rtmp_live_meta_t *meta;
|
||||
|
||||
static struct {
|
||||
double width;
|
||||
double height;
|
||||
double duration;
|
||||
double frame_rate;
|
||||
double video_data_rate;
|
||||
double video_codec_id_n;
|
||||
u_char video_codec_id_s[32];
|
||||
double audio_data_rate;
|
||||
double audio_codec_id_n;
|
||||
u_char audio_codec_id_s[32];
|
||||
} v;
|
||||
|
||||
static ngx_rtmp_amf_elt_t in_video_codec_id[] = {
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_null_string,
|
||||
&v.video_codec_id_n, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_STRING,
|
||||
ngx_null_string,
|
||||
&v.video_codec_id_s, sizeof(v.video_codec_id_s) },
|
||||
};
|
||||
|
||||
static ngx_rtmp_amf_elt_t in_audio_codec_id[] = {
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_null_string,
|
||||
&v.audio_codec_id_n, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_STRING,
|
||||
ngx_null_string,
|
||||
&v.audio_codec_id_s, sizeof(v.audio_codec_id_s) },
|
||||
};
|
||||
|
||||
static ngx_rtmp_amf_elt_t in_inf[] = {
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_string("width"),
|
||||
&v.width, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_string("height"),
|
||||
&v.height, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_string("duration"),
|
||||
&v.duration, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_string("framerate"),
|
||||
&v.frame_rate, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_string("videodatarate"),
|
||||
&v.video_data_rate, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_VARIANT,
|
||||
ngx_string("videocodecid"),
|
||||
in_video_codec_id, sizeof(in_video_codec_id) },
|
||||
|
||||
{ NGX_RTMP_AMF_NUMBER,
|
||||
ngx_string("audiodatarate"),
|
||||
&v.audio_data_rate, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_VARIANT,
|
||||
ngx_string("audiocodecid"),
|
||||
in_audio_codec_id, sizeof(in_audio_codec_id) },
|
||||
};
|
||||
|
||||
static ngx_rtmp_amf_elt_t in_elts[] = {
|
||||
|
||||
{ NGX_RTMP_AMF_STRING,
|
||||
ngx_null_string,
|
||||
NULL, 0 },
|
||||
|
||||
{ NGX_RTMP_AMF_OBJECT,
|
||||
ngx_null_string,
|
||||
in_inf, sizeof(in_inf) },
|
||||
};
|
||||
|
||||
|
||||
lacf = ngx_rtmp_get_module_app_conf(s, ngx_rtmp_live_module);
|
||||
if (lacf == NULL || !lacf->live) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
ngx_memzero(&v, sizeof(v));
|
||||
|
||||
/* use -1 as a sign of unchanged data;
|
||||
* 0 is a valid value for uncompressed audio */
|
||||
v.audio_codec_id_n = -1;
|
||||
|
||||
if (ngx_rtmp_receive_amf(s, in, in_elts + skip,
|
||||
sizeof(in_elts) / sizeof(in_elts[0]) - skip))
|
||||
{
|
||||
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
|
||||
"live: error parsing data frame");
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_live_module);
|
||||
if (ctx == NULL) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
if ((ctx->flags & NGX_RTMP_LIVE_PUBLISHING) == 0) {
|
||||
ngx_log_error(NGX_LOG_ERR, s->connection->log, 0,
|
||||
"live: received data stream from non-publisher");
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
meta = &ctx->stream->meta;
|
||||
meta->width = v.width;
|
||||
meta->height = v.height;
|
||||
meta->duration = v.duration;
|
||||
meta->frame_rate = v.frame_rate;
|
||||
meta->video_data_rate = v.video_data_rate;
|
||||
meta->video_codec_id = v.video_codec_id_n;
|
||||
meta->audio_data_rate = v.audio_data_rate;
|
||||
meta->audio_codec_id = (v.audio_codec_id_n == -1
|
||||
? 0 : v.audio_codec_id_n == 0
|
||||
? NGX_RTMP_AUDIO_UNCOMPRESSED : v.audio_codec_id_n);
|
||||
|
||||
ngx_log_debug8(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
|
||||
"live: data frame: "
|
||||
"width=%ui height=%ui duration=%ui frame_rate=%ui "
|
||||
"video=%s (%ui) audio=%s (%ui)",
|
||||
meta->width, meta->height, meta->duration, meta->frame_rate,
|
||||
ngx_rtmp_get_video_codec_name(meta->video_codec_id),
|
||||
meta->video_codec_id,
|
||||
ngx_rtmp_get_audio_codec_name(meta->audio_codec_id),
|
||||
meta->audio_codec_id);
|
||||
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_data_frame(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
||||
ngx_chain_t *in)
|
||||
{
|
||||
return ngx_rtmp_live_ext_meta_data(s, h, in, 0);
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_meta_data(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
|
||||
ngx_chain_t *in)
|
||||
{
|
||||
return ngx_rtmp_live_ext_meta_data(s, h, in, 1);
|
||||
}
|
||||
|
||||
|
||||
static ngx_int_t
|
||||
ngx_rtmp_live_postconfiguration(ngx_conf_t *cf)
|
||||
{
|
||||
ngx_rtmp_core_main_conf_t *cmcf;
|
||||
ngx_rtmp_handler_pt *h;
|
||||
ngx_rtmp_amf_handler_t *ch;
|
||||
|
||||
cmcf = ngx_rtmp_conf_get_module_main_conf(cf, ngx_rtmp_core_module);
|
||||
|
||||
/* register metadata handler */
|
||||
ch = ngx_array_push(&cmcf->amf);
|
||||
if (ch == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
ngx_str_set(&ch->name, "@setDataFrame");
|
||||
ch->handler = ngx_rtmp_live_data_frame;
|
||||
|
||||
ch = ngx_array_push(&cmcf->amf);
|
||||
if (ch == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
ngx_str_set(&ch->name, "onMetaData");
|
||||
ch->handler = ngx_rtmp_live_meta_data;
|
||||
|
||||
/* register raw event handlers */
|
||||
h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_AUDIO]);
|
||||
*h = ngx_rtmp_live_av;
|
||||
|
||||
h = ngx_array_push(&cmcf->events[NGX_RTMP_MSG_VIDEO]);
|
||||
*h = ngx_rtmp_live_av;
|
||||
|
||||
/* chain handlers */
|
||||
next_publish = ngx_rtmp_publish;
|
||||
ngx_rtmp_publish = ngx_rtmp_live_publish;
|
||||
|
||||
next_play = ngx_rtmp_play;
|
||||
ngx_rtmp_play = ngx_rtmp_live_play;
|
||||
|
||||
next_delete_stream = ngx_rtmp_delete_stream;
|
||||
ngx_rtmp_delete_stream = ngx_rtmp_live_delete_stream;
|
||||
|
||||
return NGX_OK;
|
||||
}
|
|
@ -54,6 +54,7 @@ struct ngx_rtmp_live_stream_s {
|
|||
ngx_rtmp_bandwidth_t bw_out;
|
||||
ngx_rtmp_live_meta_t meta;
|
||||
ngx_msec_t epoch;
|
||||
ngx_chain_t *avc_header;
|
||||
};
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue