Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-16 04:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复一些mp4点播不支持的问题

Browse Source
This commit is contained in:
xiongziliang
2020-04-13 09:44:05 +08:00
parent 048b30c41c
commit d363871601
4 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Record/MP4Reader.cpp
View File

@@ -48,11 +48,10 @@ MP4Reader::MP4Reader(const string &strVhost,const string &strApp, const string &
bool MP4Reader::readSample() {
bool keyFrame = false;
bool eof = false;
while (true) {
auto frame = _demuxer->readFrame(keyFrame);
while (!eof) {
auto frame = _demuxer->readFrame(keyFrame, eof);
if (!frame) {
eof = true;
break;
continue;
}
_mediaMuxer->inputFrame(frame);
if (frame->dts() > getCurrentStamp()) {
@@ -122,11 +121,12 @@ bool MP4Reader::seekTo(uint32_t ui32Stamp){
}
//搜索到下一帧关键帧
bool keyFrame = false;
while (true) {
auto frame = _demuxer->readFrame(keyFrame);
bool eof = false;
while (!eof) {
auto frame = _demuxer->readFrame(keyFrame, eof);
if(!frame){
//文件读完了都未找到下一帧关键帧
return false;
continue;
}
if(keyFrame || frame->keyFrame() || frame->configFrame()){
//定位到key帧
@@ -136,6 +136,7 @@ bool MP4Reader::seekTo(uint32_t ui32Stamp){
return true;
}
}
return false;
}
bool MP4Reader::close(MediaSource &sender,bool force){