amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-22 19:00:01 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

FFmpeg拉流添加防呆设计

Browse Source
This commit is contained in:
xiongziliang 2020-08-15 09:49:56 +08:00
parent 62da32477e
commit 678e011afb
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/FFmpegSource.cpp
View File

@ -14,6 +14,7 @@
#include "Util/File.h" #include "Util/File.h"
#include "System.h" #include "System.h"
#include "Thread/WorkThreadPool.h" #include "Thread/WorkThreadPool.h"
#include "Network/sockutil.h"
namespace FFmpeg { namespace FFmpeg {
#define FFmpeg_FIELD "ffmpeg." #define FFmpeg_FIELD "ffmpeg."
@ -45,6 +46,18 @@ FFmpegSource::~FFmpegSource() {
DebugL; DebugL;
} }
static bool is_local_ip(const string &ip){
if (ip == "127.0.0.1" || ip == "localhost") {
return true;
}
auto ips = SockUtil::getInterfaceList();
for (auto &obj : ips) {
if (ip == obj["ip"]) {
return true;
}
}
return false;
}
void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_ms,const onPlay &cb) { void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_ms,const onPlay &cb) {
GET_CONFIG(string,ffmpeg_bin,FFmpeg::kBin); GET_CONFIG(string,ffmpeg_bin,FFmpeg::kBin);
@ -60,7 +73,7 @@ void FFmpegSource::play(const string &src_url,const string &dst_url,int timeout_
_process.run(cmd,ffmpeg_log.empty() ? "" : File::absolutePath("",ffmpeg_log)); _process.run(cmd,ffmpeg_log.empty() ? "" : File::absolutePath("",ffmpeg_log));
InfoL << cmd; InfoL << cmd;
if(_media_info._host == "127.0.0.1"){ if (is_local_ip(_media_info._host)) {
//推流给自己的，通过判断流是否注册上来判断是否正常 //推流给自己的，通过判断流是否注册上来判断是否正常
if(_media_info._schema != RTSP_SCHEMA && _media_info._schema != RTMP_SCHEMA){ if(_media_info._schema != RTSP_SCHEMA && _media_info._schema != RTMP_SCHEMA){
cb(SockException(Err_other,"本服务只支持rtmp/rtsp推流")); cb(SockException(Err_other,"本服务只支持rtmp/rtsp推流"));
@ -179,7 +192,7 @@ void FFmpegSource::startTimer(int timeout_ms) {
//自身已经销毁 //自身已经销毁
return false; return false;
} }
if (strongSelf->_media_info._host == "127.0.0.1") { if (is_local_ip(strongSelf->_media_info._host)) {
//推流给自己的，我们通过检查是否已经注册来判断FFmpeg是否工作正常 //推流给自己的，我们通过检查是否已经注册来判断FFmpeg是否工作正常
strongSelf->findAsync(0, [&](const MediaSource::Ptr &src) { strongSelf->findAsync(0, [&](const MediaSource::Ptr &src) {
//同步查找流 //同步查找流