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-04-13 17:14:33 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
04a526b3403bcc15338b908cf7e9f09e7b87f166
04a526b3
1 parent
a0472f25
change SRS_TRANSCODE macro to SRS_RTMP_TRANSCODE
隐藏空白字符变更
内嵌
并排对比
正在显示
5 个修改的文件
包含
11 行增加
和
11 行删除
trunk/auto/depends.sh
trunk/src/app/srs_app_encoder.cpp
trunk/src/app/srs_app_encoder.hpp
trunk/src/app/srs_app_source.cpp
trunk/src/app/srs_app_source.hpp
trunk/auto/depends.sh
查看文件 @
04a526b
...
...
@@ -522,9 +522,9 @@ else
fi
if
[
$SRS_TRANSCODE
=
YES
]
;
then
echo
"#define SRS_TRANSCODE"
>>
$SRS_AUTO_HEADERS_H
echo
"#define SRS_
RTMP_
TRANSCODE"
>>
$SRS_AUTO_HEADERS_H
else
echo
"#undef SRS_TRANSCODE"
>>
$SRS_AUTO_HEADERS_H
echo
"#undef SRS_
RTMP_
TRANSCODE"
>>
$SRS_AUTO_HEADERS_H
fi
if
[
$SRS_INGEST
=
YES
]
;
then
...
...
trunk/src/app/srs_app_encoder.cpp
查看文件 @
04a526b
...
...
@@ -34,7 +34,7 @@ using namespace std;
#include <srs_protocol_rtmp_stack.hpp>
#include <srs_app_ffmpeg.hpp>
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
// when error, encoder sleep for a while and retry.
#define SRS_ENCODER_SLEEP_US (int64_t)(3*1000*1000LL)
...
...
trunk/src/app/srs_app_encoder.hpp
查看文件 @
04a526b
...
...
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
#include <string>
#include <vector>
...
...
trunk/src/app/srs_app_source.cpp
查看文件 @
04a526b
...
...
@@ -431,7 +431,7 @@ SrsSource::SrsSource(SrsRequest* _req)
#ifdef SRS_HLS
hls
=
new
SrsHls
(
this
);
#endif
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
encoder
=
new
SrsEncoder
();
#endif
...
...
@@ -477,7 +477,7 @@ SrsSource::~SrsSource()
#ifdef SRS_HLS
srs_freep
(
hls
);
#endif
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
srs_freep
(
encoder
);
#endif
...
...
@@ -605,7 +605,7 @@ int SrsSource::on_reload_vhost_transcode(string vhost)
return
ret
;
}
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
encoder
->
on_unpublish
();
if
((
ret
=
encoder
->
on_publish
(
req
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"start encoder failed. ret=%d"
,
ret
);
...
...
@@ -919,7 +919,7 @@ int SrsSource::on_publish(SrsRequest* _req)
return
ret
;
}
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
if
((
ret
=
encoder
->
on_publish
(
req
))
!=
ERROR_SUCCESS
)
{
srs_error
(
"start encoder failed. ret=%d"
,
ret
);
return
ret
;
...
...
@@ -941,7 +941,7 @@ void SrsSource::on_unpublish()
// destroy all forwarders
destroy_forwarders
();
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
encoder
->
on_unpublish
();
#endif
...
...
trunk/src/app/srs_app_source.hpp
查看文件 @
04a526b
...
...
@@ -46,7 +46,7 @@ class SrsRequest;
#ifdef SRS_HLS
class
SrsHls
;
#endif
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
class
SrsEncoder
;
#endif
...
...
@@ -224,7 +224,7 @@ private:
SrsHls
*
hls
;
#endif
// transcoding handler.
#ifdef SRS_TRANSCODE
#ifdef SRS_
RTMP_
TRANSCODE
SrsEncoder
*
encoder
;
#endif
// gop cache for client fast startup.
...
...
请
注册
或
登录
后发表评论