mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-10 07:18:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add some initialization values, print meta data and get resolution of video

Browse Source
This commit is contained in:
Ylva Selling
2023-01-13 12:16:28 -05:00
parent 9b843080f7
commit 61824c1f7d
2 changed files with 37 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/globebrowsing/src/tileprovider/ffmpegtileprovider.cpp
View File

@@ -150,6 +150,10 @@ FfmpegTileProvider::FfmpegTileProvider(const ghoul::Dictionary& dictionary) {
Tile FfmpegTileProvider::tile(const TileIndex& tileIndex) {
ZoneScoped
if (!_isInitialized) {
return Tile();
}
// Look for tile in cache
cache::ProviderTileKey key = { tileIndex, _prevVideoTime }; // TODO: Improve caching with a better id
cache::MemoryAwareTileCache* tileCache =
@@ -577,6 +581,36 @@ void FfmpegTileProvider::internalInitialize() {
//Observe video parameters
mpv_observe_property(_mpvHandle, 0, "video-params", MPV_FORMAT_NODE);
// Print meta data
mpv_node node;
mpv_get_property(_mpvHandle, "metadata", MPV_FORMAT_NODE, &node);
if (node.format == MPV_FORMAT_NODE_MAP) {
for (int n = 0; n < node.u.list->num; n++) {
if (node.u.list->values[n].format == MPV_FORMAT_STRING) {
LINFO(node.u.list->values[n].u.string);
}
}
}
else {
LWARNING("No meta data could be read");
}
// Get resolution of video
int64_t width, height = 0;
result = mpv_get_property(_mpvHandle, "width", MPV_FORMAT_INT64, &width);
int result2 = mpv_get_property(_mpvHandle, "height", MPV_FORMAT_INT64, &height);
if (!checkMpvError(result) || !checkMpvError(result2))
{
LWARNING("Could not load video resolution");
}
if (width > 0 && height > 0) {
_resolution = { width, height };
}
else {
LWARNING("Invalid video resolution");
}
//Create FBO to render video into
createFBO(_resolution.x, _resolution.y);

6
modules/globebrowsing/src/tileprovider/ffmpegtileprovider.h
View File

@@ -86,10 +86,10 @@ private:
glm::ivec2 _resolution = { 2048, 1024 };
// libmpv
mpv_handle* _mpvHandle;
mpv_render_context* _mpvRenderContext;
GLuint _fbo = 0;
mpv_handle* _mpvHandle = nullptr;
mpv_render_context* _mpvRenderContext = nullptr;
ghoul::opengl::Texture* _frameTexture = nullptr;
GLuint _fbo = 0;
TileTextureInitData::HashKey _frameTextureHashKey;
};