Commit 90c6dd4b by xiongziliang

修复关闭hls后无法编译通过的问题

parent 4470f2e4
project(ZLMediaKit) project(ZLMediaKit)
cmake_minimum_required(VERSION 3.1.3) cmake_minimum_required(VERSION 3.1.3)
#使能c++11 #使能c++11
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
...@@ -149,7 +149,7 @@ if(ENABLE_MP4RECORD) ...@@ -149,7 +149,7 @@ if(ENABLE_MP4RECORD)
endif() endif()
#添加rtp库用于rtp转ps/ts #添加rtp库用于rtp转ps/ts
if(ENABLE_RTPPROXY) if(ENABLE_RTPPROXY AND ENABLE_HLS)
message(STATUS "ENABLE_RTPPROXY defined") message(STATUS "ENABLE_RTPPROXY defined")
aux_source_directory(${MediaServer_Root}/librtp/include src_rtp) aux_source_directory(${MediaServer_Root}/librtp/include src_rtp)
aux_source_directory(${MediaServer_Root}/librtp/source src_rtp) aux_source_directory(${MediaServer_Root}/librtp/source src_rtp)
......
...@@ -29,10 +29,13 @@ ...@@ -29,10 +29,13 @@
#include "HlsMakerImp.h" #include "HlsMakerImp.h"
#include "TsMuxer.h" #include "TsMuxer.h"
namespace mediakit { namespace mediakit {
class HlsRecorder : public TsMuxer { class HlsRecorder
#if defined(ENABLE_HLS)
: public TsMuxer
#endif
{
public: public:
typedef std::shared_ptr<HlsRecorder> Ptr; typedef std::shared_ptr<HlsRecorder> Ptr;
HlsRecorder(const string &m3u8_file, const string &params){ HlsRecorder(const string &m3u8_file, const string &params){
...@@ -51,14 +54,14 @@ public: ...@@ -51,14 +54,14 @@ public:
MediaSource::Ptr getMediaSource() const{ MediaSource::Ptr getMediaSource() const{
return _hls->getMediaSource(); return _hls->getMediaSource();
} }
#if defined(ENABLE_HLS)
protected: protected:
void onTs(const void *packet, int bytes,uint32_t timestamp,int flags) override { void onTs(const void *packet, int bytes,uint32_t timestamp,int flags) override {
_hls->inputData((char *)packet,bytes,timestamp); _hls->inputData((char *)packet,bytes,timestamp);
}; };
#endif
private: private:
HlsMakerImp *_hls; HlsMakerImp *_hls;
}; };
}//namespace mediakit }//namespace mediakit
#endif //HLSRECORDER_H #endif //HLSRECORDER_H
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论