Commit Graph

1365 Commits

Author SHA1 Message Date
Ylva Selling ea3f9149c3 Make video stretching work 2023-02-01 17:55:59 -05:00
Ylva Selling d4f6e4fbcd Update asset 2023-01-30 15:57:42 -05:00
Ylva Selling 4bb161cbc3 Add better comments for libmpv flags and do some cleanup 2023-01-30 14:46:18 -05:00
Ylva Selling 73fe0d6a00 Add missing enum property 2023-01-30 10:31:25 -05:00
Ylva Selling 4b3a518f49 Seek the correct time before rendering 2023-01-27 09:39:13 -05:00
Ylva Selling 043a4280ca Decouple frame time from libmpv and frame time from OpenSpace. Play back video at 24 fps 2023-01-25 18:44:17 -05:00
Ylva Selling 374af5669d Tiny cleanup 2023-01-20 11:45:44 -05:00
Ylva Selling 05970745d2 Fix issues with deadlocks with libmpv and flickering
Commented out the stretching of the video for now
2023-01-20 11:44:23 -05:00
Ylva Selling d75b63686b Rename FfmpegTileProvider to VideoTileProvider 2023-01-19 11:19:05 -05:00
Ylva Selling 8167d47421 Fix small bug 2023-01-18 18:11:23 -05:00
Ylva Selling da83acdef5 Remove unnecessary member variables 2023-01-18 18:08:42 -05:00
Ylva Selling e3c7d782bd Make tiles get correct part of texture for ffmpegtileprovider 2023-01-18 18:08:18 -05:00
Ylva Selling cf95a9f35f Split chunkTile function in two in tileprovider and make it virtual 2023-01-18 18:05:28 -05:00
Ylva Selling 90a0c3b131 Cleanup & remove unneccesary class variables 2023-01-18 18:04:43 -05:00
Ylva Selling ff40138e9b Update asset 2023-01-17 11:19:17 -05:00
Ylva Selling f11e1469b4 Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe 2023-01-17 10:13:11 -05:00
Malin E 2d78909ea2 Use mpv_get_property_async instead of the non async version 2023-01-17 10:13:02 +01:00
Ylva Selling b709c96627 Update video asset 2023-01-13 12:41:25 -05:00
Ylva Selling 61824c1f7d Add some initialization values, print meta data and get resolution of video 2023-01-13 12:16:28 -05:00
Ylva Selling 9b843080f7 Request debug messages 2023-01-13 12:01:08 -05:00
Ylva Selling 62a1cac673 Request log messages 2023-01-13 12:00:39 -05:00
Malin E 0cd4a70ff3 Fix deinitialize exception 2022-12-21 10:47:19 +01:00
Malin E 4ba97bde52 Sync video with OpenSpace time 2022-12-21 10:31:12 +01:00
Malin E a2bbc44410 WIP something renders on the globe! 2022-12-20 17:31:15 +01:00
Malin E a70e058eda WIP use libmpv instead of ffmpeg to render video tiles 2022-12-19 13:26:45 +01:00
Ylva Selling 90840001d9 Testing to read the video with libmpv and rendering it to OpenGL. Currently not working 2022-12-13 14:57:55 -05:00
Ylva Selling f233043f98 Working naive example 2022-12-12 16:00:01 -05:00
Ylva Selling 33c4180e96 Add libmpv and create some functions to test that the linking works 2022-12-12 15:07:24 -05:00
Malin E a132d5f48b Remove bounce mode for video playback 2022-11-28 15:48:30 +01:00
Malin E adbd1362a2 Rework frame index calculation + Debug checks 2022-11-28 15:41:27 +01:00
Malin E 2f07d5d3f9 Merge branch 'master' into feature/video-on-globe 2022-11-28 13:09:38 +01:00
Alexander Bock 44e5b17ec9 Global pass over the code to remove trailing spaces 2022-11-22 21:06:52 +01:00
Ylva Selling cf35d78eaa Create first draft of animation modes 2022-11-11 15:35:52 -05:00
Malin E 89ae484fbe Speed up decoding of video (hopefully) 2022-11-08 14:33:35 +01:00
Alexander Bock 12bb47c71e Recalculate chunk bounding boxes when the settings of a heightlayer change (closes #2096)
* Correctly calculate Offset when negative numbers are involved
* Adds tile index layer for the Moon
* Remove empty spaces
2022-11-07 15:45:54 +01:00
Malin E e561694eca Add Tracy zones 2022-11-07 11:53:53 +01:00
Emma Broman 81634ed996 Provide GDAL error message when failing to load dataset for layer 2022-11-01 11:32:27 +01:00
Alexander Bock 6249fa6d89 Collection of a number of changes (#2286)
* Cleanup Property code
* Remove NOLINT statements
* Return Property class types as string_view
* Remove getStringValue function
* Simplify string value retrieval
* Ensure that image paths in the ImageSequenceTileProvider are sorted (closes #2205)
* Some cleanup of OpenSpaceEngine
* Cleanup documentation
* Some more cleanup of engine classes
* Some more cleanup
* Update SGCT repository
* Use new Jenkins node identifiers as the old method broke with update
2022-10-30 12:54:14 +01:00
Ylva Selling ed20e394f5 Stretch video between start and end times 2022-10-28 16:58:44 -04:00
Ylva Selling 88ca62981c Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe 2022-10-28 14:13:08 -04:00
Malin E d369e63e12 Bind in gmae time to the video time 2022-10-17 11:10:05 +02:00
Ylva Selling c7da2d28ad Merge branch 'feature/video-on-globe' of https://github.com/OpenSpace/OpenSpace into feature/video-on-globe 2022-10-14 15:22:14 -04:00
Ylva Selling fbf1fa125e Traverse over full tile texture 2022-10-12 08:56:19 -04:00
Malin E cff3d3c4f1 WIP find corresponding frameindex in video depending on in game time 2022-10-12 13:44:56 +02:00
Malin E f81e911a22 Add PBO for async texture upload 2022-10-05 16:17:19 +02:00
Malin E 8a3079519a Enable caching for each video frame to increase FPS 2022-10-05 11:29:07 +02:00
Ylva Selling f876f05202 Merge remote-tracking branch 'origin/master' into feature/video-on-globe 2022-10-04 12:08:51 -04:00
Ylva Selling a3e048232e Make reset button work (it restarts the video from the beginning) 2022-10-04 12:07:20 -04:00
Ylva Selling fa30188e44 Fix bug with rendering video layer 2022-10-04 12:06:08 -04:00
Ylva Selling 03a8e58955 Move intialization from constructor to internalInitialize and create a member variable that keeps track of initialization 2022-10-03 17:05:17 -04:00