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

修复时间戳跳跃可能导致的问题

Browse Source
This commit is contained in:
xiongziliang 2019-12-16 16:17:52 +08:00
parent 3f12c0ccde
commit 5322a5761b
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Common/Stamp.cpp
View File

@ -26,6 +26,8 @@
#include "Stamp.h" #include "Stamp.h"
#define MAX_DELTA_STAMP 300
namespace mediakit { namespace mediakit {
int64_t DeltaStamp::deltaStamp(int64_t stamp) { int64_t DeltaStamp::deltaStamp(int64_t stamp) {
@ -39,7 +41,8 @@ int64_t DeltaStamp::deltaStamp(int64_t stamp) {
if(ret >= 0){ if(ret >= 0){
//时间戳增量为正，返回之 //时间戳增量为正，返回之
_last_stamp = stamp; _last_stamp = stamp;
return ret; //在直播情况下，时间戳增量不得大于MAX_DELTA_STAMP
return ret < MAX_DELTA_STAMP ? ret : (_playback ? ret : 0);
} }
//时间戳增量为负，说明时间戳回环了或回退了 //时间戳增量为负，说明时间戳回环了或回退了
@ -72,8 +75,8 @@ void Stamp::revise(int64_t dts, int64_t pts, int64_t &dts_out, int64_t &pts_out,
dts_out = _relativeStamp; dts_out = _relativeStamp;
//////////////以下是播放时间戳的计算////////////////// //////////////以下是播放时间戳的计算//////////////////
if(pts_dts_diff > 200 || pts_dts_diff < -200){ if(pts_dts_diff > MAX_DELTA_STAMP || pts_dts_diff < -MAX_DELTA_STAMP){
//如果差值大于200毫秒，则认为由于回环导致时间戳错乱了 //如果差值太大，则认为由于回环导致时间戳错乱了
pts_dts_diff = 0; pts_dts_diff = 0;
} }