opensource/nginx-rtmp-module
1
0
Fork 0
mirror of https://github.com/arut/nginx-rtmp-module.git synced 2025-08-06 15:00:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

an attempt to implement initial video key

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-12-07 16:57:30 +04:00
parent 02dd440a25
commit c8ad56e2d2
4 changed files with 203 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ngx_rtmp_codec_module.c
View File

@ -135,6 +135,11 @@ ngx_rtmp_codec_disconnect(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ctx->meta = NULL;
}
if (ctx->video_key) {
ngx_rtmp_free_shared_chain(cscf, ctx->video_key);
ctx->video_key = NULL;
}
return NGX_OK;
}
@ -186,6 +191,23 @@ ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ctx->video_codec_id = (fmt & 0x0f);
}
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
/* save video key */
if (h->type == NGX_RTMP_MSG_VIDEO &&
ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME &&
(ctx->video_codec_id != NGX_RTMP_VIDEO_H264 ||
(in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 1)))
{
if (ctx->video_key) {
ngx_rtmp_free_shared_chain(cscf, ctx->video_key);
}
ctx->video_key = ngx_rtmp_append_shared_bufs(cscf, NULL, in);
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
"codec: video key arrived");
}
/* save AVC/AAC header */
if (in->buf->last - in->buf->pos < 2) {
return NGX_OK;
@ -196,7 +218,6 @@ ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
return NGX_OK;
}
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
header = NULL;
if (h->type == NGX_RTMP_MSG_AUDIO) {
if (ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC) {

2
ngx_rtmp_codec_module.h
View File

@ -67,6 +67,8 @@ typedef struct {
ngx_chain_t *meta;
ngx_uint_t meta_version;
ngx_chain_t *video_key;
} ngx_rtmp_codec_ctx_t;

231
ngx_rtmp_live_module.c
View File

@ -340,11 +340,7 @@ ngx_rtmp_live_set_status(ngx_rtmp_session_t *s, ngx_chain_t *control,
}
}
ctx->cs[0].active = 0;
ctx->cs[0].dropped = 0;
ctx->cs[1].active = 0;
ctx->cs[1].dropped = 0;
ctx->initialized = 0;
}
@ -532,9 +528,6 @@ ngx_rtmp_live_join(ngx_rtmp_session_t *s, u_char *name, unsigned publisher)
s->out_buffer = 1;
}
ctx->cs[0].csid = NGX_RTMP_MSG_AUDIO;
ctx->cs[1].csid = NGX_RTMP_MSG_VIDEO;
if (!ctx->publishing && ctx->stream->active) {
ngx_rtmp_live_start(s);
}
@ -660,19 +653,19 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
{
ngx_rtmp_live_ctx_t *ctx, *pctx;
ngx_rtmp_codec_ctx_t *codec_ctx;
ngx_chain_t *header, *coheader, *meta,
*apkt, *acopkt, *rpkt;
ngx_chain_t *avc_header, *aac_header, *meta, *video_key,
*apkt, *rpkt, *ahpkt, *vhpkt, *kpkt;
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_int_t rc, mandatory;
ngx_rtmp_header_t ch, lh, vlh, alh;
ngx_int_t rc, is_header, is_key, abs_frame;
ngx_uint_t prio;
ngx_uint_t peers;
ngx_uint_t meta_version;
ngx_uint_t csidx;
ngx_uint_t csidx, acsidx, vcsidx;
uint32_t delta;
ngx_rtmp_live_chunk_stream_t *cs;
ngx_rtmp_live_chunk_stream_t *cs, *acs, *vcs;
#ifdef NGX_DEBUG
const char *type_s;
@ -713,19 +706,27 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
peers = 0;
apkt = NULL;
acopkt = NULL;
header = NULL;
coheader = NULL;
rpkt = NULL;
ahpkt = NULL;
vhpkt = NULL;
kpkt = NULL;
avc_header = NULL;
aac_header = NULL;
meta = NULL;
video_key = NULL;
meta_version = 0;
mandatory = 0;
is_header = 0;
prio = (h->type == NGX_RTMP_MSG_VIDEO ?
ngx_rtmp_get_video_frame_type(in) : 0);
is_key = (prio == NGX_RTMP_VIDEO_KEY_FRAME);
cscf = ngx_rtmp_get_module_srv_conf(s, ngx_rtmp_core_module);
csidx = !(lacf->interleave || h->type == NGX_RTMP_MSG_VIDEO);
acsidx = !lacf->interleave;
vcsidx = 0;
cs = &ctx->cs[csidx];
@ -733,7 +734,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ch.timestamp = h->timestamp;
ch.msid = NGX_RTMP_MSID;
ch.csid = cs->csid;
ch.csid = (csidx ? NGX_RTMP_CSID_AUDIO : NGX_RTMP_CSID_VIDEO);
ch.type = h->type;
lh = ch;
@ -742,6 +743,16 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
lh.timestamp = cs->timestamp;
}
vlh = ch;
alh = ch;
/*vlh.timestamp = 0;
alh.timestamp = 0;*/
vlh.type = NGX_RTMP_MSG_VIDEO;
alh.type = NGX_RTMP_MSG_AUDIO;
vlh.csid = NGX_RTMP_CSID_VIDEO;
alh.csid = (lacf->interleave ? NGX_RTMP_CSID_VIDEO : NGX_RTMP_CSID_AUDIO);
cs->active = 1;
cs->timestamp = ch.timestamp;
@ -765,41 +776,32 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
if (codec_ctx) {
if (h->type == NGX_RTMP_MSG_AUDIO) {
header = codec_ctx->aac_header;
if (lacf->interleave) {
coheader = codec_ctx->avc_header;
}
if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
if (((h->type == NGX_RTMP_MSG_AUDIO &&
codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC) ||
(h->type == NGX_RTMP_MSG_VIDEO &&
codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264)) &&
in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0)
{
is_header = 1;
prio = 0;
mandatory = 1;
}
} else {
header = codec_ctx->avc_header;
if (lacf->interleave) {
coheader = codec_ctx->aac_header;
}
if (codec_ctx->audio_codec_id == NGX_RTMP_VIDEO_H264 &&
in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0)
{
prio = 0;
mandatory = 1;
}
}
if (lacf->meta && codec_ctx->meta) {
meta = codec_ctx->meta;
meta_version = codec_ctx->meta_version;
}
avc_header = codec_ctx->avc_header;
aac_header = codec_ctx->aac_header;
video_key = codec_ctx->video_key;
}
/*if (h->type == NGX_RTMP_MSG_VIDEO && video_key) {
ngx_rtmp_free_shared_chain(cscf, rpkt);
rpkt = ngx_rtmp_append_shared_bufs(cscf, NULL, video_key);
ngx_rtmp_prepare_message(s, &ch, &lh, rpkt);
}*/
/* broadcast to all subscribers */
for (pctx = ctx->stream->ctx; pctx; pctx = pctx->next) {
@ -821,67 +823,115 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
}
}
/* sync stream */
/* start stream */
if (cs->active && (lacf->sync && cs->dropped > lacf->sync)) {
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: sync %s dropped=%uD", type_s, cs->dropped);
if (!pctx->initialized) {
cs->active = 0;
cs->dropped = 0;
}
/* absolute packet */
if (!cs->active) {
if (lacf->wait_key && prio != NGX_RTMP_VIDEO_KEY_FRAME &&
(lacf->interleave || h->type == NGX_RTMP_MSG_VIDEO))
{
if (is_header) {
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: skip non-key");
"live: skipping header in initializer");
continue;
}
if (header || coheader) {
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: initializing streams");
/* send absolute codec header */
ngx_memzero(pctx->cs, sizeof(pctx->cs));
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: abs %s header timestamp=%uD",
type_s, lh.timestamp);
acs = &pctx->cs[acsidx];
vcs = &pctx->cs[vcsidx];
/* start audio */
if (header) {
if (apkt == NULL) {
apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, header);
ngx_rtmp_prepare_message(s, &lh, NULL, apkt);
if (aac_header) {
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: abs AAC header timestamp=%uD",
alh.timestamp);
if (ahpkt == NULL) {
ahpkt = ngx_rtmp_append_shared_bufs(cscf, NULL,
aac_header);
ngx_rtmp_prepare_message(s, &alh, NULL, ahpkt);
}
rc = ngx_rtmp_send_message(ss, apkt, 0);
rc = ngx_rtmp_send_message(ss, ahpkt, 0);
if (rc != NGX_OK) {
continue;
}
acs->timestamp = alh.timestamp;
}
if (coheader) {
if (acopkt == NULL) {
acopkt = ngx_rtmp_append_shared_bufs(cscf, NULL, coheader);
ngx_rtmp_prepare_message(s, &lh, NULL, acopkt);
/* start video */
if (avc_header) {
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: abs AVC header timestamp=%uD",
vlh.timestamp);
if (vhpkt == NULL) {
vhpkt = ngx_rtmp_append_shared_bufs(cscf, NULL,
avc_header);
ngx_rtmp_prepare_message(s, &vlh, NULL, vhpkt);
}
rc = ngx_rtmp_send_message(ss, acopkt, 0);
rc = ngx_rtmp_send_message(ss, vhpkt, 0);
if (rc != NGX_OK) {
continue;
}
vcs->timestamp = vlh.timestamp;
}
cs->timestamp = lh.timestamp;
cs->active = 1;
if (video_key) {
ngx_log_debug1(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: abs video key timestamp=%uD",
vlh.timestamp);
} else {
if (kpkt == NULL) {
kpkt = ngx_rtmp_append_shared_bufs(cscf, NULL,
video_key);
ngx_rtmp_prepare_message(s, &vlh, NULL, kpkt);
}
rc = ngx_rtmp_send_message(ss, kpkt, 0);
if (rc != NGX_OK) {
continue;
}
vcs->timestamp = vlh.timestamp;
}
vcs->vabs = 1;
acs->aabs = 1;
pctx->initialized = 1;
}
/* send absolute packet */
abs_frame = 0;
if (lacf->sync && cs->dropped > lacf->sync &&
(h->type != NGX_RTMP_MSG_VIDEO || is_key))
{
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: sync %s dropped=%uD", type_s, cs->dropped);
abs_frame = 1;
}
if (cs->vabs && h->type == NGX_RTMP_MSG_VIDEO) {
if (!is_key) {
continue;
}
abs_frame = 1;
}
if (cs->aabs && h->type == NGX_RTMP_MSG_AUDIO) {
abs_frame = 1;
}
if (abs_frame) {
ngx_log_debug2(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: abs %s packet timestamp=%uD",
type_s, ch.timestamp);
@ -891,19 +941,24 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ngx_rtmp_prepare_message(s, &ch, NULL, apkt);
}
rc = ngx_rtmp_send_message(ss, apkt, prio);
rc = ngx_rtmp_send_message(ss, apkt, 0);
if (rc != NGX_OK) {
continue;
}
cs->timestamp = ch.timestamp;
cs->active = 1;
cs->dropped = 0;
if (h->type == NGX_RTMP_MSG_AUDIO) {
cs->aabs = 0;
} else {
cs->vabs = 0;
}
++peers;
continue;
}
}
/* send relative packet */
@ -916,9 +971,9 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
cs->dropped += delta;
if (mandatory) {
if (is_header) {
ngx_log_debug0(NGX_LOG_DEBUG_RTMP, ss->connection->log, 0,
"live: mandatory packet failed");
"live: header packet failed");
ngx_rtmp_finalize_session(ss);
}
@ -937,8 +992,16 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ngx_rtmp_free_shared_chain(cscf, apkt);
}
if (acopkt) {
ngx_rtmp_free_shared_chain(cscf, acopkt);
if (ahpkt) {
ngx_rtmp_free_shared_chain(cscf, ahpkt);
}
if (vhpkt) {
ngx_rtmp_free_shared_chain(cscf, vhpkt);
}
if (kpkt) {
ngx_rtmp_free_shared_chain(cscf, kpkt);
}
ngx_rtmp_update_bandwidth(&ctx->stream->bw_in, h->mlen);

4
ngx_rtmp_live_module.h
View File

@ -19,8 +19,9 @@ typedef struct ngx_rtmp_live_stream_s ngx_rtmp_live_stream_t;
typedef struct {
unsigned active:1;
unsigned vabs:1;
unsigned aabs:1;
uint32_t timestamp;
uint32_t csid;
uint32_t dropped;
} ngx_rtmp_live_chunk_stream_t;
@ -37,6 +38,7 @@ struct ngx_rtmp_live_ctx_s {
unsigned publishing:1;
unsigned silent:1;
unsigned paused:1;
unsigned initialized:1;
};