fixed frame interleaving

arut · arut · commit f7e7ea0fc115 · 2012-10-10T23:46:16.000+04:00
diff --git a/ngx_rtmp_live_module.c b/ngx_rtmp_live_module.c
@@ -393,6 +393,10 @@ ngx_rtmp_live_av(ngx_rtmp_session_t *s, ngx_rtmp_header_t *h,
         ch.csid = NGX_RTMP_LIVE_CSID_AUDIO;
     }
 
+    if (lacf->interleave) {
+        ch.csid = NGX_RTMP_LIVE_CSID_VIDEO;
+    }
+
     lh.csid = ch.csid;
     diff_timestamp = ch.timestamp - lh.timestamp;
 

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,10 @@ ngx_rtmp_live_av(ngx_rtmp_session_t s, ngx_rtmp_header_t h,`
`393`	`393`	`ch.csid = NGX_RTMP_LIVE_CSID_AUDIO;`
`394`	`394`	`}`
`395`	`395`
	`396`	`+ if (lacf->interleave) {`
	`397`	`+ ch.csid = NGX_RTMP_LIVE_CSID_VIDEO;`
	`398`	`+ }`
	`399`	`+`
`396`	`400`	`lh.csid = ch.csid;`
`397`	`401`	`diff_timestamp = ch.timestamp - lh.timestamp;`
`398`	`402`