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-07-06 14:28:05 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
dc7b952043f06e007f019d64544f4bbed63a8bf2
dc7b9520
1 parent
f895523a
change HLS audio delay to 100ms. 0.9.153
显示空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
3 行增加
和
3 行删除
trunk/src/app/srs_app_hls.cpp
trunk/src/core/srs_core.hpp
trunk/src/app/srs_app_hls.cpp
查看文件 @
dc7b952
...
...
@@ -74,7 +74,7 @@ using namespace std;
// in ms, for HLS aac sync time.
#define SRS_CONF_DEFAULT_AAC_SYNC 100
// in ms, for HLS aac flush the audio
#define SRS_CONF_DEFAULT_AAC_DELAY
3
00
#define SRS_CONF_DEFAULT_AAC_DELAY
1
00
// @see: ngx_rtmp_mpegts_header
u_int8_t
mpegts_header
[]
=
{
...
...
@@ -1266,13 +1266,13 @@ int SrsHlsCache::cache_video(SrsAvcAacCodec* codec, SrsCodecSample* sample)
if
(
nal_unit_type
==
1
||
nal_unit_type
==
5
||
nal_unit_type
==
6
)
{
// for type 6, append a aud with type 9.
vb
->
append
(
aud_nal
,
sizeof
(
aud_nal
));
aud_sent
=
true
;
}
}
// 5: Coded slice of an IDR picture.
// insert sps/pps before IDR or key frame is ok.
if
(
nal_unit_type
==
5
&&
!
sps_pps_sent
)
{
//if (vf->key && !sps_pps_sent) {
sps_pps_sent
=
true
;
// @see: ngx_rtmp_hls_append_sps_pps
...
...
trunk/src/core/srs_core.hpp
查看文件 @
dc7b952
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "15
2
"
#define VERSION_REVISION "15
3
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
请
注册
或
登录
后发表评论