Skip to content

Fix aja in not working correctly in linux & device lock issues in windows #14

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
caner-milko wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix aja in not working correctly in linux & device lock issues in windows #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion External/libajantv2
Open in desktop
Submodule libajantv2 updated from e6f9ba to 6b8f73
16 changes: 9 additions & 7 deletions Source/AJADevice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1071,18 +1071,20 @@ bool AJADevice::AcquireDevice()
if (GetStreamingApplication(curAppFourCC, curPid))
{
if (curPid == nosPid)
return true;
auto curApp = FourCCToString(curAppFourCC);
if (curPid != 0)
nosEngine.LogW("Device %s is already acquired by application %s (PID %d). Trying to reclaim it.", GetDisplayName().c_str(), curApp.c_str(), curPid);
{
auto curApp = FourCCToString(curAppFourCC);
if (curPid != 0)
nosEngine.LogW("Device %s is already acquired by application %s (PID %d). Trying to reclaim it.", GetDisplayName().c_str(), curApp.c_str(), curPid);
}
}

if (!AcquireStreamForApplication(NOS_FOURCC, nosPid))
if (!AcquireStreamForApplicationWithReference(NOS_FOURCC, nosPid))
{
nosEngine.LogE("Failed to acquire device %s for Nodos.", GetDisplayName().c_str());
return false;
}
nosEngine.LogD("Device %s acquired by Nodos.", GetDisplayName().c_str());
if(nosPid != curPid)
Comment thread
caner-milko marked this conversation as resolved.
nosEngine.LogD("Device %s acquired by Nodos.", GetDisplayName().c_str());
Comment on lines 1071 to +1087
Copy link

Copilot AI Jan 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

curPid is now used in if(nosPid != curPid) even when GetStreamingApplication(...) returns false. If curPid isn't initialized before the GetStreamingApplication call, this becomes an undefined read and can cause incorrect logging/behavior. Initialize curPid (and any related state) to a known value before the call, or restructure so the comparison/logging only happens when curPid is known to be set.

Copilot uses AI. Check for mistakes.
return true;
}

Expand All @@ -1106,7 +1108,7 @@ void AJADevice::ReleaseDevice()
return;
}

if (ReleaseStreamForApplication(NOS_FOURCC, nosPid))
if (ReleaseStreamForApplicationWithReference(NOS_FOURCC, nosPid))
nosEngine.LogD("Device %s released by Nodos", GetDisplayName().c_str());
else
nosEngine.LogE("Failed to release device %s", GetDisplayName().c_str());
Expand Down
Loading