amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

无metadata且不能获取Track的rtmp确保能注册

Browse Source
This commit is contained in:
xiongziliang 2020-05-28 18:01:03 +08:00
parent 41509800bc
commit 406c5477e0
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Rtmp/RtmpMediaSource.h
View File

@ -107,6 +107,14 @@ public:
} }
} }
/**
* 更新metadata
*/
void updateMetaData(const AMFValue &metadata) {
lock_guard<recursive_mutex> lock(_mtx);
_metadata = metadata;
}
/** /**
* 输入rtmp包 * 输入rtmp包
* @param pkt rtmp包 * @param pkt rtmp包

7
src/Rtmp/RtmpMediaSourceImp.h
View File

@ -53,9 +53,8 @@ public:
//该metadata无效，需要重新生成 //该metadata无效，需要重新生成
_metadata = metadata; _metadata = metadata;
_recreate_metadata = true; _recreate_metadata = true;
}else{
RtmpMediaSource::setMetaData(metadata);
} }
RtmpMediaSource::setMetaData(metadata);
} }
/** /**
@ -158,8 +157,8 @@ public:
_all_track_ready = true; _all_track_ready = true;
if(_recreate_metadata){ if(_recreate_metadata){
//需要重新生成metadata //更新metadata
RtmpMediaSource::setMetaData(_metadata); RtmpMediaSource::updateMetaData(_metadata);
} }
} }