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

fixed h264 header considered by recorder as a key with intermediate frames following

Browse Source
This commit is contained in:
Roman Arutyunyan
2012-12-16 01:07:01 +04:00
parent a45e3d5cbe
commit 8658d99529
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ngx_rtmp.h
View File

@ -555,6 +555,13 @@ ngx_rtmp_get_video_frame_type(ngx_chain_t *in)
} }
static inline ngx_int_t
ngx_rtmp_is_codec_header(ngx_chain_t *in)
{
return in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0;
}
extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_out; extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_out;
extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in; extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in;

2
ngx_rtmp_codec_module.c
View File

@ -192,7 +192,7 @@ ngx_rtmp_codec_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
} }
/* no conf */ /* no conf */
if (in->buf->pos[1]) { if (!ngx_rtmp_is_codec_header(in)) {
return NGX_OK; return NGX_OK;
} }

4
ngx_rtmp_live_module.c
View File

@ -786,7 +786,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
} }
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) ngx_rtmp_is_codec_header(in))
{ {
prio = 0; prio = 0;
mandatory = 1; mandatory = 1;
@ -800,7 +800,7 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
} }
if (codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 && if (codec_ctx->video_codec_id == NGX_RTMP_VIDEO_H264 &&
in->buf->pos + 1 < in->buf->last && in->buf->pos[1] == 0) ngx_rtmp_is_codec_header(in))
{ {
prio = 0; prio = 0;
mandatory = 1; mandatory = 1;

13
ngx_rtmp_record_module.c
View File

@ -422,16 +422,14 @@ ngx_rtmp_record_node_open(ngx_rtmp_session_t *s,
"record: %V opening", &rracf->id); "record: %V opening", &rracf->id);
ngx_memzero(rctx, sizeof(*rctx)); ngx_memzero(rctx, sizeof(*rctx));
rctx->conf = rracf;
rctx->last = *ngx_cached_time;
rctx->timestamp = ngx_cached_time->sec; rctx->timestamp = ngx_cached_time->sec;
ngx_rtmp_record_make_path(s, rctx, &path); ngx_rtmp_record_make_path(s, rctx, &path);
ngx_memzero(&rctx->file, sizeof(rctx->file)); ngx_memzero(&rctx->file, sizeof(rctx->file));
rctx->last = *ngx_cached_time;
rctx->file.offset = 0; rctx->file.offset = 0;
rctx->failed = 0;
rctx->file.log = s->connection->log; rctx->file.log = s->connection->log;
rctx->file.fd = ngx_open_file(path.data, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE, rctx->file.fd = ngx_open_file(path.data, NGX_FILE_WRONLY, NGX_FILE_TRUNCATE,
NGX_FILE_DEFAULT_ACCESS); NGX_FILE_DEFAULT_ACCESS);
@ -970,7 +968,7 @@ ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
if (ngx_rtmp_record_write_frame(s, rctx, &ch, if (ngx_rtmp_record_write_frame(s, rctx, &ch,
codec_ctx->aac_header, 0) codec_ctx->aac_header, 0)
!= NGX_OK) != NGX_OK)
{ {
return NGX_OK; return NGX_OK;
} }
@ -1009,7 +1007,10 @@ ngx_rtmp_record_node_av(ngx_rtmp_session_t *s, ngx_rtmp_record_rec_ctx_t *rctx,
return NGX_OK; return NGX_OK;
} }
if (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME) { if (ngx_rtmp_get_video_frame_type(in) == NGX_RTMP_VIDEO_KEY_FRAME &&
(codec_ctx->video_codec_id != NGX_RTMP_VIDEO_H264 ||
!ngx_rtmp_is_codec_header(in)))
{
rctx->video_key_sent = 1; rctx->video_key_sent = 1;
} }