mirror of
https://github.com/ZLMediaKit/ZLMediaKit.git
synced 2026-06-15 04:25:58 +08:00
Fix SrtCaller Crash problem (#4171)
1.Fix the crash problem when SrtPlayer reveives an Ack packet 2.Remove SrtCaller's Check on streamid format to make it compatible with other SRT streaming service。 3.Modify the coding format： replace tab to space
This commit is contained in:
baigao-X
@@ -1,116 +1,116 @@
|
||||
/*
|
||||
* Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
|
||||
*
|
||||
* This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
|
||||
*
|
||||
* Use of this source code is governed by MIT-like license that can be found in the
|
||||
* LICENSE file in the root of the source tree. All contributing project authors
|
||||
* may be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "SrtPusher.h"
|
||||
#include "Common/config.h"
|
||||
|
||||
using namespace toolkit;
|
||||
using namespace std;
|
||||
namespace mediakit {
|
||||
|
||||
SrtPusher::SrtPusher(const EventPoller::Ptr &poller, const TSMediaSource::Ptr &src) : SrtCaller(poller) {
|
||||
_push_src = src;
|
||||
DebugL;
|
||||
}
|
||||
|
||||
SrtPusher::~SrtPusher(void) {
|
||||
DebugL;
|
||||
}
|
||||
|
||||
void SrtPusher::publish(const string &strUrl) {
|
||||
DebugL;
|
||||
try {
|
||||
_url.parse(strUrl);
|
||||
} catch (std::exception &ex) {
|
||||
onResult(SockException(Err_other, StrPrinter << "illegal srt url:" << ex.what()));
|
||||
return;
|
||||
}
|
||||
onConnect();
|
||||
return;
|
||||
}
|
||||
|
||||
void SrtPusher::teardown() {
|
||||
SrtCaller::onResult(SockException(Err_other, StrPrinter << "teardown: " << _url._full_url));
|
||||
}
|
||||
|
||||
void SrtPusher::onHandShakeFinished() {
|
||||
SrtCaller::onHandShakeFinished();
|
||||
onResult(SockException(Err_success, "srt push success"));
|
||||
doPublish();
|
||||
}
|
||||
|
||||
void SrtPusher::onResult(const SockException &ex) {
|
||||
SrtCaller::onResult(ex);
|
||||
|
||||
if (!ex) {
|
||||
onPublishResult(ex);
|
||||
} else {
|
||||
WarnL << ex.getErrCode() << " " << ex.what();
|
||||
if (ex.getErrCode() == Err_shutdown) {
|
||||
// 主动shutdown的，不触发回调
|
||||
return;
|
||||
}
|
||||
if (!_is_handleshake_finished) {
|
||||
onPublishResult(ex);
|
||||
} else {
|
||||
onShutdown(ex);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
uint16_t SrtPusher::getLatency() {
|
||||
auto latency = (*this)[Client::kLatency].as<uint16_t>();
|
||||
return (uint16_t)latency ;
|
||||
}
|
||||
|
||||
float SrtPusher::getTimeOutSec() {
|
||||
auto timeoutMS = (*this)[Client::kTimeoutMS].as<uint64_t>();
|
||||
return (float)timeoutMS / (float)1000;
|
||||
}
|
||||
|
||||
std::string SrtPusher::getPassphrase() {
|
||||
auto passPhrase = (*this)[Client::kPassPhrase].as<string>();
|
||||
return passPhrase;
|
||||
}
|
||||
|
||||
void SrtPusher::doPublish() {
|
||||
auto src = _push_src.lock();
|
||||
if (!src) {
|
||||
onResult(SockException(Err_eof, "the media source was released"));
|
||||
return;
|
||||
}
|
||||
// 异步查找直播流
|
||||
std::weak_ptr<SrtPusher> weak_self = static_pointer_cast<SrtPusher>(shared_from_this());
|
||||
_ts_reader = src->getRing()->attach(getPoller());
|
||||
_ts_reader->setDetachCB([weak_self]() {
|
||||
auto strong_self = weak_self.lock();
|
||||
if (!strong_self) {
|
||||
// 本对象已经销毁
|
||||
return;
|
||||
}
|
||||
strong_self->onShutdown(SockException(Err_shutdown));
|
||||
});
|
||||
_ts_reader->setReadCB([weak_self](const TSMediaSource::RingDataType &ts_list) {
|
||||
auto strong_self = weak_self.lock();
|
||||
if (!strong_self) {
|
||||
// 本对象已经销毁
|
||||
return;
|
||||
}
|
||||
size_t i = 0;
|
||||
auto size = ts_list->size();
|
||||
ts_list->for_each([&](const TSPacket::Ptr &ts) {
|
||||
strong_self->onSendTSData(ts, ++i == size);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
} /* namespace mediakit */
|
||||
|
||||
/*
|
||||
* Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
|
||||
*
|
||||
* This file is part of ZLMediaKit(https://github.com/ZLMediaKit/ZLMediaKit).
|
||||
*
|
||||
* Use of this source code is governed by MIT-like license that can be found in the
|
||||
* LICENSE file in the root of the source tree. All contributing project authors
|
||||
* may be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "SrtPusher.h"
|
||||
#include "Common/config.h"
|
||||
|
||||
using namespace toolkit;
|
||||
using namespace std;
|
||||
namespace mediakit {
|
||||
|
||||
SrtPusher::SrtPusher(const EventPoller::Ptr &poller, const TSMediaSource::Ptr &src) : SrtCaller(poller) {
|
||||
_push_src = src;
|
||||
DebugL;
|
||||
}
|
||||
|
||||
SrtPusher::~SrtPusher(void) {
|
||||
DebugL;
|
||||
}
|
||||
|
||||
void SrtPusher::publish(const string &strUrl) {
|
||||
DebugL;
|
||||
try {
|
||||
_url.parse(strUrl);
|
||||
} catch (std::exception &ex) {
|
||||
onResult(SockException(Err_other, StrPrinter << "illegal srt url:" << ex.what()));
|
||||
return;
|
||||
}
|
||||
onConnect();
|
||||
return;
|
||||
}
|
||||
|
||||
void SrtPusher::teardown() {
|
||||
SrtCaller::onResult(SockException(Err_other, StrPrinter << "teardown: " << _url._full_url));
|
||||
}
|
||||
|
||||
void SrtPusher::onHandShakeFinished() {
|
||||
SrtCaller::onHandShakeFinished();
|
||||
onResult(SockException(Err_success, "srt push success"));
|
||||
doPublish();
|
||||
}
|
||||
|
||||
void SrtPusher::onResult(const SockException &ex) {
|
||||
SrtCaller::onResult(ex);
|
||||
|
||||
if (!ex) {
|
||||
onPublishResult(ex);
|
||||
} else {
|
||||
WarnL << ex.getErrCode() << " " << ex.what();
|
||||
if (ex.getErrCode() == Err_shutdown) {
|
||||
// 主动shutdown的，不触发回调
|
||||
return;
|
||||
}
|
||||
if (!_is_handleshake_finished) {
|
||||
onPublishResult(ex);
|
||||
} else {
|
||||
onShutdown(ex);
|
||||
}
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
uint16_t SrtPusher::getLatency() {
|
||||
auto latency = (*this)[Client::kLatency].as<uint16_t>();
|
||||
return (uint16_t)latency ;
|
||||
}
|
||||
|
||||
float SrtPusher::getTimeOutSec() {
|
||||
auto timeoutMS = (*this)[Client::kTimeoutMS].as<uint64_t>();
|
||||
return (float)timeoutMS / (float)1000;
|
||||
}
|
||||
|
||||
std::string SrtPusher::getPassphrase() {
|
||||
auto passPhrase = (*this)[Client::kPassPhrase].as<string>();
|
||||
return passPhrase;
|
||||
}
|
||||
|
||||
void SrtPusher::doPublish() {
|
||||
auto src = _push_src.lock();
|
||||
if (!src) {
|
||||
onResult(SockException(Err_eof, "the media source was released"));
|
||||
return;
|
||||
}
|
||||
// 异步查找直播流
|
||||
std::weak_ptr<SrtPusher> weak_self = static_pointer_cast<SrtPusher>(shared_from_this());
|
||||
_ts_reader = src->getRing()->attach(getPoller());
|
||||
_ts_reader->setDetachCB([weak_self]() {
|
||||
auto strong_self = weak_self.lock();
|
||||
if (!strong_self) {
|
||||
// 本对象已经销毁
|
||||
return;
|
||||
}
|
||||
strong_self->onShutdown(SockException(Err_shutdown));
|
||||
});
|
||||
_ts_reader->setReadCB([weak_self](const TSMediaSource::RingDataType &ts_list) {
|
||||
auto strong_self = weak_self.lock();
|
||||
if (!strong_self) {
|
||||
// 本对象已经销毁
|
||||
return;
|
||||
}
|
||||
size_t i = 0;
|
||||
auto size = ts_list->size();
|
||||
ts_list->for_each([&](const TSPacket::Ptr &ts) {
|
||||
strong_self->onSendTSData(ts, ++i == size);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
} /* namespace mediakit */
|
||||
|
||||
|
||||
Reference in New Issue
Block a user