Skip to content

Commit b7c5df1

Browse files
winshiningwinshining
committed
[dev] added single track support for HLS.
1 parent f627b56 commit b7c5df1

File tree

6 files changed

+244
-13
lines changed

6 files changed

+244
-13
lines changed

‎config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ RTMP_DEPS=" \
5252
$ngx_addon_dir/ngx_rtmp_proxy_protocol.h \
5353
$ngx_addon_dir/ngx_rtmp_variables.h \
5454
$ngx_addon_dir/hls/ngx_rtmp_mpegts.h \
55+
$ngx_addon_dir/hls/ngx_rtmp_mpegts_crc.h \
5556
$ngx_addon_dir/dash/ngx_rtmp_mp4.h \
5657
"
5758

@@ -92,6 +93,7 @@ RTMP_CORE_SRCS=" \
9293
$ngx_addon_dir/hls/ngx_rtmp_hls_module.c \
9394
$ngx_addon_dir/dash/ngx_rtmp_dash_module.c \
9495
$ngx_addon_dir/hls/ngx_rtmp_mpegts.c \
96+
$ngx_addon_dir/hls/ngx_rtmp_mpegts_crc.c \
9597
$ngx_addon_dir/dash/ngx_rtmp_mp4.c \
9698
"
9799

‎hls/ngx_rtmp_hls_module.c‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/*
33
* Copyright (C) Roman Arutyunyan
4+
* Copyright (C) Winshining
45
*/
56

67

@@ -849,6 +850,7 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
849850
ngx_fd_t fd;
850851
ngx_uint_t g;
851852
ngx_rtmp_hls_ctx_t *ctx;
853+
ngx_rtmp_codec_ctx_t *codec_ctx;
852854
ngx_rtmp_hls_frag_t *f;
853855
ngx_rtmp_hls_app_conf_t *hacf;
854856

@@ -944,7 +946,8 @@ ngx_rtmp_hls_open_fragment(ngx_rtmp_session_t *s, uint64_t ts,
944946
return NGX_ERROR;
945947
}
946948

947-
if (ngx_rtmp_mpegts_open_file(&ctx->file, ctx->stream.data,
949+
codec_ctx = ngx_rtmp_get_module_ctx(s, ngx_rtmp_codec_module);
950+
if (ngx_rtmp_mpegts_open_file(&ctx->file, ctx->stream.data, codec_ctx,
948951
s->connection->log)
949952
!= NGX_OK)
950953
{

‎hls/ngx_rtmp_mpegts.c‎

Lines changed: 70 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11

22
/*
33
* Copyright (C) Roman Arutyunyan
4+
* Copyright (C) Winshining
45
*/
56

67

78
#include <ngx_config.h>
89
#include <ngx_core.h>
910
#include "ngx_rtmp_mpegts.h"
11+
#include "ngx_rtmp_mpegts_crc.h"
1012

1113

1214
static u_char ngx_rtmp_mpegts_header[] = {
@@ -45,12 +47,10 @@ static u_char ngx_rtmp_mpegts_header[] = {
4547
/* PMT */
4648
0xe1, 0x00,
4749
0xf0, 0x00,
48-
0x1b, 0xe1, 0x00, 0xf0, 0x00, /* h264 */
49-
0x0f, 0xe1, 0x01, 0xf0, 0x00, /* aac */
50-
/*0x03, 0xe1, 0x01, 0xf0, 0x00,*/ /* mp3 */
50+
0xff, 0xff, 0xff, 0xff, 0xff, /* video, filled dynamically */
51+
0xff, 0xff, 0xff, 0xff, 0xff, /* audio, filled dynamically */
5152
/* CRC */
52-
0x2f, 0x44, 0xb9, 0x9b, /* crc for aac */
53-
/*0x4e, 0x59, 0x3d, 0x1e,*/ /* crc for mp3 */
53+
0xff, 0xff, 0xff, 0xff, /* calculate dynamically */
5454
/* stuffing 157 bytes */
5555
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
5656
0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
@@ -71,8 +71,25 @@ static u_char ngx_rtmp_mpegts_header[] = {
7171
};
7272

7373

74+
static u_char ngx_rtmp_mpegts_h264_header[] = {
75+
0x1b, 0xe1, 0x00, 0xf0, 0x00
76+
};
77+
78+
79+
static u_char ngx_rtmp_mpegts_aac_header[] = {
80+
0x0f, 0xe1, 0x01, 0xf0, 0x00
81+
};
82+
83+
84+
#define NGX_RTMP_MPEGTS_PMT_CRC_START_OFFSET 193
85+
#define NGX_RTMP_MPEGTS_PMT_SECTION_LENGTH_OFFSET 195
86+
#define NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET 205
87+
#define NGX_RTMP_MPEGTS_PMT_CRC_MIN_LENGTH 12
88+
#define NGX_RTMP_MPEGTS_STREAM_BYTES 5
89+
90+
7491
/* 700 ms PCR delay */
75-
#define NGX_RTMP_HLS_DELAY 63000
92+
#define NGX_RTMP_HLS_DELAY 63000
7693

7794

7895
static ngx_int_t
@@ -155,10 +172,52 @@ ngx_rtmp_mpegts_write_file(ngx_rtmp_mpegts_file_t *file, u_char *in,
155172

156173

157174
static ngx_int_t
158-
ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file)
175+
ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file,
176+
ngx_rtmp_codec_ctx_t *codec_ctx)
159177
{
160-
return ngx_rtmp_mpegts_write_file(file, ngx_rtmp_mpegts_header,
161-
sizeof(ngx_rtmp_mpegts_header));
178+
ngx_int_t stream_bytes;
179+
ngx_rtmp_mpegts_crc_t crc;
180+
u_char buf[sizeof(ngx_rtmp_mpegts_header)];
181+
182+
if (codec_ctx->video_codec_id == 0 && codec_ctx->audio_codec_id == 0) {
183+
return NGX_ERROR;
184+
}
185+
186+
stream_bytes = 0;
187+
ngx_memcpy(buf, ngx_rtmp_mpegts_header, sizeof(ngx_rtmp_mpegts_header));
188+
189+
if (codec_ctx->video_codec_id) {
190+
/* video info */
191+
ngx_memcpy(buf + NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes,
192+
ngx_rtmp_mpegts_h264_header, NGX_RTMP_MPEGTS_STREAM_BYTES);
193+
194+
stream_bytes += NGX_RTMP_MPEGTS_STREAM_BYTES;
195+
}
196+
197+
if (codec_ctx->audio_codec_id) {
198+
/* audio info */
199+
ngx_memcpy(buf + NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes,
200+
ngx_rtmp_mpegts_aac_header, NGX_RTMP_MPEGTS_STREAM_BYTES);
201+
202+
stream_bytes += NGX_RTMP_MPEGTS_STREAM_BYTES;
203+
}
204+
205+
/* calculate section length */
206+
buf[NGX_RTMP_MPEGTS_PMT_SECTION_LENGTH_OFFSET] = 13 + stream_bytes;
207+
208+
/* calculate CRC */
209+
crc = ngx_rtmp_mpegts_crc_init();
210+
crc = ngx_rtmp_mpegts_crc_update(crc,
211+
buf + NGX_RTMP_MPEGTS_PMT_CRC_START_OFFSET,
212+
NGX_RTMP_MPEGTS_PMT_CRC_MIN_LENGTH + stream_bytes);
213+
crc = ngx_rtmp_mpegts_crc_finalize(crc);
214+
215+
buf[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes] = (crc >> 24) & 0xff;
216+
buf[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes + 1] = (crc >> 16) & 0xff;
217+
buf[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes + 2] = (crc >> 8) & 0xff;
218+
buf[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET + stream_bytes + 3] = crc & 0xff;
219+
220+
return ngx_rtmp_mpegts_write_file(file, buf, sizeof(buf));
162221
}
163222

164223

@@ -350,7 +409,7 @@ ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
350409

351410
ngx_int_t
352411
ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
353-
ngx_log_t *log)
412+
ngx_rtmp_codec_ctx_t *codec_ctx, ngx_log_t *log)
354413
{
355414
file->log = log;
356415

@@ -365,7 +424,7 @@ ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
365424

366425
file->size = 0;
367426

368-
if (ngx_rtmp_mpegts_write_header(file) != NGX_OK) {
427+
if (ngx_rtmp_mpegts_write_header(file, codec_ctx) != NGX_OK) {
369428
ngx_log_error(NGX_LOG_ERR, log, ngx_errno,
370429
"hls: error writing fragment header");
371430
ngx_close_file(file->fd);

‎hls/ngx_rtmp_mpegts.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11

22
/*
33
* Copyright (C) Roman Arutyunyan
4+
* Copyright (C) Winshining
45
*/
56

67

@@ -11,6 +12,7 @@
1112
#include <ngx_config.h>
1213
#include <ngx_core.h>
1314
#include <openssl/aes.h>
15+
#include "ngx_rtmp_codec_module.h"
1416

1517

1618
typedef struct {
@@ -37,7 +39,7 @@ typedef struct {
3739
ngx_int_t ngx_rtmp_mpegts_init_encryption(ngx_rtmp_mpegts_file_t *file,
3840
u_char *key, size_t key_len, uint64_t iv);
3941
ngx_int_t ngx_rtmp_mpegts_open_file(ngx_rtmp_mpegts_file_t *file, u_char *path,
40-
ngx_log_t *log);
42+
ngx_rtmp_codec_ctx_t *codec_ctx, ngx_log_t *log);
4143
ngx_int_t ngx_rtmp_mpegts_close_file(ngx_rtmp_mpegts_file_t *file);
4244
ngx_int_t ngx_rtmp_mpegts_write_frame(ngx_rtmp_mpegts_file_t *file,
4345
ngx_rtmp_mpegts_frame_t *f, ngx_buf_t *b);

‎hls/ngx_rtmp_mpegts_crc.c‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
/**
2+
* \file crc.c
3+
* Functions and types for CRC checks.
4+
*
5+
* Generated on Thu May 5 15:32:31 2016,
6+
* by pycrc v0.9, https://pycrc.org
7+
* using the configuration:
8+
* Width = 32
9+
* Poly = 0x04c11db7
10+
* Xor_In = 0xffffffff
11+
* ReflectIn = False
12+
* Xor_Out = 0x00000000
13+
* ReflectOut = False
14+
* Algorithm = table-driven
15+
*****************************************************************************/
16+
#include "ngx_rtmp_mpegts_crc.h" /* include the header file generated with pycrc */
17+
18+
19+
/**
20+
* Static table used for the table_driven implementation.
21+
*****************************************************************************/
22+
static const ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_table[256] = {
23+
0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
24+
0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
25+
0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
26+
0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
27+
0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
28+
0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
29+
0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
30+
0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
31+
0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
32+
0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
33+
0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
34+
0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
35+
0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
36+
0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
37+
0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
38+
0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
39+
0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
40+
0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
41+
0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
42+
0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
43+
0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
44+
0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
45+
0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
46+
0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
47+
0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
48+
0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
49+
0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
50+
0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
51+
0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
52+
0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
53+
0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
54+
0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
55+
};
56+
57+
58+
/**
59+
* Update the crc value with new data.
60+
*
61+
* \param crc The current crc value.
62+
* \param data Pointer to a buffer of \a data_len bytes.
63+
* \param data_len Number of bytes in the \a data buffer.
64+
* \return The updated crc value.
65+
*****************************************************************************/
66+
ngx_rtmp_mpegts_crc_t
67+
ngx_rtmp_mpegts_crc_update(ngx_rtmp_mpegts_crc_t crc, const void *data, size_t data_len)
68+
{
69+
uint32_t tbl_idx;
70+
const u_char *d = (const unsigned char *) data;
71+
72+
while (data_len--) {
73+
tbl_idx = ((crc >> 24) ^ *d) & 0xff;
74+
crc = (ngx_rtmp_mpegts_crc_table[tbl_idx] ^ (crc << 8)) & 0xffffffff;
75+
76+
d++;
77+
}
78+
79+
return crc & 0xffffffff;
80+
}

‎hls/ngx_rtmp_mpegts_crc.h‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/**
2+
* \file crc.h
3+
* Functions and types for CRC checks.
4+
*
5+
* Generated on Thu May 5 15:32:22 2016,
6+
* by pycrc v0.9, https://pycrc.org
7+
* using the configuration:
8+
* Width = 32
9+
* Poly = 0x04c11db7
10+
* Xor_In = 0xffffffff
11+
* ReflectIn = False
12+
* Xor_Out = 0x00000000
13+
* ReflectOut = False
14+
* Algorithm = table-driven
15+
*****************************************************************************/
16+
#ifndef _NGX_RTMP_MPEGTS_CRC_H_INCLUDED_
17+
#define _NGX_RTMP_MPEGTS_CRC_H_INCLUDED_
18+
19+
20+
#include <ngx_core.h>
21+
22+
23+
#ifdef __cplusplus
24+
extern "C" {
25+
#endif
26+
27+
28+
/**
29+
* The definition of the used algorithm.
30+
*
31+
* This is not used anywhere in the generated code, but it may be used by the
32+
* application code to call algoritm-specific code, is desired.
33+
*****************************************************************************/
34+
#define CRC_ALGO_TABLE_DRIVEN 1
35+
36+
37+
/**
38+
* The type of the CRC values.
39+
*
40+
* This type must be big enough to contain at least 32 bits.
41+
*****************************************************************************/
42+
typedef uint_fast32_t ngx_rtmp_mpegts_crc_t;
43+
44+
45+
/**
46+
* Calculate the initial crc value.
47+
*
48+
* \return The initial crc value.
49+
*****************************************************************************/
50+
static ngx_inline ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_init(void)
51+
{
52+
return 0xffffffff;
53+
}
54+
55+
56+
/**
57+
* Update the crc value with new data.
58+
*
59+
* \param crc The current crc value.
60+
* \param data Pointer to a buffer of \a data_len bytes.
61+
* \param data_len Number of bytes in the \a data buffer.
62+
* \return The updated crc value.
63+
*****************************************************************************/
64+
ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_update(ngx_rtmp_mpegts_crc_t crc,
65+
const void *data, size_t data_len);
66+
67+
68+
/**
69+
* Calculate the final crc value.
70+
*
71+
* \param crc The current crc value.
72+
* \return The final crc value.
73+
*****************************************************************************/
74+
static ngx_inline ngx_rtmp_mpegts_crc_t
75+
ngx_rtmp_mpegts_crc_finalize(ngx_rtmp_mpegts_crc_t crc)
76+
{
77+
return crc ^ 0x00000000;
78+
}
79+
80+
81+
#ifdef __cplusplus
82+
} /* closing brace for extern "C" */
83+
#endif
84+
85+
#endif /* _NGX_RTMP_MPEGTS_CRC_H_INCLUDED_ */

0 commit comments

Comments
 (0)