Mirror/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2026-06-28 05:29:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善错误提示

Browse Source
This commit is contained in:
xiongziliang
2019-05-29 18:08:50 +08:00
parent f8f3c5dd19
commit a39c4c1344
22 changed files with 112 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/MediaFile/MediaReader.cpp
View File

@@ -167,15 +167,16 @@ void MediaReader::startReadMP4() {
readSample(sampleMS, false);
_mediaMuxer->setListener(strongSelf);
}
bool MediaReader::seekTo(uint32_t ui32Stamp){
bool MediaReader::seekTo(MediaSource &sender,uint32_t ui32Stamp){
seek(ui32Stamp);
return true;
}
bool MediaReader::close(bool force){
bool MediaReader::close(MediaSource &sender,bool force){
if(!force && _mediaMuxer->readerCount() != 0 ){
return false;
}
_timer.reset();
WarnL << sender.getSchema() << "/" << sender.getVhost() << "/" << sender.getApp() << "/" << sender.getId() << " " << force;
return true;
}

4
src/MediaFile/MediaReader.h
View File

@@ -62,13 +62,13 @@ public:
* @param ui32Stamp 偏移量，单位毫秒
* @return
*/
bool seekTo(uint32_t ui32Stamp) override;
bool seekTo(MediaSource &sender,uint32_t ui32Stamp) override;
/**
* 关闭MediaReader的流化进程，会触发该对象放弃自持有
* @return
*/
bool close(bool force) override;
bool close(MediaSource &sender,bool force) override;
/**
* 自动生成MediaReader对象然后查找相关的MediaSource对象