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

Fix playback state display in round videos.

This commit is contained in:
John Preston 2019-12-16 16:58:19 +03:00
parent ceecbaa904
commit 0e75ad42e2
2 changed files with 17 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
Telegram/SourceFiles/history/view/media/history_view_gif.cpp
View File

@ -151,32 +151,6 @@ QSize Gif::countCurrentSize(int newWidth) {
auto newHeight = qMax(th, st::minPhotoSize); auto newHeight = qMax(th, st::minPhotoSize);
accumulate_max(newWidth, _parent->infoWidth() + 2 * st::msgDateImgDelta + st::msgDateImgPadding.x()); accumulate_max(newWidth, _parent->infoWidth() + 2 * st::msgDateImgDelta + st::msgDateImgPadding.x());
if (!activeCurrentStreamed()) { if (!activeCurrentStreamed()) {
//const auto own = (reader->mode() == ::Media::Clip::Reader::Mode::Gif);
//if (own && !reader->started()) {
// auto isRound = _data->isVideoMessage();
// auto inWebPage = (_parent->media() != this);
// auto roundRadius = isRound
// ? ImageRoundRadius::Ellipse
// : inWebPage
// ? ImageRoundRadius::Small
// : ImageRoundRadius::Large;
// auto roundCorners = (isRound || inWebPage)
// ? RectPart::AllCorners
// : ((isBubbleTop()
// ? (RectPart::TopLeft | RectPart::TopRight)
// : RectPart::None)
// | ((isBubbleBottom() && _caption.isEmpty())
// ? (RectPart::BottomLeft | RectPart::BottomRight)
// : RectPart::None));
// reader->start(
// _thumbw,
// _thumbh,
// newWidth,
// newHeight,
// roundRadius,
// roundCorners);
//}
// #TODO video
accumulate_max(newWidth, gifMaxStatusWidth(_data) + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x())); accumulate_max(newWidth, gifMaxStatusWidth(_data) + 2 * (st::msgDateImgDelta + st::msgDateImgPadding.x()));
} }
if (_parent->hasBubble()) { if (_parent->hasBubble()) {
@ -307,8 +281,6 @@ void Gif::draw(Painter &p, const QRect &r, TextSelection selection, crl::time ms
displayMute = true; displayMute = true;
} }
} }
// #TODO video
// paused?..
auto request = ::Media::Streaming::FrameRequest(); auto request = ::Media::Streaming::FrameRequest();
request.outer = QSize(usew, painth) * cIntRetinaFactor(); request.outer = QSize(usew, painth) * cIntRetinaFactor();
request.resize = QSize(_thumbw, _thumbh) * cIntRetinaFactor(); request.resize = QSize(_thumbw, _thumbh) * cIntRetinaFactor();
@ -778,23 +750,23 @@ void Gif::updateStatusText() const {
statusSize = _data->loadOffset(); statusSize = _data->loadOffset();
} else if (_data->loaded()) { } else if (_data->loaded()) {
statusSize = FileStatusSizeLoaded; statusSize = FileStatusSizeLoaded;
if (const auto streamed = activeRoundStreamed()) {
const auto state = streamed->player().prepareLegacyState();
if (state.length) {
auto position = int64(0);
if (::Media::Player::IsStoppedAtEnd(state.state)) {
position = state.length;
} else if (!::Media::Player::IsStoppedOrStopping(state.state)) {
position = state.position;
}
statusSize = -1 - int((state.length - position) / state.frequency + 1);
} else {
statusSize = -1 - _data->getDuration();
}
}
} else { } else {
statusSize = FileStatusSizeReady; statusSize = FileStatusSizeReady;
} }
if (const auto streamed = activeRoundStreamed()) {
const auto state = streamed->player().prepareLegacyState();
if (state.length) {
auto position = int64(0);
if (::Media::Player::IsStoppedAtEnd(state.state)) {
position = state.length;
} else if (!::Media::Player::IsStoppedOrStopping(state.state)) {
position = state.position;
}
statusSize = -1 - int((state.length - position) / state.frequency + 1);
} else {
statusSize = -1 - _data->getDuration();
}
}
if (statusSize != _statusSize) { if (statusSize != _statusSize) {
setStatusSize(statusSize); setStatusSize(statusSize);
} }
@ -854,39 +826,6 @@ int Gif::additionalWidth(const HistoryMessageVia *via, const HistoryMessageReply
::Media::View::PlaybackProgress *Gif::videoPlayback() const { ::Media::View::PlaybackProgress *Gif::videoPlayback() const {
return ::Media::Player::instance()->roundVideoPlayback(_parent->data()); return ::Media::Player::instance()->roundVideoPlayback(_parent->data());
} }
// #TODO video
//void Gif::clipCallback(::Media::Clip::Notification notification) {
// using namespace ::Media::Clip;
//
// const auto reader = _gif.get();
// if (!reader) {
// return;
// }
// switch (notification) {
// case NotificationReinit: {
// auto stopped = false;
// if (reader->autoPausedGif()) {
// auto amVisible = false;
// history()->owner().queryItemVisibility().notify(
// { _parent->data(), &amVisible },
// true);
// if (!amVisible) { // Stop animation if it is not visible.
// stopAnimation();
// stopped = true;
// }
// }
// if (!stopped) {
// history()->owner().requestViewResize(_parent);
// }
// } break;
//
// case NotificationRepaint: {
// if (!reader->currentDisplayed()) {
// history()->owner().requestViewRepaint(_parent);
// }
// } break;
// }
//}
void Gif::playAnimation(bool autoplay) { void Gif::playAnimation(bool autoplay) {
if (_data->isVideoMessage() && !autoplay) { if (_data->isVideoMessage() && !autoplay) {

4
Telegram/SourceFiles/media/view/media_view_overlay_widget.cpp
View File

@ -2755,7 +2755,9 @@ void OverlayWidget::paintTransformedVideoFrame(Painter &p) {
if (rotation) { if (rotation) {
p.restore(); p.restore();
} }
_streamed->instance.markFrameShown(); if (_streamed->instance.player().ready()) {
_streamed->instance.markFrameShown();
}
//} //}
} }