正在显示
2 个修改的文件
包含
21 行增加
和
21 行删除
| @@ -417,38 +417,38 @@ public: | @@ -417,38 +417,38 @@ public: | ||
| 417 | */ | 417 | */ |
| 418 | enum TSPESStreamId | 418 | enum TSPESStreamId |
| 419 | { | 419 | { |
| 420 | - PES_program_stream_map = 0b10111100, // 0xbc | ||
| 421 | - PES_private_stream_1 = 0b10111101, // 0xbd | ||
| 422 | - PES_padding_stream = 0b10111110, // 0xbe | ||
| 423 | - PES_private_stream_2 = 0b10111111, // 0xbf | 420 | + PES_program_stream_map = 0xbc, // 0b10111100 |
| 421 | + PES_private_stream_1 = 0xbd, // 0b10111101 | ||
| 422 | + PES_padding_stream = 0xbe, // 0b10111110 | ||
| 423 | + PES_private_stream_2 = 0xbf, // 0b10111111 | ||
| 424 | 424 | ||
| 425 | // 110x xxxx | 425 | // 110x xxxx |
| 426 | // ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC | 426 | // ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC |
| 427 | // 14496-3 audio stream number x xxxx | 427 | // 14496-3 audio stream number x xxxx |
| 428 | // (stream_id>>5)&0x07 == PES_audio_prefix | 428 | // (stream_id>>5)&0x07 == PES_audio_prefix |
| 429 | - PES_audio_prefix = 0b110, | 429 | + PES_audio_prefix = 0x06, // 0b110 |
| 430 | 430 | ||
| 431 | // 1110 xxxx | 431 | // 1110 xxxx |
| 432 | // ITU-T Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 11172-2 or ISO/IEC | 432 | // ITU-T Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 11172-2 or ISO/IEC |
| 433 | // 14496-2 video stream number xxxx | 433 | // 14496-2 video stream number xxxx |
| 434 | // (stream_id>>4)&0x0f == PES_audio_prefix | 434 | // (stream_id>>4)&0x0f == PES_audio_prefix |
| 435 | - PES_video_prefix = 0b1110, | ||
| 436 | - | ||
| 437 | - PES_ECM_stream = 0b11110000, // 0xf0 | ||
| 438 | - PES_EMM_stream = 0b11110001, // 0xf1 | ||
| 439 | - PES_DSMCC_stream = 0b11110010, // 0xf2 | ||
| 440 | - PES_13522_stream = 0b11110011, // 0xf3 | ||
| 441 | - PES_H_222_1_type_A = 0b11110100, // 0xf4 | ||
| 442 | - PES_H_222_1_type_B = 0b11110101, // 0xf5 | ||
| 443 | - PES_H_222_1_type_C = 0b11110110, // 0xf6 | ||
| 444 | - PES_H_222_1_type_D = 0b11110111, // 0xf7 | ||
| 445 | - PES_H_222_1_type_E = 0b11111000, // 0xf8 | ||
| 446 | - PES_ancillary_stream = 0b11111001, // 0xf9 | ||
| 447 | - PES_SL_packetized_stream = 0b11111010, // 0xfa | ||
| 448 | - PES_FlexMux_stream = 0b11111011, // 0xfb | 435 | + PES_video_prefix = 0x0e, // 0b1110 |
| 436 | + | ||
| 437 | + PES_ECM_stream = 0xf0, // 0b11110000 | ||
| 438 | + PES_EMM_stream = 0xf1, // 0b11110001 | ||
| 439 | + PES_DSMCC_stream = 0xf2, // 0b11110010 | ||
| 440 | + PES_13522_stream = 0xf3, // 0b11110011 | ||
| 441 | + PES_H_222_1_type_A = 0xf4, // 0b11110100 | ||
| 442 | + PES_H_222_1_type_B = 0xf5, // 0b11110101 | ||
| 443 | + PES_H_222_1_type_C = 0xf6, // 0b11110110 | ||
| 444 | + PES_H_222_1_type_D = 0xf7, // 0b11110111 | ||
| 445 | + PES_H_222_1_type_E = 0xf8, // 0b11111000 | ||
| 446 | + PES_ancillary_stream = 0xf9, // 0b11111001 | ||
| 447 | + PES_SL_packetized_stream = 0xfa, // 0b11111010 | ||
| 448 | + PES_FlexMux_stream = 0xfb, // 0b11111011 | ||
| 449 | // reserved data stream | 449 | // reserved data stream |
| 450 | // 1111 1100 … 1111 1110 | 450 | // 1111 1100 … 1111 1110 |
| 451 | - PES_program_stream_directory= 0b11111111, // 0xff | 451 | + PES_program_stream_directory= 0xff, // 0b11111111 |
| 452 | }; | 452 | }; |
| 453 | 453 | ||
| 454 | 454 |
| @@ -58,7 +58,7 @@ file | @@ -58,7 +58,7 @@ file | ||
| 58 | ..\core\srs_core_source.hpp, | 58 | ..\core\srs_core_source.hpp, |
| 59 | ..\core\srs_core_source.cpp, | 59 | ..\core\srs_core_source.cpp, |
| 60 | research readonly separator, | 60 | research readonly separator, |
| 61 | - ..\..\research\ts_info.cc; | 61 | + ..\..\research\hls\ts_info.cc; |
| 62 | 62 | ||
| 63 | mainconfig | 63 | mainconfig |
| 64 | "" = "MAIN"; | 64 | "" = "MAIN"; |
-
请 注册 或 登录 后发表评论