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

added sending co-header in interleaved mode

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-11-23 14:09:23 +04:00
parent dec5e44160
commit 5db704cf2b
1 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ngx_rtmp_live_module.c
View File

@ -660,8 +660,8 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
{ {
ngx_rtmp_live_ctx_t *ctx, *pctx; ngx_rtmp_live_ctx_t *ctx, *pctx;
ngx_rtmp_codec_ctx_t *codec_ctx; ngx_rtmp_codec_ctx_t *codec_ctx;
ngx_chain_t *header, *meta, ngx_chain_t *header, *coheader, *meta,
*apkt, *rpkt; *apkt, *acopkt, *rpkt;
ngx_rtmp_core_srv_conf_t *cscf; ngx_rtmp_core_srv_conf_t *cscf;
ngx_rtmp_live_app_conf_t *lacf; ngx_rtmp_live_app_conf_t *lacf;
ngx_rtmp_session_t *ss; ngx_rtmp_session_t *ss;
@ -713,7 +713,9 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
peers = 0; peers = 0;
apkt = NULL; apkt = NULL;
acopkt = NULL;
header = NULL; header = NULL;
coheader = NULL;
meta = NULL; meta = NULL;
meta_version = 0; meta_version = 0;
mandatory = 0; mandatory = 0;
@ -766,6 +768,10 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
if (h->type == NGX_RTMP_MSG_AUDIO) { if (h->type == NGX_RTMP_MSG_AUDIO) {
header = codec_ctx->aac_header; header = codec_ctx->aac_header;
if (lacf->interleave) {
coheader = codec_ctx->avc_header;
}
if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC && if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC &&
in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0) in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0)
{ {
@ -776,6 +782,10 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
} else { } else {
header = codec_ctx->avc_header; header = codec_ctx->avc_header;
if (lacf->interleave) {
coheader = codec_ctx->aac_header;
}
if (codec_ctx->audio_codec_id == NGX_RTMP_VIDEO_H264 && if (codec_ctx->audio_codec_id == NGX_RTMP_VIDEO_H264 &&
in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0) in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0)
{ {
@ -833,7 +843,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
continue; continue;
} }
if (header) { if (header || coheader) {
/* send absolute codec header */ /* send absolute codec header */
@ -841,14 +851,28 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
"live: abs %s header timestamp=%uD", "live: abs %s header timestamp=%uD",
type_s, lh.timestamp); type_s, lh.timestamp);
if (apkt == NULL) { if (header) {
apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, header); if (apkt == NULL) {
ngx_rtmp_prepare_message(s, &lh, NULL, apkt); apkt = ngx_rtmp_append_shared_bufs(cscf, NULL, header);
ngx_rtmp_prepare_message(s, &lh, NULL, apkt);
}
rc = ngx_rtmp_send_message(ss, apkt, 0);
if (rc != NGX_OK) {
continue;
}
} }
rc = ngx_rtmp_send_message(ss, apkt, 0); if (coheader) {
if (rc != NGX_OK) { if (acopkt == NULL) {
continue; acopkt = ngx_rtmp_append_shared_bufs(cscf, NULL, coheader);
ngx_rtmp_prepare_message(s, &lh, NULL, acopkt);
}
rc = ngx_rtmp_send_message(ss, acopkt, 0);
if (rc != NGX_OK) {
continue;
}
} }
cs->timestamp = lh.timestamp; cs->timestamp = lh.timestamp;
@ -913,6 +937,10 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
ngx_rtmp_free_shared_chain(cscf, apkt); ngx_rtmp_free_shared_chain(cscf, apkt);
} }
if (acopkt) {
ngx_rtmp_free_shared_chain(cscf, acopkt);
}
ngx_rtmp_update_bandwidth(&ctx->stream->bw_in, h->mlen); ngx_rtmp_update_bandwidth(&ctx->stream->bw_in, h->mlen);
ngx_rtmp_update_bandwidth(&ctx->stream->bw_out, h->mlen * peers); ngx_rtmp_update_bandwidth(&ctx->stream->bw_out, h->mlen * peers);