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
2015-03-25 20:38:51 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e818f36316392845565fb2e00c7dede8385655d5
e818f363
1 parent
b6feb074
fix #360, fix build bug for centos7.
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
5 行增加
和
4 行删除
trunk/src/app/srs_app_utility.cpp
trunk/src/kernel/srs_kernel_ts.cpp
trunk/src/kernel/srs_kernel_ts.hpp
trunk/src/app/srs_app_utility.cpp
查看文件 @
e818f36
...
...
@@ -31,6 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#ifdef SRS_OSX
#include <sys/sysctl.h>
#endif
#include <stdlib.h>
using
namespace
std
;
#include <srs_kernel_log.hpp>
...
...
trunk/src/kernel/srs_kernel_ts.cpp
查看文件 @
e818f36
...
...
@@ -507,7 +507,7 @@ int SrsTsPacket::decode(SrsStream* stream, SrsTsMessage** ppmsg)
int8_t
ccv
=
stream
->
read_1bytes
();
transport_scrambling_control
=
(
SrsTsScrambled
)((
ccv
>>
6
)
&
0x03
);
adaption_field_control
=
(
SrsTsAdaptationFieldType
)((
ccv
>>
4
)
&
0x03
);
continuity_counter
=
(
SrsTsPid
)(
ccv
&
0x0F
)
;
continuity_counter
=
ccv
&
0x0F
;
// TODO: FIXME: create pids map when got new pid.
...
...
@@ -2196,7 +2196,7 @@ int SrsTsPayloadPATProgram::encode(SrsStream* stream)
SrsTsPayloadPAT
::
SrsTsPayloadPAT
(
SrsTsPacket
*
p
)
:
SrsTsPayloadPSI
(
p
)
{
const
1
_value
=
3
;
const
3
_value
=
3
;
}
SrsTsPayloadPAT
::~
SrsTsPayloadPAT
()
...
...
@@ -2228,7 +2228,7 @@ int SrsTsPayloadPAT::psi_decode(SrsStream* stream)
// 1B
int8_t
cniv
=
stream
->
read_1bytes
();
const
1
_value
=
(
cniv
>>
6
)
&
0x03
;
const
3
_value
=
(
cniv
>>
6
)
&
0x03
;
version_number
=
(
cniv
>>
1
)
&
0x1F
;
current_next_indicator
=
cniv
&
0x01
;
...
...
trunk/src/kernel/srs_kernel_ts.hpp
查看文件 @
e818f36
...
...
@@ -1340,7 +1340,7 @@ public:
/**
* reverved value, must be '1'
*/
int8_t
const
1
_value
;
//2bits
int8_t
const
3
_value
;
//2bits
/**
* This 5-bit field is the version number of the whole Program Association Table. The version number
* shall be incremented by 1 modulo 32 whenever the definition of the Program Association Table changes. When the
...
...
请
注册
或
登录
后发表评论