[dev] added continuity counter in TS headers.

Author: winshining

hls/ngx_rtmp_hls_module.c

@@ -849,6 +849,7 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
     uint64_t                  id;
     ngx_fd_t                  fd;
     ngx_uint_t                g;
+    ngx_uint_t                counter;
     ngx_rtmp_hls_ctx_t       *ctx;
     ngx_rtmp_codec_ctx_t     *codec_ctx;
     ngx_rtmp_hls_frag_t      *f;
@@ -930,12 +931,14 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
         }
     }
 
-    ngx_log_debug6(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
+    counter = (ngx_uint_t) (ctx->nfrags + ctx->frag);
+
+    ngx_log_debug7(NGX_LOG_DEBUG_RTMP, s->connection->log, 0,
                    "hls: open fragment file='%s', keyfile='%s', "
-                   "frag=%uL, n=%ui, time=%uL, discont=%i",
+                   "frag=%uL, n=%ui, time=%uL, discont=%i, cc=%u",
                    ctx->stream.data,
                    ctx->keyfile.data ? ctx->keyfile.data : (u_char *) "",
-                   ctx->frag, ctx->nfrags, ts, discont);
+                   ctx->frag, ctx->nfrags, ts, discont, counter);
 
     if (hacf->keys &&
         ngx_rtmp_mpegts_init_encryption(&ctx->file, ctx->key, 16, ctx->key_id)
@@ -948,7 +951,7 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
 
     codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
     if (ngx_rtmp_mpegts_open_file(&ctx->file, ctx->stream.data, codec_ctx,
-                                  s->connection->log)
+                                  counter, s->connection->log)
         != NGX_OK)
     {
         return NGX_ERROR;

hls/ngx_rtmp_mpegts.c

@@ -173,7 +173,7 @@ ngx_rtmp_mpegts_write_file(ngx_rtmp_mpegts_file_t *file, u_char *in,
 
 static ngx_int_t
 ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file,
-    ngx_rtmp_codec_ctx_t *codec_ctx)
+    ngx_rtmp_codec_ctx_t *codec_ctx, ngx_uint_t counter)
 {
     ngx_int_t              stream_bytes;
     ngx_rtmp_mpegts_crc_t  crc;
@@ -186,6 +186,12 @@ ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file,
     stream_bytes = 0;
     ngx_memcpy(buf, ngx_rtmp_mpegts_header, sizeof(ngx_rtmp_mpegts_header));
 
+    /* 4 bits, periodical */
+    counter %= 0x10;
+    /* fill headers */
+    buf[3] = (buf[3] & 0xf0) + (u_char) counter;
+    buf[191] = (buf[191] & 0xf0) + (u_char) counter;
+
     if (codec_ctx->video_codec_id) {
         /* video info */
         ngx_memcpy(buf + NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes,
@@ -409,7 +415,7 @@ ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
 
 ngx_int_t
 ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
-    ngx_rtmp_codec_ctx_t *codec_ctx, ngx_log_t *log)
+    ngx_rtmp_codec_ctx_t *codec_ctx, ngx_uint_t counter, ngx_log_t *log)
 {
     file->log = log;
 
@@ -424,7 +430,7 @@ ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
 
     file->size = 0;
 
-    if (ngx_rtmp_mpegts_write_header(file, codec_ctx) != NGX_OK) {
+    if (ngx_rtmp_mpegts_write_header(file, codec_ctx, counter) != NGX_OK) {
         ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
                       "hls: error writing fragment header");
         ngx_close_file(file->fd);

hls/ngx_rtmp_mpegts.h

@@ -39,7 +39,7 @@ typedef struct {
 ngx_int_t ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
     u_char *key, size_t key_len, uint64_t iv);
 ngx_int_t ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
-    ngx_rtmp_codec_ctx_t *codec_ctx, ngx_log_t *log);
+    ngx_rtmp_codec_ctx_t *codec_ctx, ngx_uint_t counter, ngx_log_t *log);
 ngx_int_t ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file);
 ngx_int_t ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file,
     ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b);