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
2013-11-25 10:59:21 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
164392f6aad05fa788743a6800b9d46fdc6e4509
164392f6
1 parent
d5b84b5e
fix bug of ts_info
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
4 行增加
和
3 行删除
trunk/research/ts_info.cc
trunk/src/core/srs_core_hls.cpp
trunk/research/ts_info.cc
查看文件 @
164392f
...
...
@@ -1269,7 +1269,7 @@ int64_t TSPayloadPES::decode_33bits_int(int64_t& temp)
// marker_bit 1bit
temp
=
temp
>>
1
;
// PTS [14..0] 15bits
ret
|=
temp
&
0x
3
fff
;
ret
|=
temp
&
0x
7
fff
;
// marker_bit 1bit
temp
=
temp
>>
1
;
// PTS [29..15] 15bits, 15zero, 29-15+1one
...
...
trunk/src/core/srs_core_hls.cpp
查看文件 @
164392f
...
...
@@ -277,7 +277,8 @@ u_int8_t mpegts_header[] = {
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
,
0xff
};
// @see: NGX_RTMP_HLS_DELAY, 700ms, ts_tbn=90000
// @see: NGX_RTMP_HLS_DELAY,
// 63000: 700ms, ts_tbn=90000
#define SRS_HLS_DELAY 63000
// @see: ngx_rtmp_mpegts.c
...
...
@@ -645,7 +646,7 @@ int SrsTSMuxer::write_video(u_int32_t time, SrsCodec* codec, SrsCodecSample* sam
return
ret
;
}
if
(
video_frame
.
key
&&
!
sps_pps_sent
)
{
if
(
false
&&
video_frame
.
key
&&
!
sps_pps_sent
)
{
// sample start prefix
video_buffer
->
append
(
aud_nal
,
4
);
// sps and pps
...
...
请
注册
或
登录
后发表评论