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

This commit is contained in:
xiongziliang 2020-01-24 20:54:39 +08:00
parent 4470f2e427
commit 90c6dd4bfa
2 changed files with 9 additions and 6 deletions

View File

@ -1,4 +1,4 @@
project(ZLMediaKit)
project(ZLMediaKit)
cmake_minimum_required(VERSION 3.1.3)
#使c++11
set(CMAKE_CXX_STANDARD 11)
@ -149,7 +149,7 @@ if(ENABLE_MP4RECORD)
endif()
#rtprtpps/ts
if(ENABLE_RTPPROXY)
if(ENABLE_RTPPROXY AND ENABLE_HLS)
message(STATUS "ENABLE_RTPPROXY defined")
aux_source_directory(${MediaServer_Root}/librtp/include src_rtp)
aux_source_directory(${MediaServer_Root}/librtp/source src_rtp)

View File

@ -29,10 +29,13 @@
#include "HlsMakerImp.h"
#include "TsMuxer.h"
namespace mediakit {
class HlsRecorder : public TsMuxer {
class HlsRecorder
#if defined(ENABLE_HLS)
: public TsMuxer
#endif
{
public:
typedef std::shared_ptr<HlsRecorder> Ptr;
HlsRecorder(const string &m3u8_file, const string &params){
@ -51,14 +54,14 @@ public:
MediaSource::Ptr getMediaSource() const{
return _hls->getMediaSource();
}
#if defined(ENABLE_HLS)
protected:
void onTs(const void *packet, int bytes,uint32_t timestamp,int flags) override {
_hls->inputData((char *)packet,bytes,timestamp);
};
#endif
private:
HlsMakerImp *_hls;
};
}//namespace mediakit
#endif //HLSRECORDER_H