amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-23 03:10:04 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

修复h264 split后可能多个字节的bug

Browse Source
This commit is contained in:
xiongziliang 2020-04-28 22:24:31 +08:00
parent 7565a20695
commit 163b0875cf
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Extension/H264.cpp
View File

@ -50,6 +50,9 @@ void splitH264(const char *ptr, int len, const std::function<void(const char *,
while(true) { while(true) {
auto next_nal = memfind(nal + 3,end - nal - 3,"\x0\x0\x1",3); auto next_nal = memfind(nal + 3,end - nal - 3,"\x0\x0\x1",3);
if(next_nal){ if(next_nal){
if(*(next_nal - 1) == 0x00){
next_nal -= 1;
}
cb(nal,next_nal - nal); cb(nal,next_nal - nal);
nal = next_nal; nal = next_nal;
continue; continue;
@ -59,6 +62,18 @@ void splitH264(const char *ptr, int len, const std::function<void(const char *,
} }
} }
#if 0
//splitH264函数测试程序
static onceToken s_token([](){
char buf[] = "\x00\x00\x00\x01\x12\x23\x34\x45\x56"
"\x00\x00\x00\x01\x12\x23\x34\x45\x56"
"\x00\x00\x00\x01\x12\x23\x34\x45\x56"
"\x00\x00\x01\x12\x23\x34\x45\x56";
splitH264(buf, sizeof(buf) - 1, [](const char *ptr, int len){
cout << hexdump(ptr, len) << endl;
});
});
#endif //0
Sdp::Ptr H264Track::getSdp() { Sdp::Ptr H264Track::getSdp() {
if(!ready()){ if(!ready()){