diff --git a/config b/config index 3e5a30b..13f00e8 100644 --- a/config +++ b/config @@ -76,6 +76,7 @@ RTMP_CORE_SRCS=" \ $ngx_addon_dir/hls/ngx_rtmp_hls_module.c \ $ngx_addon_dir/dash/ngx_rtmp_dash_module.c \ $ngx_addon_dir/hls/ngx_rtmp_mpegts.c \ + $ngx_addon_dir/hls/ngx_rtmp_mpegts_crc.c \ $ngx_addon_dir/dash/ngx_rtmp_mp4.c \ " RTMP_HTTP_SRCS=" \ diff --git a/hls/ngx_rtmp_mpegts.c b/hls/ngx_rtmp_mpegts.c index c21756d..b2590b9 100644 --- a/hls/ngx_rtmp_mpegts.c +++ b/hls/ngx_rtmp_mpegts.c @@ -7,24 +7,30 @@ #include #include #include "ngx_rtmp_mpegts.h" +#include "ngx_rtmp_mpegts_crc.h" #include "ngx_rtmp_codec_module.h" static u_char ngx_rtmp_mpegts_header[] = { - /* https://en.wikipedia.org/wiki/MPEG_transport_stream#Packet */ + /* https://en.wikipedia.org/wiki/MPEG_transport_stream#Packet */ - /* TS */ + /* TS Header */ 0x47, // Sync byte 0x40, 0x00, // TEI(1) + PUS(1) + TP(1) + PID(13) - 0x10, // SC(2) + AFF(1) + PF(1) + CC(4) - 0x00, - /* PSI */ - 0x00, 0xb0, 0x0d, 0x00, 0x01, 0xc1, 0x00, 0x00, + 0x10, // TSC(2) + AFF(1) + PF(1) + CC(4) + 0x00, // adaption_field_length(8) + /* PAT */ - 0x00, 0x01, 0xef, 0xff, - /* CRC */ - 0x36, 0x90, 0xe2, 0x3d, + 0x00, // table_id(8) + 0xb0, 0x0d, // 1011b(4) + section_length(12) + 0x00, 0x01, // transport_stream_id(16) + 0xc1, 0x00, 0x00, // 11b(2) + VN(5) + CNI(1), section_no(8), last_section_no(8) + /* PAT program loop */ + 0x00, 0x01, 0xef, 0xff, // program_number(16), reserved(3) + program_map_pid(13) + /* PAT crc (CRC-32-MPEG2) */ + 0x36, 0x90, 0xe2, 0x3d, // !!! Needs to be recalculated each time any bit in PAT is modified (which we dont do at the moment) !!! + /* stuffing 167 bytes */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -44,19 +50,26 @@ static u_char ngx_rtmp_mpegts_header[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, - /* TS */ - 0x47, - 0x4f, 0xff, - 0x10, - 0x00, - /* PSI */ - 0x02, 0xb0, 0x17, 0x00, 0x01, 0xc1, 0x00, 0x00, + /* TS Header */ + 0x47, // Sync byte + 0x4f, 0xff, // TEI(1) + PUS(1) + TP(1) + PID(13) + 0x10, // TSC(2) + AFF(1) + PF(1) + CC(4) + 0x00, // adaption_field_length(8) + /* PMT */ - 0xe1, 0x00, - 0xf0, 0x00, - 0x1b, 0xe1, 0x00, 0xf0, 0x00, /* h264 */ - 0x00, 0x00, 0x00, 0x00, 0x00, /* audio placeholder */ - 0x00, 0x00, 0x00, 0x00, /* audio crc placeholder */ + 0x02, // table_id(8) + 0xb0, 0x12, // 1011b(4) + section_length(12) (section length set below. Ignore this value in here) + 0x00, 0x01, // program_number(16) + 0xc1, 0x00, 0x00, // 11b(2) + VN(5) + CNI(1), section_no(8), last_section_no(8) + 0xe1, 0x00, // reserved(3) + PCR_PID(13) + 0xf0, 0x00, // reserved(4) + program_info_length(12) + + /* PMT component loop, looped through when writing header */ + /* Max size of 14 bytes */ + /* Also includes the PMT CRC, calculated dynamically */ + 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, 0xff, + 0xff, 0xff, 0xff, 0xff, /* stuffing 157 bytes */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, @@ -77,18 +90,33 @@ static u_char ngx_rtmp_mpegts_header[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff }; +static u_char ngx_rtmp_mpegts_header_h264[] = { + //H.264 Video, PID 0x100 + 0x1b, // stream_type(8) + 0xe1, 0x00, // reserved(3) + elementary_PID(13) + 0xf0, 0x00 // reserved(4) + ES_info_length(12) +}; + static u_char ngx_rtmp_mpegts_header_mp3[] = { - 0x03, 0xe1, 0x01, 0xf0, 0x00, /* mp3 */ - /* CRC */ - 0x4e, 0x59, 0x3d, 0x1e, /* crc for mp3 */ + //MP3 Audio, PID 0x101 + 0x03, // stream_type(8) + 0xe1, 0x01, // reserved(3) + elementary_PID(13) + 0xf0, 0x00 // reserved(4) + ES_info_length(12) }; static u_char ngx_rtmp_mpegts_header_aac[] = { - 0x0f, 0xe1, 0x01, 0xf0, 0x00, /* aac */ - /* CRC */ - 0x2f, 0x44, 0xb9, 0x9b, /* crc for aac */ + //ADTS AAC Audio, PID 0x101 + 0x0f, // stream_type(8) + 0xe1, 0x01, // reserved(3) + elementary_PID(13) + 0xf0, 0x00 // reserved(4) + ES_info_length(12) }; +#define NGX_RTMP_MPEGTS_PMT_CRC_START_OFFSET 193 +#define NGX_RTMP_MPEGTS_PMT_CRC_MIN_LENGTH 12 +#define NGX_RTMP_MPEGTS_PMT_SECTION_LENGTH_OFFSET 195 +#define NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET 205 +#define NGX_RTMP_MPEGTS_PID_SIZE 5 + /* 700 ms PCR delay */ #define NGX_RTMP_HLS_DELAY 63000 @@ -171,87 +199,55 @@ ngx_rtmp_mpegts_write_file(ngx_rtmp_mpegts_file_t *file, u_char *in, return NGX_OK; } -ngx_int_t -ngx_rtmp_mpegts_set_audio_header(ngx_rtmp_codec_ctx_t *codec_ctx, ngx_uint_t mpegts_cc) -{ - if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC) { - ngx_memcpy(ngx_rtmp_mpegts_header+210, ngx_rtmp_mpegts_header_aac, - sizeof(ngx_rtmp_mpegts_header_aac)); - } - //if (*audio_codec_id == NGX_RTMP_AUDIO_MP3) { - else { - ngx_memcpy(ngx_rtmp_mpegts_header+210, ngx_rtmp_mpegts_header_mp3, - sizeof(ngx_rtmp_mpegts_header_mp3)); - } - - // Truncate counter to 4 bits here - mpegts_cc %= 0x0f; - // And fill headers - ngx_rtmp_mpegts_header[3] = (ngx_rtmp_mpegts_header[3] & 0xf0) + (u_char)mpegts_cc; - ngx_rtmp_mpegts_header[191] = (ngx_rtmp_mpegts_header[191] & 0xf0) + (u_char)mpegts_cc; - - return NGX_OK; -} - static ngx_int_t ngx_rtmp_mpegts_write_header(ngx_rtmp_mpegts_file_t *file, ngx_rtmp_codec_ctx_t *codec_ctx, ngx_uint_t mpegts_cc) { - ngx_int_t rc; + ngx_int_t next_pid_offset = 0; //Used to track the number of PIDs we have and the offset in 5-byte chunks - //If there's both audio and video present - if (codec_ctx->audio_codec_id && codec_ctx->video_codec_id) + //MPEG-TS CC is 4 bits long. Need to truncate it here. + mpegts_cc %= 0x0f; + // And then put it in the headers + ngx_rtmp_mpegts_header[3] = (ngx_rtmp_mpegts_header[3] & 0xf0) + (u_char)mpegts_cc; + ngx_rtmp_mpegts_header[191] = (ngx_rtmp_mpegts_header[191] & 0xf0) + (u_char)mpegts_cc; + + //ngx_rtmp_mpegts_header + + if (codec_ctx->video_codec_id) { - /* Write the audio headers */ - ngx_rtmp_mpegts_set_audio_header(codec_ctx, mpegts_cc); + //Put h264 PID in the PMT + ngx_memcpy(ngx_rtmp_mpegts_header+NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset, ngx_rtmp_mpegts_header_h264, NGX_RTMP_MPEGTS_PID_SIZE); - rc = ngx_rtmp_mpegts_write_file(file, ngx_rtmp_mpegts_header, - sizeof(ngx_rtmp_mpegts_header)); - } - else - { - //Just video or just audio - u_char buf[sizeof(ngx_rtmp_mpegts_header)]; - - ngx_memcpy(buf, ngx_rtmp_mpegts_header, sizeof(ngx_rtmp_mpegts_header)); - - /* Fix the section length */ - buf[195] = 0x12; - - if (codec_ctx->audio_codec_id) - { - /* Set the PCR PID to the audio PID */ - buf[202] = 0x01; - - /* Write the audio headers */ - ngx_rtmp_mpegts_set_audio_header(codec_ctx, mpegts_cc); - - /* Move the audio description over the video description */ - ngx_memcpy(buf + 205, buf + 210, 5); - - /* Fix the CRC partially overwriting the audio description */ - buf[210] = 0xec; - buf[211] = 0xe2; - buf[212] = 0xb0; - buf[213] = 0x94; - } - else - { - /* Fix the CRC partially overwriting the video description */ - buf[210] = 0x15; - buf[211] = 0xbd; - buf[212] = 0x4d; - buf[213] = 0x56; - } - - /* Clear the last byte of the audio description and the old CRC */ - ngx_memset(buf + 214, 0xff, 5); - - rc = ngx_rtmp_mpegts_write_file(file, buf, sizeof(buf)); + next_pid_offset += NGX_RTMP_MPEGTS_PID_SIZE; } - return rc; - + if (codec_ctx->audio_codec_id){ + //Put Audio PID in the PMT + if (codec_ctx->audio_codec_id == NGX_RTMP_AUDIO_AAC) { + ngx_memcpy(ngx_rtmp_mpegts_header+NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset, ngx_rtmp_mpegts_header_aac, NGX_RTMP_MPEGTS_PID_SIZE); + } + else + { + ngx_memcpy(ngx_rtmp_mpegts_header+NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset, ngx_rtmp_mpegts_header_mp3, NGX_RTMP_MPEGTS_PID_SIZE); + } + next_pid_offset += NGX_RTMP_MPEGTS_PID_SIZE; + } + + //Set section length of PMT + //PMT is 13 bytes long without any programs in it. Add this in + ngx_rtmp_mpegts_header[NGX_RTMP_MPEGTS_PMT_SECTION_LENGTH_OFFSET] = 13 + next_pid_offset; + + //Calculate CRC + ngx_rtmp_mpegts_crc_t crc = ngx_rtmp_mpegts_crc_init(); + crc = ngx_rtmp_mpegts_crc_update(crc, ngx_rtmp_mpegts_header+NGX_RTMP_MPEGTS_PMT_CRC_START_OFFSET, NGX_RTMP_MPEGTS_PMT_CRC_MIN_LENGTH+next_pid_offset); + crc = ngx_rtmp_mpegts_crc_finalize(crc); + + ngx_rtmp_mpegts_header[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset] = (crc >> 24) & 0xff; + ngx_rtmp_mpegts_header[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset+1] = (crc >> 16) & 0xff; + ngx_rtmp_mpegts_header[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset+2] = (crc >> 8) & 0xff; + ngx_rtmp_mpegts_header[NGX_RTMP_MPEGTS_PMT_LOOP_OFFSET+next_pid_offset+3] = crc & 0xff; + + return ngx_rtmp_mpegts_write_file(file, ngx_rtmp_mpegts_header, sizeof(ngx_rtmp_mpegts_header)); } diff --git a/hls/ngx_rtmp_mpegts_crc.c b/hls/ngx_rtmp_mpegts_crc.c new file mode 100644 index 0000000..437d605 --- /dev/null +++ b/hls/ngx_rtmp_mpegts_crc.c @@ -0,0 +1,80 @@ +/** + * \file crc.c + * Functions and types for CRC checks. + * + * Generated on Thu May 5 15:32:31 2016, + * by pycrc v0.9, https://pycrc.org + * using the configuration: + * Width = 32 + * Poly = 0x04c11db7 + * Xor_In = 0xffffffff + * ReflectIn = False + * Xor_Out = 0x00000000 + * ReflectOut = False + * Algorithm = table-driven + *****************************************************************************/ +#include "ngx_rtmp_mpegts_crc.h" /* include the header file generated with pycrc */ +#include +#include + +/** + * Static table used for the table_driven implementation. + *****************************************************************************/ +static const ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_table[256] = { + 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005, + 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, + 0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, + 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd, + 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, + 0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, + 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95, + 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, + 0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, + 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca, + 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, + 0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, + 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692, + 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, + 0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, + 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a, + 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, + 0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, + 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b, + 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, + 0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, + 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3, + 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, + 0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, + 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c, + 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, + 0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, + 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654, + 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, + 0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, + 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c, + 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 +}; + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_update(ngx_rtmp_mpegts_crc_t crc, const void *data, size_t data_len) +{ + const unsigned char *d = (const unsigned char *)data; + unsigned int tbl_idx; + + while (data_len--) { + tbl_idx = ((crc >> 24) ^ *d) & 0xff; + crc = (ngx_rtmp_mpegts_crc_table[tbl_idx] ^ (crc << 8)) & 0xffffffff; + + d++; + } + return crc & 0xffffffff; +} + + diff --git a/hls/ngx_rtmp_mpegts_crc.h b/hls/ngx_rtmp_mpegts_crc.h new file mode 100644 index 0000000..b3f41e3 --- /dev/null +++ b/hls/ngx_rtmp_mpegts_crc.h @@ -0,0 +1,83 @@ +/** + * \file crc.h + * Functions and types for CRC checks. + * + * Generated on Thu May 5 15:32:22 2016, + * by pycrc v0.9, https://pycrc.org + * using the configuration: + * Width = 32 + * Poly = 0x04c11db7 + * Xor_In = 0xffffffff + * ReflectIn = False + * Xor_Out = 0x00000000 + * ReflectOut = False + * Algorithm = table-driven + *****************************************************************************/ +#ifndef _NGX_RTMP_MPEGTS_CRC_H_INCLUDED_ +#define _NGX_RTMP_MPEGTS_CRC_H_INCLUDED_ + + +#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * The definition of the used algorithm. + * + * This is not used anywhere in the generated code, but it may be used by the + * application code to call algoritm-specific code, is desired. + *****************************************************************************/ +#define CRC_ALGO_TABLE_DRIVEN 1 + + +/** + * The type of the CRC values. + * + * This type must be big enough to contain at least 32 bits. + *****************************************************************************/ +typedef uint_fast32_t ngx_rtmp_mpegts_crc_t; + + +/** + * Calculate the initial crc value. + * + * \return The initial crc value. + *****************************************************************************/ +static inline ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_init(void) +{ + return 0xffffffff; +} + + +/** + * Update the crc value with new data. + * + * \param crc The current crc value. + * \param data Pointer to a buffer of \a data_len bytes. + * \param data_len Number of bytes in the \a data buffer. + * \return The updated crc value. + *****************************************************************************/ +ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_update(ngx_rtmp_mpegts_crc_t crc, const void *data, size_t data_len); + + +/** + * Calculate the final crc value. + * + * \param crc The current crc value. + * \return The final crc value. + *****************************************************************************/ +static inline ngx_rtmp_mpegts_crc_t ngx_rtmp_mpegts_crc_finalize(ngx_rtmp_mpegts_crc_t crc) +{ + return crc ^ 0x00000000; +} + + +#ifdef __cplusplus +} /* closing brace for extern "C" */ +#endif + +#endif /* _NGX_RTMP_MPEGTS_CRC_H_INCLUDED_ */