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

rtmp解复用支持无内存拷贝

Browse Source 
hls生成支持输入无0x 00 00 01的H264/H265数据
This commit is contained in:
xiongziliang
2019-07-25 12:09:36 +08:00
parent d2a889b463
commit 6922d82c65
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MediaFile/TsMuxer.cpp
View File

@@ -70,7 +70,12 @@ void TsMuxer::inputFrame(const Frame::Ptr &frame) {
if(_frameCached.size() != 1){
string merged;
_frameCached.for_each([&](const Frame::Ptr &frame){
merged.append(frame->data(),frame->size());
if(frame->prefixSize()){
merged.append(frame->data(),frame->size());
} else{
merged.append("\x00\x00\x00\x01",4);
merged.append(frame->data(),frame->size());
}
});
merged_frame = std::make_shared<BufferString>(std::move(merged));
}