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
2015-05-27 07:22:44 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
c1b9541b5c2bb14423ae29dc896645a658e05f30
c1b9541b
1 parent
9ab579c6
support disable all
显示空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
24 行增加
和
10 行删除
trunk/src/app/srs_app_hls.cpp
trunk/src/app/srs_app_hls.hpp
trunk/src/main/srs_main_ingest_hls.cpp
trunk/src/app/srs_app_hls.cpp
查看文件 @
c1b9541
...
...
@@ -23,11 +23,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <srs_app_hls.hpp>
/**
* the HLS section, only available when HLS enabled.
*/
#ifdef SRS_AUTO_HLS
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
...
...
@@ -72,6 +67,11 @@ ISrsHlsHandler::~ISrsHlsHandler()
{
}
/**
* * the HLS section, only available when HLS enabled.
* */
#ifdef SRS_AUTO_HLS
SrsHlsCacheWriter
::
SrsHlsCacheWriter
(
bool
write_cache
,
bool
write_file
)
{
should_write_cache
=
write_cache
;
...
...
trunk/src/app/srs_app_hls.hpp
查看文件 @
c1b9541
...
...
@@ -29,11 +29,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include <srs_core.hpp>
/**
* the HLS section, only available when HLS enabled.
*/
#ifdef SRS_AUTO_HLS
#include <string>
#include <vector>
...
...
@@ -87,6 +82,11 @@ public:
};
/**
* * the HLS section, only available when HLS enabled.
* */
#ifdef SRS_AUTO_HLS
/**
* write to file and cache.
*/
class
SrsHlsCacheWriter
:
public
SrsFileWriter
...
...
trunk/src/main/srs_main_ingest_hls.cpp
查看文件 @
c1b9541
...
...
@@ -61,6 +61,8 @@ ISrsThreadContext* _srs_context = new ISrsThreadContext();
SrsConfig
*
_srs_config
=
NULL
;
SrsServer
*
_srs_server
=
NULL
;
#if defined(SRS_AUTO_HTTP_PARSER)
/**
* main entrance.
*/
...
...
@@ -1402,3 +1404,15 @@ int proxy_hls2rtmp(string hls, string rtmp)
return
ret
;
}
#else
int
main
(
int
argc
,
char
**
argv
)
{
#ifndef SRS_AUTO_HTTP_PARSER
srs_error
(
"ingest requires http-api or http-server"
);
#endif
return
-
1
;
}
#endif
...
...
请
注册
或
登录
后发表评论