zotan/nginx-mod-rtmp
1
1
Fork 0
mirror of https://github.com/zotanmew/nginx-rtmp-module.git synced 2024-05-12 07:11:08 +02:00
Code Issues Projects Releases Wiki Activity

fixed publish_time_fix=on

Browse source
This commit is contained in:
Roman Arutyunyan 2012-11-22 18:39:24 +04:00
parent dec5e44160
commit b145f3bc9c
2 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ngx_rtmp.h
View file

@ -161,6 +161,7 @@ typedef struct {
ngx_rtmp_header_t hdr;
uint32_t dtime;
uint32_t len; /* current fragment length */
uint8_t ext;
ngx_chain_t *in;
} ngx_rtmp_stream_t;

30
ngx_rtmp_handler.c
View file

@ -197,7 +197,7 @@ ngx_rtmp_recv(ngx_event_t *rev)
ngx_buf_t *b;
u_char *p, *pp, *old_pos;
size_t size, fsize, old_size;
uint8_t fmt;
uint8_t fmt, ext;
uint32_t csid, timestamp;
c = rev->data;
@ -338,6 +338,7 @@ ngx_rtmp_recv(ngx_event_t *rev)
h->csid = csid;
}
ext = st->ext;
timestamp = st->dtime;
if (fmt <= 2 ) {
if (b->last - p < 3)
@ -350,6 +351,8 @@ ngx_rtmp_recv(ngx_event_t *rev)
pp[0] = *p++;
pp[3] = 0;
ext = (timestamp == 0x00ffffff);
if (fmt <= 1) {
if (b->last - p < 4)
continue;
@ -379,24 +382,23 @@ ngx_rtmp_recv(ngx_event_t *rev)
}
/* extended header */
if (timestamp >= 0x00ffffff) {
if (ext) {
if (b->last - p < 4)
continue;
pp = (u_char*)&timestamp;
pp[3] = *p++;
pp[2] = *p++;
pp[1] = *p++;
pp[0] = *p++;
}
if (st->len == 0) {
/* Messages with type=3 should
* never have ext timestamp field
* according to standard.
* However that's not always the case
* in real life */
if (fmt <= 2 || cscf->publish_time_fix) {
if (b->last - p < 4)
continue;
pp = (u_char*)&timestamp;
pp[3] = *p++;
pp[2] = *p++;
pp[1] = *p++;
pp[0] = *p++;
}
}
if (st->len == 0) {
st->ext = (ext && cscf->publish_time_fix);
if (fmt) {
st->dtime = timestamp;
} else {