Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-01-01 21:07:01 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4d631d749ff77c79b2f3d33456c4de2ae05b6952
4d631d74
1 parent
4955425b
fix ts_info centos5 build bug
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
21 行增加
和
21 行删除
trunk/research/hls/ts_info.cc
trunk/src/srs/srs.upp
trunk/research/hls/ts_info.cc
查看文件 @
4d631d7
...
...
@@ -417,38 +417,38 @@ public:
*/
enum
TSPESStreamId
{
PES_program_stream_map
=
0
b10111100
,
// 0xbc
PES_private_stream_1
=
0
b10111101
,
// 0xbd
PES_padding_stream
=
0
b10111110
,
// 0xbe
PES_private_stream_2
=
0
b10111111
,
// 0xbf
PES_program_stream_map
=
0xbc
,
// 0b10111100
PES_private_stream_1
=
0xbd
,
// 0b10111101
PES_padding_stream
=
0xbe
,
// 0b10111110
PES_private_stream_2
=
0xbf
,
// 0b10111111
// 110x xxxx
// ISO/IEC 13818-3 or ISO/IEC 11172-3 or ISO/IEC 13818-7 or ISO/IEC
// 14496-3 audio stream number x xxxx
// (stream_id>>5)&0x07 == PES_audio_prefix
PES_audio_prefix
=
0
b110
,
PES_audio_prefix
=
0
x06
,
// 0b110
// 1110 xxxx
// ITU-T Rec. H.262 | ISO/IEC 13818-2 or ISO/IEC 11172-2 or ISO/IEC
// 14496-2 video stream number xxxx
// (stream_id>>4)&0x0f == PES_audio_prefix
PES_video_prefix
=
0
b1110
,
PES_ECM_stream
=
0
b11110000
,
// 0xf0
PES_EMM_stream
=
0
b11110001
,
// 0xf1
PES_DSMCC_stream
=
0
b11110010
,
// 0xf2
PES_13522_stream
=
0
b11110011
,
// 0xf3
PES_H_222_1_type_A
=
0
b11110100
,
// 0xf4
PES_H_222_1_type_B
=
0
b11110101
,
// 0xf5
PES_H_222_1_type_C
=
0
b11110110
,
// 0xf6
PES_H_222_1_type_D
=
0
b11110111
,
// 0xf7
PES_H_222_1_type_E
=
0
b11111000
,
// 0xf8
PES_ancillary_stream
=
0
b11111001
,
// 0xf9
PES_SL_packetized_stream
=
0
b11111010
,
// 0xfa
PES_FlexMux_stream
=
0
b11111011
,
// 0xfb
PES_video_prefix
=
0x0e
,
// 0b1110
PES_ECM_stream
=
0xf0
,
// 0b11110000
PES_EMM_stream
=
0xf1
,
// 0b11110001
PES_DSMCC_stream
=
0xf2
,
// 0b11110010
PES_13522_stream
=
0xf3
,
// 0b11110011
PES_H_222_1_type_A
=
0xf4
,
// 0b11110100
PES_H_222_1_type_B
=
0xf5
,
// 0b11110101
PES_H_222_1_type_C
=
0xf6
,
// 0b11110110
PES_H_222_1_type_D
=
0xf7
,
// 0b11110111
PES_H_222_1_type_E
=
0xf8
,
// 0b11111000
PES_ancillary_stream
=
0xf9
,
// 0b11111001
PES_SL_packetized_stream
=
0xfa
,
// 0b11111010
PES_FlexMux_stream
=
0xfb
,
// 0b11111011
// reserved data stream
// 1111 1100 … 1111 1110
PES_program_stream_directory
=
0
b11111111
,
// 0xff
PES_program_stream_directory
=
0
xff
,
// 0b11111111
};
...
...
trunk/src/srs/srs.upp
查看文件 @
4d631d7
...
...
@@ -58,7 +58,7 @@ file
..\core\srs_core_source.hpp,
..\core\srs_core_source.cpp,
research readonly separator,
..\..\research\ts_info.cc;
..\..\research\
hls\
ts_info.cc;
mainconfig
"" = "MAIN";
...
...
请
注册
或
登录
后发表评论