Skip to content

fix: 1181 fix colorspace changes when session clear and fix memory leak with orphaned sessions #1182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcoliver wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: 1181 fix colorspace changes when session clear and fix memory leak with orphaned sessions #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
122d88d
Move hardware device context unreferencing from destructor to conditi…
mcoliver Mar 4, 2026
47f4066
feat: Add `afterClearSession` event handlers to `source_setup` and `o…
mcoliver Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/lib/image/MovieFFMpeg/MovieFFMpeg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@ namespace TwkMovie
av_frame_free(&videoFrame);
av_frame_free(&inPicture);
av_frame_free(&outPicture);

if (hardwareContext.deviceContext)
av_buffer_unref(&hardwareContext.deviceContext);
};

VideoTrack& initFrom(const VideoTrack* t)
Expand Down Expand Up @@ -5649,7 +5652,6 @@ namespace TwkMovie
{
VideoTrack* track = m_videoTracks[i];
avcodec_free_context(&track->avCodecContext);
av_buffer_unref(&track->hardwareContext.deviceContext);
delete track;
}
if (m_audioSamples)
Expand Down
6 changes: 6 additions & 0 deletions src/plugins/rv-packages/ocio_source_setup/ocio_source_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,11 @@ def checkForDisplayGroup(self, event):
except Exception as inst:
print((str(inst), node))

def afterClearSession(self, event):
event.reject()
self.usingOCIOForDisplay.clear()
commands.defineModeMenu("OCIO Source Setup", self.buildOCIOMenu(), True)

def maybeUpdateViews(self, event):
event.reject()
if event.contents().endswith("ocio_display.display"):
Expand Down Expand Up @@ -728,6 +733,7 @@ def __init__(self):
("before-session-read", self.beforeSessionRead, ""),
("after-session-read", self.afterSessionRead, ""),
("graph-new-node", self.checkForDisplayGroup, ""),
("after-clear-session", self.afterClearSession, ""),
("graph-node-inputs-changed", self.checkForDisplayGroup, ""),
("graph-state-change", self.maybeUpdateViews, ""),
],
Expand Down
5 changes: 5 additions & 0 deletions src/plugins/rv-packages/source_setup/source_setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,10 @@ def checkForDisplayGroup(self, event):
if commands.nodeType(event.contents()) == "RVDisplayGroup":
self._haveNewDisplayGroups = True

def afterClearSession(self, event):
event.reject()
self._haveNewDisplayGroups = True

def __init__(self):
self._readingSession = False
self._haveNewDisplayGroups = True
Expand All @@ -523,6 +527,7 @@ def __init__(self):
"Color and Geometry Management",
),
("graph-new-node", self.checkForDisplayGroup, ""),
("after-clear-session", self.afterClearSession, ""),
],
None,
"source_setup",
Expand Down
Loading