From 931c249afe3262c151572e73ac9030e6576b5bb1 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Tue, 5 Jan 2016 15:42:36 +0800
Subject: [PATCH] fixed frame duration count, 0.9.18 version

---
 Telegram/SourceFiles/gui/animation.cpp | 37 ++++++++++++++++----------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/Telegram/SourceFiles/gui/animation.cpp b/Telegram/SourceFiles/gui/animation.cpp
index dcadbbbf43..f5d59a9381 100644
--- a/Telegram/SourceFiles/gui/animation.cpp
+++ b/Telegram/SourceFiles/gui/animation.cpp
@@ -594,6 +594,11 @@ public:
 	}
 
 	bool readNextFrame() {
+		if (_frameRead) {
+			av_frame_unref(_frame);
+			_frameRead = false;
+		}
+
 		int res;
 		while (true) {
 			if (_avpkt.size > 0) { // previous packet not finished
@@ -645,6 +650,20 @@ public:
 			}
 
 			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;
 				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);
 		return true;
 	}
@@ -799,6 +804,10 @@ public:
 	}
 
 	~FFMpegReaderImplementation() {
+		if (_frameRead) {
+			av_frame_unref(_frame);
+			_frameRead = false;
+		}
 		if (_ioContext) av_free(_ioContext);
 		if (_codecContext) avcodec_close(_codecContext);
 		if (_swsContext) sws_freeContext(_swsContext);