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

Fix GIFs freezing playback.

This commit is contained in:
John Preston 2019-12-21 16:57:06 +03:00
parent a4ea4689a2
commit 621a5cc4ab
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/SourceFiles/media/streaming/media_streaming_file.cpp
View File

@ -317,7 +317,7 @@ void File::Context::readNextPacket() {
} }
void File::Context::handleEndOfFile() { void File::Context::handleEndOfFile() {
const auto more = _delegate->fileProcessEndOfFile(); _delegate->fileProcessEndOfFile();
if (_delegate->fileReadMore()) { if (_delegate->fileReadMore()) {
_readTillEnd = false; _readTillEnd = false;
auto error = FFmpeg::AvErrorWrap(av_seek_frame( auto error = FFmpeg::AvErrorWrap(av_seek_frame(

4
Telegram/SourceFiles/media/streaming/media_streaming_file_delegate.h
View File

@ -27,12 +27,12 @@ public:
virtual void fileWaitingForData() = 0; virtual void fileWaitingForData() = 0;
virtual void fileFullInCache(bool fullInCache) = 0; virtual void fileFullInCache(bool fullInCache) = 0;
virtual void fileProcessEndOfFile() = 0;
// Return true if reading and processing more packets is desired. // Return true if reading and processing more packets is desired.
// Return false if sleeping until 'wake()' is called is desired. // Return false if sleeping until 'wake()' is called is desired.
[[nodiscard]] virtual bool fileProcessPackets( [[nodiscard]] virtual bool fileProcessPackets(
base::flat_map<int, std::vector<FFmpeg::Packet>> &packets) = 0; base::flat_map<int, std::vector<FFmpeg::Packet>> &packets) = 0;
// Return true if looping is desired. // Also returns true after fileProcessEndOfFile() if looping is desired.
[[nodiscard]] virtual bool fileProcessEndOfFile() = 0;
[[nodiscard]] virtual bool fileReadMore() = 0; [[nodiscard]] virtual bool fileReadMore() = 0;
}; };

3
Telegram/SourceFiles/media/streaming/media_streaming_player.cpp
View File

@ -397,7 +397,7 @@ bool Player::fileProcessPackets(
return fileReadMore(); return fileReadMore();
} }
bool Player::fileProcessEndOfFile() { void Player::fileProcessEndOfFile() {
_waitingForData = false; _waitingForData = false;
_readTillEnd = true; _readTillEnd = true;
setDurationByPackets(); setDurationByPackets();
@ -420,7 +420,6 @@ bool Player::fileProcessEndOfFile() {
}); });
_video->process(generateEmptyQueue()); _video->process(generateEmptyQueue());
} }
return fileReadMore();
} }
bool Player::fileReadMore() { bool Player::fileReadMore() {

2
Telegram/SourceFiles/media/streaming/media_streaming_player.h
View File

@ -99,7 +99,7 @@ private:
void fileFullInCache(bool fullInCache) override; void fileFullInCache(bool fullInCache) override;
bool fileProcessPackets( bool fileProcessPackets(
base::flat_map<int, std::vector<FFmpeg::Packet>> &packets) override; base::flat_map<int, std::vector<FFmpeg::Packet>> &packets) override;
bool fileProcessEndOfFile() override; void fileProcessEndOfFile() override;
bool fileReadMore() override; bool fileReadMore() override;
// Called from the main thread. // Called from the main thread.

2
Telegram/SourceFiles/media/streaming/media_streaming_video_track.cpp
View File

@ -564,7 +564,6 @@ void VideoTrackObject::callReady() {
? _stream.duration ? _stream.duration
: _syncTimePoint.trackTime; : _syncTimePoint.trackTime;
base::take(_ready)({ data }); base::take(_ready)({ data });
LOG(("READY CALLED!"));
} }
TimePoint VideoTrackObject::trackTime() const { TimePoint VideoTrackObject::trackTime() const {
@ -906,7 +905,6 @@ crl::time VideoTrack::streamDuration() const {
} }
void VideoTrack::process(std::vector<FFmpeg::Packet> &&packets) { void VideoTrack::process(std::vector<FFmpeg::Packet> &&packets) {
LOG(("PACKETS! (%1)").arg(packets.size()));
_wrapped.with([ _wrapped.with([
packets = std::move(packets) packets = std::move(packets)
](Implementation &unwrapped) mutable { ](Implementation &unwrapped) mutable {