mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 04:49:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Get fps from video and set the seek threshold dynamically with that value

Browse Source
This commit is contained in:
Ylva Selling
2023-02-09 12:02:42 -05:00
parent 6f440c0ada
commit e51bd4b337
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modules/globebrowsing/src/tileprovider/videotileprovider.cpp
View File

@@ -441,7 +441,7 @@ void VideoTileProvider::initializeMpv() {
observePropertyMpv("height", MPV_FORMAT_INT64, LibmpvPropertyKey::Height);
observePropertyMpv("width", MPV_FORMAT_INT64, LibmpvPropertyKey::Width);
observePropertyMpv("metadata", MPV_FORMAT_NODE, LibmpvPropertyKey::Meta);
observePropertyMpv("fps", MPV_FORMAT_DOUBLE, LibmpvPropertyKey::Fps);
observePropertyMpv("container-fps", MPV_FORMAT_DOUBLE, LibmpvPropertyKey::Fps);
if (_animationMode == AnimationMode::MapToSimulationTime) {
pause();
@@ -472,7 +472,7 @@ double VideoTileProvider::correctVideoPlaybackTime() const {
void VideoTileProvider::seekToTime(double time) {
// Prevent from seeking to the same time multiple times in a row
bool seekIsDifferent = abs(time - _currentVideoTime) > SeekThreshold;
bool seekIsDifferent = abs(time - _currentVideoTime) > _seekThreshold;
if (seekIsDifferent && !_isSeeking) {
// Pause while seeking
pause();
@@ -503,7 +503,7 @@ void VideoTileProvider::renderMpv() {
}
// Make sure we are at the correct time
double time = correctVideoPlaybackTime();
bool shouldSeek = abs(time - _currentVideoTime) > SeekThreshold;
bool shouldSeek = abs(time - _currentVideoTime) > _seekThreshold;
if (shouldSeek) {
seekToTime(time);
}
@@ -577,10 +577,10 @@ void VideoTileProvider::handleMpvEvents() {
{
getPropertyAsyncMpv("duration", MPV_FORMAT_DOUBLE, LibmpvPropertyKey::Duration);
}
if (strcmp(prop->name, "fps") == 0 &&
if (strcmp(prop->name, "container-fps") == 0 &&
prop->format == MPV_FORMAT_DOUBLE)
{
getPropertyAsyncMpv("fps", MPV_FORMAT_DOUBLE, LibmpvPropertyKey::Fps);
getPropertyAsyncMpv("container-fps", MPV_FORMAT_DOUBLE, LibmpvPropertyKey::Fps);
}
if (strcmp(prop->name, "pause") == 0 &&
prop->format == MPV_FORMAT_FLAG)
@@ -671,7 +671,7 @@ void VideoTileProvider::handleMpvProperties(mpv_event* event) {
}
_videoDuration = *duration;
_frameDuration = _fps * ((_endJ200Time - _startJ200Time) /_videoDuration);
_frameDuration = ( 1.0 / _fps) * ((_endJ200Time - _startJ200Time) / _videoDuration);
if (_animationMode == AnimationMode::MapToSimulationTime) {
seekToTime(correctVideoPlaybackTime());
@@ -867,8 +867,9 @@ void VideoTileProvider::handleMpvProperties(mpv_event* event) {
}
_fps = *fps;
LINFO(fmt::format("Frame count: {}", *fps));
_frameDuration = _fps * ((_endJ200Time - _startJ200Time) / _videoDuration);
LINFO(fmt::format("Detected fps: {}", *fps));
_frameDuration = (1.0 / _fps) * ((_endJ200Time - _startJ200Time) / _videoDuration);
_seekThreshold = 2.0 * (1.0 / _fps);
break;
}
case LibmpvPropertyKey::Pause: {

7
modules/globebrowsing/src/tileprovider/videotileprovider.h
View File

@@ -64,8 +64,7 @@ public:
static documentation::Documentation Documentation();
private:
// Threshold where we are officially out of sync
static constexpr double SeekThreshold = 1.0;
properties::TriggerProperty _play;
properties::TriggerProperty _pause;
properties::TriggerProperty _goToStart;
@@ -121,12 +120,14 @@ private:
double _endJ200Time = 0.0;
double _currentVideoTime = 0.0;
double _frameDuration = 0.0;
double _fps = 0.04166666667; //1/24
double _fps = 0.04166666667; // This values equals 1/24. Fall back to 24 fps
double _timeAtLastRender = 0.0;
bool _hasReachedEnd = false;
bool _tileIsReady = false;
bool _isInitialized = false;
bool _isSeeking = false;
// Threshold where we are officially out of sync
double _seekThreshold = 1.0;
double _videoDuration = 0.0;
glm::ivec2 _videoResolution = glm::ivec2(4096, 2048);