From 227e4d83cc8270e937683a4cee18c5a161bb52c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gonzalo=20Garramu=C3=B1o?= Date: Sat, 11 May 2024 13:34:40 -0300 Subject: [PATCH] Fixed pointer derefence. Updated tlRender. --- mrv2/docs/HISTORY.md | 33 +++++++++++++++++--------------- mrv2/lib/mrvGL/mrvGLViewport.cpp | 1 + mrv2/po/messages.pot | 2 +- tlRender | 2 +- 4 files changed, 21 insertions(+), 17 deletions(-) diff --git a/mrv2/docs/HISTORY.md b/mrv2/docs/HISTORY.md index 38792c16..04837fe0 100644 --- a/mrv2/docs/HISTORY.md +++ b/mrv2/docs/HISTORY.md @@ -1,7 +1,21 @@ v1.1.6 ====== -This is a release full of goodies. +This is a release full of goodies and bug fixes. + +- **ATTENTION**: + This version introduces a change in the way Cache Settings are used for + movie files. + The Settings->Gigabytes and the pair of "Settings->Read Ahead" and + "Settings->Read Behind" are now decoupled. + In the case of sequences, the Read Ahea and Read Behind will be automatically + calculated from the Gigabytes settings as before. + However, for movie files the timeline will only display the settings for + Read Ahead/Behind, not the actual Gigabytes cache (which can be bigger than + the read ahead/behind setting). The small Read Ahead and Read Behind is to + allow playing 4K movies backwards. + The Gigabytes setting of 0 is **NO LONGER USED** and will revert to + 4 Gb if set to 0. - Fixed slow seeking on 4K movies. Now we beat OpenRV on **all** movies, seeking and reverse playback too. @@ -24,19 +38,6 @@ This is a release full of goodies. and okay'ed while the movie is still playing. - Fixed seeking on the timeline on Linux sometimes getting the event incorrectly on X. -- **ATTENTION**: - This version introduces a change in the way Cache Settings are used for - movie files. - The Settings->Gigabytes and the pair of "Settings->Read Ahead" and - "Settings->Read Behind" are now decoupled. - In the case of sequences, the Read Ahea and Read Behind will be automatically - calculated from the Gigabytes settings as before. - However, for movie files the timeline will only display the settings for - Read Ahead/Behind, not the actual Gigabytes cache (which can be bigger than - the read ahead/behind setting). The small Read Ahead and Read Behind is to - allow playing 4K movies backwards. - The Gigabytes setting of 0 is **NO LONGER USED** and will revert to - 4 Gb if set to 0. - Fixed starting a movie with loop on and playing stopped and then start playing it backwards. - Refactored playback code and fixed playback buttons sometimes getting out of @@ -46,7 +47,9 @@ This is a release full of goodies. Panels. - Changing languages now stores and re-loads a session on a temporary location, so the interface does not reset to 0. -- Made the timeline thumbnails a tad smaller and more polished. +- Made the timeline thumbnail a tad smaller and more polished. +- Fixed a potentially nullptr pointer de-referencing when OpenGL accuracy was + set to Automatic. v1.1.5 diff --git a/mrv2/lib/mrvGL/mrvGLViewport.cpp b/mrv2/lib/mrvGL/mrvGLViewport.cpp index 989ea9b7..41a4a8be 100644 --- a/mrv2/lib/mrvGL/mrvGLViewport.cpp +++ b/mrv2/lib/mrvGL/mrvGLViewport.cpp @@ -223,6 +223,7 @@ namespace mrv break; case kAccuracyAuto: if (!p.videoData[0].layers.empty() && + p.videoData[0].layers[0].image && p.videoData[0].layers[0].image->isValid()) { const auto& pixelType = diff --git a/mrv2/po/messages.pot b/mrv2/po/messages.pot index 4d5e7357..3b149f8a 100644 --- a/mrv2/po/messages.pot +++ b/mrv2/po/messages.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: mrv2 v1.1.6\n" "Report-Msgid-Bugs-To: ggarra13@gmail.com\n" -"POT-Creation-Date: 2024-05-11 11:44-0300\n" +"POT-Creation-Date: 2024-05-11 13:29-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/tlRender b/tlRender index ed15a309..90e502e1 160000 --- a/tlRender +++ b/tlRender @@ -1 +1 @@ -Subproject commit ed15a309bd120caa9069744cc0107a99d0f839fa +Subproject commit 90e502e1eb62cc8c953038419f48007876a08e54