From a451da058c919f08500f09d975a0efe18c939408 Mon Sep 17 00:00:00 2001 From: xiongziliang <771730766@qq.com> Date: Thu, 22 Aug 2019 17:46:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3mp4=E5=BD=95=E5=88=B6?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=AE=8F=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/WebHook.cpp | 4 ++-- src/MediaFile/MediaRecorder.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/WebHook.cpp b/server/WebHook.cpp index 3250e155..72fb7b37 100644 --- a/server/WebHook.cpp +++ b/server/WebHook.cpp @@ -318,7 +318,7 @@ void installWebHook(){ do_http_hook(hook_stream_not_found,body, nullptr); }); -#ifdef ENABLE_MP4V2 +#ifdef ENABLE_MP4RECORD //录制mp4文件成功后广播 NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastRecordMP4,[](BroadcastRecordMP4Args){ if(!hook_enable || hook_record_mp4.empty()){ @@ -338,7 +338,7 @@ void installWebHook(){ //执行hook do_http_hook(hook_record_mp4,body, nullptr); }); -#endif //ENABLE_MP4V2 +#endif //ENABLE_MP4RECORD NoticeCenter::Instance().addListener(nullptr,Broadcast::kBroadcastShellLogin,[](BroadcastShellLoginArgs){ if(!hook_enable || hook_shell_login.empty() || sender.get_peer_ip() == "127.0.0.1"){ diff --git a/src/MediaFile/MediaRecorder.cpp b/src/MediaFile/MediaRecorder.cpp index ee205623..24309dfa 100644 --- a/src/MediaFile/MediaRecorder.cpp +++ b/src/MediaFile/MediaRecorder.cpp @@ -66,7 +66,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp, } #endif //defined(ENABLE_HLS) -#if defined(ENABLE_MP4V2) +#if defined(ENABLE_MP4RECORD) GET_CONFIG(string,recordPath,Record::kFilePath); GET_CONFIG(string,recordAppName,Record::kAppName); @@ -79,7 +79,7 @@ MediaRecorder::MediaRecorder(const string &strVhost_tmp, } _mp4Recorder.reset(new MP4Recorder(mp4FilePath,strVhost,strApp,strId)); } -#endif //defined(ENABLE_MP4V2) +#endif //defined(ENABLE_MP4RECORD) } MediaRecorder::~MediaRecorder() { @@ -92,11 +92,11 @@ void MediaRecorder::inputFrame(const Frame::Ptr &frame) { } #endif //defined(ENABLE_HLS) -#if defined(ENABLE_MP4V2) +#if defined(ENABLE_MP4RECORD) if (_mp4Recorder) { _mp4Recorder->inputFrame(frame); } -#endif //defined(ENABLE_MP4V2) +#endif //defined(ENABLE_MP4RECORD) } void MediaRecorder::addTrack(const Track::Ptr &track) {