mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 21:21:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Restructrure header file to make it more readable and make duration and resolution properties

Browse Source
This commit is contained in:
Ylva Selling
2023-02-02 12:25:57 -05:00
parent d42d7da38e
commit 4e9fcbbd8d
2 changed files with 112 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,15 +84,33 @@ namespace {
"Go to start in video"
};
constexpr openspace::properties::Property::PropertyInfo DurationInfo = {
"Duration",
"Duration",
"Duration of video, in seconds"
};
constexpr openspace::properties::Property::PropertyInfo ResolutionInfo = {
"Resolution",
"Resolution",
"Resolution of video, in pixels"
};
struct [[codegen::Dictionary(VideoTileProvider)]] Parameters {
// [[codegen::verbatim(FileInfo.description)]]
std::filesystem::path file;
// [[codegen::verbatim(DurationInfo.description)]]
double duration;
// [[codegen::verbatim(ResolutionInfo.description)]]
glm::ivec2 resolution;
// [[codegen::verbatim(StartTimeInfo.description)]]
std::string startTime [[codegen::datetime()]];
std::optional<std::string> startTime [[codegen::datetime()]];
// [[codegen::verbatim(EndTimeInfo.description)]]
std::string endTime [[codegen::datetime()]];
std::optional<std::string> endTime [[codegen::datetime()]];
enum class AnimationMode {
MapToSimulationTime = 0,
@@ -156,12 +174,16 @@ VideoTileProvider::VideoTileProvider(const ghoul::Dictionary& dictionary)
: _play(PlayInfo)
, _pause(PauseInfo)
, _goToStart(GoToStartInfo)
, _videoDuration(DurationInfo, 0.0)
, _videoResolution(ResolutionInfo, glm::ivec2(0))
{
ZoneScoped
const Parameters p = codegen::bake<Parameters>(dictionary);
_videoFile = p.file;
_videoDuration = p.duration;
_videoResolution = p.resolution;
if (p.animationMode.has_value()) {
switch (*p.animationMode) {
@@ -186,8 +208,13 @@ VideoTileProvider::VideoTileProvider(const ghoul::Dictionary& dictionary)
addProperty(_goToStart);
}
else if (_animationMode == AnimationMode::MapToSimulationTime) {
_startJ200Time = Time::convertTime(p.startTime);
_endJ200Time = Time::convertTime(p.endTime);
if (!p.startTime.has_value() || !p.endTime.has_value()) {
LERROR("Video tile layer tried to map to simulation time but lacked start or"
" end time");
return;
}
_startJ200Time = Time::convertTime(*p.startTime);
_endJ200Time = Time::convertTime(*p.endTime);
ghoul_assert(_endJ200Time > _startJ200Time, "Invalid times for video");
}
@@ -381,7 +408,7 @@ void VideoTileProvider::initializeMpv() {
}
//Create FBO to render video into
createFBO(_resolution.x, _resolution.y);
createFBO(_videoResolution.value().x, _videoResolution.value().y);
//Observe video parameters
observePropertyMpv("video-params", MPV_FORMAT_NODE, LibmpvPropertyKey::Params);
@@ -433,7 +460,7 @@ void VideoTileProvider::pauseVideoIfOutsideValidTime() {
void VideoTileProvider::seekToTime(double time) {
bool isPlaying = !_isPaused;
bool seekIsDifferent = abs(time - _currentVideoTime) > _frameTime;
bool seekIsDifferent = abs(time - _currentVideoTime) > SeekThreshold;
if (seekIsDifferent) {
// Pause while seeking
pause();
@@ -476,7 +503,7 @@ void VideoTileProvider::renderMpv() {
pauseVideoIfOutsideValidTime();
double time = correctVideoPlaybackTime();
bool shouldSeek = abs(time - _currentVideoTime) > _frameTime;
bool shouldSeek = abs(time - _currentVideoTime) > SeekThreshold;
if (shouldSeek) {
seekToTime(time);
@@ -492,7 +519,11 @@ void VideoTileProvider::renderMpv() {
// details. This function fills the fbo and texture with data, after it
// we can get the data on the GPU, not the CPU
int fboInt = static_cast<int>(_fbo);
mpv_opengl_fbo mpfbo{ fboInt , _resolution.x, _resolution.y, 0 };
mpv_opengl_fbo mpfbo{
fboInt ,
_videoResolution.value().x,
_videoResolution.value().y, 0
};
int flip_y{ 1 };
mpv_render_param params[] = {
@@ -687,18 +718,20 @@ void VideoTileProvider::handleMpvProperties(mpv_event* event) {
break;
}
if (*height == _resolution.y) {
if (*height == _videoResolution.value().y) {
break;
}
LINFO(fmt::format("New height: {}", *height));
if (*height > 0) {
if (_resolution.x > 0 && _fbo > 0) {
resizeFBO(_resolution.x, *height);
if (_videoResolution.value().x > 0 && _fbo > 0) {
resizeFBO(_videoResolution.value().x, *height);
}
else {
_resolution.y = *height;
glm::ivec2 newValue = _videoResolution.value();
newValue.y = *height;
_videoResolution = newValue;
}
}
else {
@@ -820,18 +853,20 @@ void VideoTileProvider::handleMpvProperties(mpv_event* event) {
break;
}
if (*width == _resolution.y) {
if (*width == _videoResolution.value().y) {
break;
}
LINFO(fmt::format("New width: {}", *width));
if (*width > 0) {
if (_resolution.y > 0 && _fbo > 0) {
resizeFBO(*width, _resolution.y);
if (_videoResolution.value().y > 0 && _fbo > 0) {
resizeFBO(*width, _videoResolution.value().y);
}
else {
_resolution.x = *width;
glm::ivec2 newValue = _videoResolution.value();
newValue.x = *width;
_videoResolution = newValue;
}
}
else {
@@ -916,7 +951,7 @@ void VideoTileProvider::createFBO(int width, int height) {
}
// Update resolution of video
_resolution = glm::ivec2(width, height);
_videoResolution = glm::ivec2(width, height);
glGenFramebuffers(1, &_fbo);
glBindFramebuffer(GL_FRAMEBUFFER, _fbo);
@@ -949,18 +984,23 @@ void VideoTileProvider::createFBO(int width, int height) {
glBindFramebuffer(GL_FRAMEBUFFER, 0);
// Render video frame to texture
_mpvFbo = mpv_opengl_fbo{ static_cast<int>(_fbo), _resolution.x, _resolution.y, 0 };
_mpvFbo = mpv_opengl_fbo{
static_cast<int>(_fbo),
_videoResolution.value().x,
_videoResolution.value().y,
0
};
}
void VideoTileProvider::resizeFBO(int width, int height) {
LINFO(fmt::format("Resizing FBO with width: {} and height: {}", width, height));
if (width == _resolution.x && height == _resolution.y) {
if (width == _videoResolution.value().x && height == _videoResolution.value().y) {
return;
}
// Update resolution of video
_resolution = glm::ivec2(width, height);
_videoResolution = glm::ivec2(width, height);
// Delete old FBO and texture
glDeleteFramebuffers(1, &_fbo);

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

@@ -28,6 +28,8 @@
#include <modules/globebrowsing/src/tileprovider/tileprovider.h>
#include <openspace/properties/triggerproperty.h>
#include <openspace/properties/scalar/doubleproperty.h>
#include <openspace/properties/vector/ivec2property.h>
#include <ghoul/glm.h>
// libmpv
@@ -60,56 +62,14 @@ public:
static documentation::Documentation Documentation();
private:
// Time for 1 frame when 24 fps (1.0 / 24.0). Chose 24 fps as this is the lowest
// probably fps we'll encounter
static constexpr double SeekThreshold = 0.0417;
properties::TriggerProperty _play;
properties::TriggerProperty _pause;
properties::TriggerProperty _goToStart;
void createFBO(int width, int height);
void resizeFBO(int width, int height);
double correctVideoPlaybackTime() const;
bool isWithingStartEndTime() const;
void pauseVideoIfOutsideValidTime();
void seekToTime(double time);
void updateStretchingOfTime();
// Libmpv
void initializeMpv(); // Called first time in postSyncPreDraw
void renderMpv(); // Called in postSyncPreDraw
void handleMpvEvents();
void handleMpvProperties(mpv_event* event);
void swapBuffersMpv(); // Called in postDraw
void cleanUpMpv(); // Called in internalDeinitialze
static void on_mpv_render_update(void*);
void internalInitialize() override final;
void internalDeinitialize() override final;
enum class AnimationMode {
MapToSimulationTime = 0,
RealTimeLoop
};
AnimationMode _animationMode = AnimationMode::RealTimeLoop; // Default is to loop
std::filesystem::path _videoFile;
double _startJ200Time = 0.0;
double _endJ200Time = 0.0;
double _videoDuration = -1.0;
double _currentVideoTime = 0.0;
double _frameTime = 1.0 / 24.0;
bool _hasReachedEnd = false;
bool _tileIsReady = false;
bool _isInitialized = false;
glm::ivec2 _resolution = { 2048, 1024 };
// libmpv
mpv_handle* _mpvHandle = nullptr;
mpv_render_context* _mpvRenderContext = nullptr;
std::unique_ptr<ghoul::opengl::Texture>_frameTexture = nullptr;
mpv_opengl_fbo _mpvFbo;
GLuint _fbo = 0;
static int _wakeup;
bool _didRender = false;
bool _isPaused = false;
properties::DoubleProperty _videoDuration;
properties::IVec2Property _videoResolution;
// libmpv property keys
enum class LibmpvPropertyKey : uint64_t {
@@ -125,8 +85,53 @@ private:
Pause
};
enum class AnimationMode {
MapToSimulationTime = 0,
RealTimeLoop
};
void createFBO(int width, int height);
void resizeFBO(int width, int height);
// Map to simulation time functions
double correctVideoPlaybackTime() const;
bool isWithingStartEndTime() const;
void pauseVideoIfOutsideValidTime();
void updateStretchingOfTime();
// Libmpv
void initializeMpv(); // Called first time in postSyncPreDraw
void renderMpv(); // Called in postSyncPreDraw
void handleMpvEvents();
void handleMpvProperties(mpv_event* event);
void swapBuffersMpv(); // Called in postDraw
void cleanUpMpv(); // Called in internalDeinitialze
static void on_mpv_render_update(void*);
void observePropertyMpv(std::string name, mpv_format format, LibmpvPropertyKey key);
void setPropertyStringMpv(std::string name, std::string value);
void seekToTime(double time);
void internalInitialize() override final;
void internalDeinitialize() override final;
AnimationMode _animationMode = AnimationMode::RealTimeLoop; // Default is to loop
std::filesystem::path _videoFile;
double _startJ200Time = 0.0;
double _endJ200Time = 0.0;
double _currentVideoTime = 0.0;
bool _hasReachedEnd = false;
bool _tileIsReady = false;
bool _isInitialized = false;
// libmpv
mpv_handle* _mpvHandle = nullptr;
mpv_render_context* _mpvRenderContext = nullptr;
std::unique_ptr<ghoul::opengl::Texture>_frameTexture = nullptr;
mpv_opengl_fbo _mpvFbo;
GLuint _fbo = 0;
static int _wakeup;
bool _didRender = false;
bool _isPaused = false;
};
} // namespace openspace::globebrowsing