procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed frame duration count, 0.9.18 version

This commit is contained in:
John Preston 2016-01-05 15:42:36 +08:00
parent 47dee02de4
commit 931c249afe
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Telegram/SourceFiles/gui/animation.cpp
View File

@ -594,6 +594,11 @@ public:
} }
bool readNextFrame() { bool readNextFrame() {
if (_frameRead) {
av_frame_unref(_frame);
_frameRead = false;
}
int res; int res;
while (true) { while (true) {
if (_avpkt.size > 0) { // previous packet not finished if (_avpkt.size > 0) { // previous packet not finished
@ -645,6 +650,20 @@ public:
} }
if (got_frame) { if (got_frame) {
int64 duration = av_frame_get_pkt_duration(_frame);
int64 framePts = (_frame->pkt_pts == AV_NOPTS_VALUE) ? _frame->pkt_dts : _frame->pkt_pts;
int64 frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
_currentFrameDelay = _nextFrameDelay;
if (_frameMs + _currentFrameDelay < frameMs) {
_currentFrameDelay = int32(frameMs - _frameMs);
}
if (duration == AV_NOPTS_VALUE) {
_nextFrameDelay = 0;
} else {
_nextFrameDelay = (duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
}
_frameMs = frameMs;
_hadFrame = _frameRead = true; _hadFrame = _frameRead = true;
return true; return true;
} }
@ -707,20 +726,6 @@ public:
} }
} }
int64 duration = av_frame_get_pkt_duration(_frame);
int64 framePts = (_frame->pkt_pts == AV_NOPTS_VALUE) ? _frame->pkt_dts : _frame->pkt_pts;
int64 frameMs = (framePts * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
_currentFrameDelay = _nextFrameDelay;
if (_frameMs + _currentFrameDelay < frameMs) {
_currentFrameDelay = int32(frameMs - _frameMs);
}
if (duration == AV_NOPTS_VALUE) {
_nextFrameDelay = 0;
} else {
_nextFrameDelay = (duration * 1000LL * _fmtContext->streams[_streamId]->time_base.num) / _fmtContext->streams[_streamId]->time_base.den;
}
_frameMs = frameMs;
av_frame_unref(_frame); av_frame_unref(_frame);
return true; return true;
} }
@ -799,6 +804,10 @@ public:
} }
~FFMpegReaderImplementation() { ~FFMpegReaderImplementation() {
if (_frameRead) {
av_frame_unref(_frame);
_frameRead = false;
}
if (_ioContext) av_free(_ioContext); if (_ioContext) av_free(_ioContext);
if (_codecContext) avcodec_close(_codecContext); if (_codecContext) avcodec_close(_codecContext);
if (_swsContext) sws_freeContext(_swsContext); if (_swsContext) sws_freeContext(_swsContext);