RepoMirrors/tdesktop
1
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2024-12-26 16:43:33 +00:00
Code Issues Projects Releases Wiki Activity

Pause loading if loaded for 1 minute.

Browse Source
This commit is contained in:
John Preston 2019-02-26 18:09:08 +04:00
parent 4636c74586
commit b6a757842a
2 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,7 +18,12 @@ namespace Streaming {
namespace {
constexpr auto kReceivedTillEnd = std::numeric_limits<crl::time>::max();
constexpr auto kBufferFor = crl::time(3000);
constexpr auto kBufferFor = 3 * crl::time(1000);
constexpr auto kLoadInAdvanceFor = 64 * crl::time(1000);
// If we played for 3 seconds and got stuck it looks like we're loading
// slower than we're playing, so load full file in that case.
constexpr auto kLoadFullIfStuckAfterPlayback = 3 * crl::time(1000);
[[nodiscard]] crl::time TrackClampReceivedTill(
crl::time position,
@ -127,6 +132,9 @@ void Player::trackReceivedTill(
} else {
state.receivedTill = position;
}
if (!_pauseReading && bothReceivedEnough(kLoadInAdvanceFor)) {
_pauseReading = true;
}
}
template <typename Track>
@ -141,6 +149,10 @@ void Player::trackPlayedTill(
state.position = position;
_updates.fire({ PlaybackUpdate<Track>{ position } });
}
if (_pauseReading && !bothReceivedEnough(kLoadInAdvanceFor)) {
_pauseReading = false;
_file->wake();
}
}
template <typename Track>
@ -284,7 +296,7 @@ bool Player::fileProcessPacket(Packet &&packet) {
bool Player::fileReadMore() {
// return true if looping.
return !_readTillEnd;
return !_readTillEnd && !_pauseReading;
}
void Player::streamReady(Information &&information) {
@ -380,6 +392,10 @@ void Player::updatePausedState() {
}
if (_paused) {
_pausedTime = crl::now();
//if (_pausedByWaitingForData
// && _pausedTime - _startedTime > kLoadFullIfStuckAfterPlayback) {
// _loadFull = true;
//}
if (_audio) {
_audio->pause(_pausedTime);
}
@ -397,15 +413,21 @@ void Player::updatePausedState() {
}
}
bool Player::trackReceivedEnough(const TrackState &state) const {
bool Player::trackReceivedEnough(
const TrackState &state,
crl::time amount) const {
return FullTrackReceived(state)
|| (state.position + kBufferFor <= state.receivedTill);
|| (state.position + amount <= state.receivedTill);
}
bool Player::bothReceivedEnough(crl::time amount) const {
auto &info = _information;
return (!_audio || trackReceivedEnough(info.audio.state, amount))
&& (!_video || trackReceivedEnough(info.video.state, amount));
}
void Player::checkResumeFromWaitingForData() {
if (_pausedByWaitingForData
&& (!_audio || trackReceivedEnough(_information.audio.state))
&& (!_video || trackReceivedEnough(_information.video.state))) {
if (_pausedByWaitingForData && bothReceivedEnough(kBufferFor)) {
_pausedByWaitingForData = false;
updatePausedState();
}
@ -478,6 +500,7 @@ void Player::stop() {
_renderFrameTimer.cancel();
_audioFinished = false;
_videoFinished = false;
_pauseReading = false;
_readTillEnd = false;
_information = Information();
}

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

@ -90,7 +90,10 @@ private:
void videoPlayedTill(crl::time position);
void updatePausedState();
[[nodiscard]] bool trackReceivedEnough(const TrackState &state) const;
[[nodiscard]] bool trackReceivedEnough(
const TrackState &state,
crl::time amount) const;
[[nodiscard]] bool bothReceivedEnough(crl::time amount) const;
void checkResumeFromWaitingForData();
template <typename Track>
@ -125,6 +128,8 @@ private:
bool _readTillEnd = false;
bool _waitingForData = false;
std::atomic<bool> _pauseReading = false;
// Belongs to the main thread.
Information _information;
Stage _stage = Stage::Uninitialized;