Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-13 03:31:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善h264/h265分帧逻辑，更新h264文件直播测试程序

Browse Source
This commit is contained in:
ziyue
2023-02-11 11:43:41 +08:00
parent 0773e79fd1
commit 56586189cf
3 changed files with 156 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
api/source/mk_h264_splitter.cpp
View File

@@ -10,13 +10,15 @@
#include "mk_h264_splitter.h"
#include "Http/HttpRequestSplitter.h"
#include "Extension/H264.h"
#include "Extension/H265.h"
using namespace mediakit;
class H264Splitter : public HttpRequestSplitter {
public:
using onH264 = std::function<void(const char *data, size_t len)>;
H264Splitter() = default;
H264Splitter(bool h265 = false) { _h265 = h265; }
~H264Splitter() override;
void setOnSplitted(onH264 cb);
@@ -25,7 +27,9 @@ protected:
const char *onSearchPacketTail(const char *data, size_t len) override;
private:
bool _h265 = false;
onH264 _cb;
size_t _search_pos = 0;
};
void H264Splitter::setOnSplitted(H264Splitter::onH264 cb) {
@@ -43,7 +47,7 @@ ssize_t H264Splitter::onRecvHeader(const char *data, size_t len) {
return 0;
}
const char *H264Splitter::onSearchPacketTail(const char *data, size_t len) {
static const char *onSearchPacketTail_l(const char *data, size_t len) {
for (size_t i = 2; len > 2 && i < len - 2; ++i) {
//判断0x00 00 01
if (data[i] == 0 && data[i + 1] == 0 && data[i + 2] == 1) {
@@ -57,11 +61,33 @@ const char *H264Splitter::onSearchPacketTail(const char *data, size_t len) {
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 = std::make_shared<H265FrameNoCacheAble>((char *) last_frame, last_frame_len, 0, 0, prefixSize(last_frame, last_frame_len));
} else {
frame = std::make_shared<H264FrameNoCacheAble>((char *) last_frame, last_frame_len, 0, 0, prefixSize(last_frame, last_frame_len));
}
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) {
API_EXPORT mk_h264_splitter API_CALL mk_h264_splitter_create(on_mk_h264_splitter_frame cb, void *user_data, int is_h265) {
assert(cb);
auto ptr = new H264Splitter();
auto ptr = new H264Splitter(is_h265);
ptr->setOnSplitted([cb, ptr, user_data](const char *data, size_t len) {
cb(user_data, reinterpret_cast<mk_h264_splitter>(ptr), data, len);
});