mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2024-11-22 19:00:01 +08:00
Avoid blocking the poller thread
This commit is contained in:
parent
7c42ac4d79
commit
a106f8dfc0
@ -10,11 +10,8 @@
|
||||
|
||||
#include <map>
|
||||
#include <iostream>
|
||||
#include "Util/MD5.h"
|
||||
#include "Util/File.h"
|
||||
#include "Util/logger.h"
|
||||
#include "Util/SSLBox.h"
|
||||
#include "Util/util.h"
|
||||
#include "Util/logger.h"
|
||||
#include "Network/TcpServer.h"
|
||||
#include "Common/config.h"
|
||||
#include "Rtsp/RtspSession.h"
|
||||
@ -30,66 +27,73 @@ static semaphore sem;
|
||||
|
||||
#if defined(ENABLE_RTPPROXY)
|
||||
static bool loadFile(const char *path, const EventPoller::Ptr &poller) {
|
||||
FILE *fp = fopen(path, "rb");
|
||||
std::shared_ptr<FILE> fp(fopen(path, "rb"), [](FILE *fp) {
|
||||
sem.post();
|
||||
if (fp) {
|
||||
fclose(fp);
|
||||
}
|
||||
});
|
||||
if (!fp) {
|
||||
WarnL << "open file failed:" << path;
|
||||
return false;
|
||||
}
|
||||
|
||||
uint64_t timeStamp_last = 0;
|
||||
uint16_t len;
|
||||
char rtp[0xFFFF];
|
||||
struct sockaddr_storage addr;
|
||||
memset(&addr, 0, sizeof(addr));
|
||||
addr.ss_family = AF_INET;
|
||||
auto sock = Socket::createSocket(poller);
|
||||
size_t total_size = 0;
|
||||
RtpProcess::Ptr process;
|
||||
uint32_t ssrc = 0;
|
||||
auto process = RtpSelector::Instance().getProcess("test", true);
|
||||
|
||||
uint64_t stamp_last = 0;
|
||||
auto total_size = std::make_shared<size_t>(0);
|
||||
auto do_read = [fp, total_size, sock, addr, process, stamp_last]() mutable -> int {
|
||||
uint16_t len;
|
||||
char rtp[0xFFFF];
|
||||
while (true) {
|
||||
if (2 != fread(&len, 1, 2, fp)) {
|
||||
WarnL;
|
||||
break;
|
||||
if (2 != fread(&len, 1, 2, fp.get())) {
|
||||
WarnL << "Read rtp size failed";
|
||||
// 重新播放
|
||||
fseek(fp.get(), 0, SEEK_SET);
|
||||
return 1;
|
||||
}
|
||||
len = ntohs(len);
|
||||
if (len < 12 || len > sizeof(rtp)) {
|
||||
WarnL << len;
|
||||
break;
|
||||
WarnL << "Invalid rtp size: " << len;
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (len != fread(rtp, 1, len, fp)) {
|
||||
WarnL;
|
||||
break;
|
||||
if (len != fread(rtp, 1, len, fp.get())) {
|
||||
WarnL << "Read rtp data failed";
|
||||
return 0;
|
||||
}
|
||||
total_size += len;
|
||||
uint64_t timeStamp = 0;
|
||||
|
||||
if (!process) {
|
||||
if (!RtpSelector::getSSRC(rtp, len, ssrc)) {
|
||||
WarnL << "get ssrc from rtp failed:" << len;
|
||||
return false;
|
||||
}
|
||||
process = RtpSelector::Instance().getProcess(printSSRC(ssrc), true);
|
||||
}
|
||||
if (process) {
|
||||
(*total_size) += len;
|
||||
uint64_t stamp = 0;
|
||||
try {
|
||||
process->inputRtp(true, sock, rtp, len, (struct sockaddr *)&addr, &timeStamp);
|
||||
} catch (...) {
|
||||
RtpSelector::Instance().delProcess(printSSRC(ssrc), process.get());
|
||||
throw;
|
||||
}
|
||||
process->inputRtp(true, sock, rtp, len, (struct sockaddr *)&addr, &stamp);
|
||||
} catch (std::exception &ex) {
|
||||
WarnL << "Input rtp failed: " << ex.what();
|
||||
return 0;
|
||||
}
|
||||
|
||||
auto diff = timeStamp - timeStamp_last;
|
||||
if (diff > 0 && diff < 500) {
|
||||
usleep(diff * 1000);
|
||||
} else {
|
||||
usleep(1 * 1000);
|
||||
auto diff = stamp - stamp_last;
|
||||
if (diff < 0 || diff > 500) {
|
||||
diff = 1;
|
||||
}
|
||||
timeStamp_last = timeStamp;
|
||||
if (diff) {
|
||||
stamp_last = stamp;
|
||||
return diff;
|
||||
}
|
||||
WarnL << total_size / 1024 << "KB";
|
||||
fclose(fp);
|
||||
}
|
||||
};
|
||||
poller->doDelayTask(1, [do_read, total_size, process]() mutable {
|
||||
auto ret = do_read();
|
||||
if (!ret) {
|
||||
WarnL << *total_size / 1024 << "KB";
|
||||
RtpSelector::Instance().delProcess("test", process.get());
|
||||
}
|
||||
return ret;
|
||||
});
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif // #if defined(ENABLE_RTPPROXY)
|
||||
@ -111,20 +115,13 @@ int main(int argc,char *argv[]) {
|
||||
// mINI::Instance()[RtpProxy::kDumpDir] = "/Users/xzl/Desktop/";
|
||||
|
||||
if (argc == 2) {
|
||||
auto poller = EventPollerPool::Instance().getPoller();
|
||||
poller->async_first([poller,argv](){
|
||||
loadFile(argv[1],poller);
|
||||
sem.post();
|
||||
});
|
||||
loadFile(argv[1], EventPollerPool::Instance().getPoller());
|
||||
sem.wait();
|
||||
sleep(1);
|
||||
}
|
||||
else
|
||||
} else {
|
||||
ErrorL << "parameter error.";
|
||||
}
|
||||
#else
|
||||
ErrorL << "please ENABLE_RTPPROXY and then test";
|
||||
#endif // #if defined(ENABLE_RTPPROXY)
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user