THENG
/
ZLMediaKit
mirror of https://gitcode.com/gh_mirrors/zlme/ZLMediaKit.git
6
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ZLMediaKit:master' into master

This commit is contained in:
Lidaofu 2024-05-09 20:36:50 +08:00 committed by GitHub
parent 0308f101ca 2eed284e61
commit bccb3e26e6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
api/source/mk_h264_splitter.cpp
View File

@ -27,8 +27,9 @@ protected:
private: private:
bool _h265 = false; bool _h265 = false;
bool _have_decode_frame = false;
onH264 _cb; onH264 _cb;
size_t _search_pos = 0; toolkit::BufferLikeString _buffer;
}; };
void H264Splitter::setOnSplitted(H264Splitter::onH264 cb) { void H264Splitter::setOnSplitted(H264Splitter::onH264 cb) {
@ -42,11 +43,21 @@ H264Splitter::~H264Splitter() {
} }
ssize_t H264Splitter::onRecvHeader(const char *data, size_t len) { ssize_t H264Splitter::onRecvHeader(const char *data, size_t len) {
_cb(data, len); auto frame = Factory::getFrameFromPtr(_h265 ? CodecH265 : CodecH264, (char *)data, len, 0, 0);
if (_have_decode_frame && (frame->decodeAble() || frame->configFrame())) {
// 缓存中存在可解码帧，且下一帧是可解码帧或者配置帧，那么flush缓存
_cb(_buffer.data(), _buffer.size());
_buffer.assign(data, len);
_have_decode_frame = frame->decodeAble();
} else {
// 还需要缓存
_buffer.append(data, len);
_have_decode_frame = _have_decode_frame || frame->decodeAble();
}
return 0; return 0;
} }
static const char *onSearchPacketTail_l(const char *data, size_t len) { const char *H264Splitter::onSearchPacketTail(const char *data, size_t len) {
for (size_t i = 2; len > 2 && i < len - 2; ++i) { for (size_t i = 2; len > 2 && i < len - 2; ++i) {
//判断0x00 00 01 //判断0x00 00 01
if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) { if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
@ -60,28 +71,6 @@ static const char *onSearchPacketTail_l(const char *data, size_t len) {
return nullptr; return nullptr;
} }
const char *H264Splitter::onSearchPacketTail(const char *data, size_t len) {
auto last_frame = data + _search_pos;
auto next_frame = onSearchPacketTail_l(last_frame, len - _search_pos);
if (!next_frame) {
return nullptr;
}
auto last_frame_len = next_frame - last_frame;
Frame::Ptr frame;
if (_h265) {
frame = Factory::getFrameFromPtr(CodecH265, (char *)last_frame, last_frame_len, 0, 0);
} else {
frame = Factory::getFrameFromPtr(CodecH264, (char *)last_frame, last_frame_len, 0, 0);
}
if (frame->decodeAble()) {
_search_pos = 0;
return next_frame;
}
_search_pos += last_frame_len;
return nullptr;
}
//////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////
API_EXPORT mk_h264_splitter API_CALL mk_h264_splitter_create(on_mk_h264_splitter_frame cb, void *user_data, int is_h265) { API_EXPORT mk_h264_splitter API_CALL mk_h264_splitter_create(on_mk_h264_splitter_frame cb, void *user_data, int is_h265) {

2
server/WebApi.cpp
View File

@ -289,6 +289,8 @@ static inline void addHttpListener(){
it->second(parser, invoker, sender); it->second(parser, invoker, sender);
} catch (ApiRetException &ex) { } catch (ApiRetException &ex) {
responseApi(ex.code(), ex.what(), invoker); responseApi(ex.code(), ex.what(), invoker);
auto helper = static_cast<SocketHelper &>(sender).shared_from_this();
helper->getPoller()->async([helper, ex]() { helper->shutdown(SockException(Err_shutdown, ex.what())); }, false);
} }
#ifdef ENABLE_MYSQL #ifdef ENABLE_MYSQL
catch(SqlException &ex){ catch(SqlException &ex){