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-05 15:01:41 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
7916cab50ea732bf255704671be7ad32a169c9ba
7916cab5
1 parent
7de8bd75
donot check the aac encoder, ensure aac is ok
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
7 行增加
和
3 行删除
trunk/auto/options.sh
trunk/src/app/srs_app_encoder.cpp
trunk/auto/options.sh
查看文件 @
7916cab
...
...
@@ -233,11 +233,14 @@ if [ $help = yes ]; then
--with-ssl enable rtmp complex handshake, requires openssl-devel installed.
to delivery h264 video and aac audio to flash player.
--with-hls enable hls streaming, build nginx as http server for hls.
--with-hls enable hls streaming, mux RTMP to m3u8/ts files.
--with-nginx enable delivery HTTP stream with nginx.
build nginx at: ./objs/nginx/sbin/nginx
--with-http-callback enable http hooks, build cherrypy as demo api server.
--with-http-server enable http server to delivery http stream.
--with-http-api enable http api, to manage SRS by http api.
--with-ffmpeg enable transcoding with ffmpeg.
build ffmpeg at: ./objs/ffmpeg/bin/ffmpeg
--with-librtmp enable srs-librtmp, library for client.
--with-bwtc enable SRS bandwidth test client tool.
--with-research build the research tools.
...
...
@@ -251,6 +254,7 @@ if [ $help = yes ]; then
--without-ssl disable rtmp complex handshake.
--without-hls disable hls, rtmp streaming only.
--with-nginx disable delivery HTTP stream with nginx.
--without-http-callback disable http, http hooks callback.
--without-http-server disable http server, use external server to delivery http stream.
--without-http-api disable http api, only use console to manage SRS process.
...
...
trunk/src/app/srs_app_encoder.cpp
查看文件 @
7916cab
...
...
@@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_ENCODER_NO_VIDEO "vn"
#define SRS_ENCODER_NO_AUDIO "an"
#define SRS_ENCODER_VCODEC "libx264"
#define SRS_ENCODER_ACODEC "
libaacplus
"
#define SRS_ENCODER_ACODEC "
aac
"
// for encoder to detect the dead loop
static
std
::
vector
<
std
::
string
>
_transcoded_url
;
...
...
@@ -191,7 +191,7 @@ int SrsFFMPEG::initialize(SrsRequest* req, SrsConfDirective* engine)
}
if
(
acodec
!=
SRS_ENCODER_COPY
&&
acodec
!=
SRS_ENCODER_NO_AUDIO
)
{
if
(
acodec
!=
SRS_ENCODER_ACODEC
)
{
if
(
acodec
.
find
(
SRS_ENCODER_ACODEC
)
==
std
::
string
::
npos
)
{
ret
=
ERROR_ENCODER_ACODEC
;
srs_error
(
"invalid acodec, must be %s, actual %s, ret=%d"
,
SRS_ENCODER_ACODEC
,
acodec
.
c_str
(),
ret
);
...
...
请
注册
或
登录
后发表评论