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-12-01 21:34:35 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d171a2675832479cbd94a14e60cb58e5e7810cf0
d171a267
1 parent
c5dd3346
disable gop cache when not h.264. fix some warning.
隐藏空白字符变更
内嵌
并排对比
正在显示
7 个修改的文件
包含
14 行增加
和
7 行删除
trunk/research/librtmp/srs_aac_raw_publish.c
trunk/research/librtmp/srs_audio_raw_publish.c
trunk/research/librtmp/srs_bandwidth_check.c
trunk/research/librtmp/srs_detect_rtmp.c
trunk/research/librtmp/srs_h264_raw_publish.c
trunk/src/app/srs_app_source.cpp
trunk/src/qt/srs/srs-qt.pro.user
trunk/research/librtmp/srs_aac_raw_publish.c
查看文件 @
d171a26
...
...
@@ -95,7 +95,7 @@ int main(int argc, char** argv)
// open file
int
raw_fd
=
open
(
raw_file
,
O_RDONLY
);
if
(
raw_fd
<
0
)
{
srs_human_trace
(
"open audio raw file %s failed."
,
raw_f
d
);
srs_human_trace
(
"open audio raw file %s failed."
,
raw_f
ile
);
goto
rtmp_destroy
;
}
...
...
trunk/research/librtmp/srs_audio_raw_publish.c
查看文件 @
d171a26
...
...
@@ -47,7 +47,7 @@ int read_audio_frame(char* audio_raw, int file_size, char** pp, char** pdata, in
if
(
file_size
-
(
p
-
audio_raw
)
<
168
)
{
srs_human_trace
(
"audio must be 160+8 bytes. left %d bytes."
,
file_size
-
(
p
-
audio_raw
));
(
int
)(
file_size
-
(
p
-
audio_raw
)
));
return
-
1
;
}
...
...
@@ -88,7 +88,7 @@ int main(int argc, char** argv)
// open file
int
raw_fd
=
open
(
raw_file
,
O_RDONLY
);
if
(
raw_fd
<
0
)
{
srs_human_trace
(
"open audio raw file %s failed."
,
raw_f
d
);
srs_human_trace
(
"open audio raw file %s failed."
,
raw_f
ile
);
goto
rtmp_destroy
;
}
...
...
trunk/research/librtmp/srs_bandwidth_check.c
查看文件 @
d171a26
...
...
@@ -132,6 +132,7 @@ rtmp_destroy:
"
\"
srs_id
\"
:%d, "
"
\"
duration
\"
:%d, "
"
\"
play_duration
\"
:%d, "
"
\"
publish_duration
\"
:%d,"
"
\"
play_kbps
\"
:%d, "
"
\"
publish_kbps
\"
:%d"
"}"
,
...
...
@@ -141,7 +142,7 @@ rtmp_destroy:
(
int
)(
end_time
-
start_time
),
play_duration
,
publish_duration
,
play_kbps
,
publish_kbps
);
srs_human_trace
(
""
);
srs_human_trace
(
"
"
);
srs_human_trace
(
"completed"
);
return
ret
;
...
...
trunk/research/librtmp/srs_detect_rtmp.c
查看文件 @
d171a26
...
...
@@ -197,7 +197,7 @@ rtmp_destroy:
"
\"
remark2
\"
:
\"
if code is not 0, user must ignore all data
\"
"
);
srs_human_trace
(
""
);
srs_human_trace
(
"
"
);
srs_human_trace
(
"completed"
);
return
ret
;
...
...
trunk/research/librtmp/srs_h264_raw_publish.c
查看文件 @
d171a26
...
...
@@ -100,7 +100,7 @@ int main(int argc, char** argv)
// open file
int
raw_fd
=
open
(
raw_file
,
O_RDONLY
);
if
(
raw_fd
<
0
)
{
srs_human_trace
(
"open h264 raw file %s failed."
,
raw_f
d
);
srs_human_trace
(
"open h264 raw file %s failed."
,
raw_f
ile
);
goto
rtmp_destroy
;
}
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
d171a26
...
...
@@ -392,6 +392,12 @@ int SrsGopCache::cache(SrsSharedPtrMessage* msg)
srs_verbose
(
"gop cache is disabled."
);
return
ret
;
}
// disable gop cache when not h.264
if
(
!
SrsFlvCodec
::
video_is_h264
(
msg
->
payload
,
msg
->
size
))
{
srs_info
(
"gop donot cache video for none h.264"
);
return
ret
;
}
// got video, update the video count if acceptable
if
(
msg
->
header
.
is_video
())
{
...
...
trunk/src/qt/srs/srs-qt.pro.user
查看文件 @
d171a26
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-1
1-30T15:48:2
0. -->
<!-- Written by QtCreator 3.1.1, 2014-1
2-01T21:33:0
0. -->
<qtcreator>
<data>
<variable>
ProjectExplorer.Project.ActiveTarget
</variable>
...
...
请
注册
或
登录
后发表评论