fix: bug-fix sweep across node, audio, render, plugin subsystems
Node core: - MathNode/TrigonometryNode combo strings realigned with Operation enums - mathbase scalar/vector operand pick no longer uses bitwise type checks - NodeSetPositionAndDependenciesRecursively moves dependencies again - RemoveAllKeyframes undo actually restores keyframes - NodeGroup GetInputName null-deref guard, passthrough ids use input id - NodeValueTable::Has is an exact type match; tag fallback only for empty tags; kStrCombo/kPushButton get data type names - delete_all_keyframes no longer loops forever on unparented keyframes; keyframe-load failures propagate; rational interpolation falls back to double; OpacityEffect no longer leaks its internal MathNode Audio/footage: - AudioVisualWaveform: GetSummaryFromTime underflow OOB read, TrimIn prepend length bookkeeping, OverwriteSums source channel indexing - PanNode inserts the pan value into the sample job (keyframed pan works); OutputParamsChanged is emitted on device change; PortAudio device indices are validated before Pa_GetDeviceInfo - Footage: AdjustTimeByLoopMode no longer hangs/UBs on degenerate lengths, GetStreamIndex bounds-checked, CheckFootage clears stale state on missing files, failed probes are not cached, FootageDescription::Load requires its own root element Render/track: - ViewerOutput pushes the tagged samples value; TrackList disconnects the track-height lambda; GetTrackFromReference validity check - RenderManager dummy backend: null-initialized threads, guarded decoder-cache/timer paths; Renderer::Destroy releases color cache shaders/textures; unknown dynamic backends no longer alias to oakgl - SharedMemoryRegion POSIX attach validates segment size; ReadMessage skips blank lines instead of failing; GC counter clamped; IsRenderingCustomRange implemented; TimeOffsetNode gets a true inverse OutputTimeAdjustment; zero-speed clips return the held frame Plugin/nodes: - OliveClip: stored default region of definition is honored, on-demand images are cached; OliveHost sets host identity properties and logs instead of showing modal dialogs offscreen; Plugin.h dead decls gone - DespillNode guards graph-less use with Rec.709 fallback; description typos fixed (despill, swirl); mosaic applies when only one axis matches; Windows-only Project filename separator test fixed
This commit is contained in:
@@ -182,11 +182,20 @@ int Footage::GetStreamIndex(Track::Type type, int index) const
|
||||
{
|
||||
switch (type) {
|
||||
case Track::kVideo:
|
||||
return GetVideoParams(index).stream_index();
|
||||
if (index >= 0 && index < GetVideoStreamCount()) {
|
||||
return GetVideoParams(index).stream_index();
|
||||
}
|
||||
break;
|
||||
case Track::kAudio:
|
||||
return GetAudioParams(index).stream_index();
|
||||
if (index >= 0 && index < GetAudioStreamCount()) {
|
||||
return GetAudioParams(index).stream_index();
|
||||
}
|
||||
break;
|
||||
case Track::kSubtitle:
|
||||
return GetSubtitleParams(index).stream_index();
|
||||
if (index >= 0 && index < GetSubtitleStreamCount()) {
|
||||
return GetSubtitleParams(index).stream_index();
|
||||
}
|
||||
break;
|
||||
case Track::kNone:
|
||||
case Track::kCount:
|
||||
break;
|
||||
@@ -476,18 +485,29 @@ rational Footage::AdjustTimeByLoopMode(rational time, LoopMode loop_mode,
|
||||
time = rational::NaN;
|
||||
break;
|
||||
case LoopMode::kLoopModeClamp:
|
||||
// Clamp footage time to length
|
||||
time = std::clamp(time, rational(0), length - timebase);
|
||||
if (length < timebase) {
|
||||
// No full frame fits in the range, so there is nothing to clamp to
|
||||
time = rational::NaN;
|
||||
} else {
|
||||
// Clamp footage time to length
|
||||
time = std::clamp(time, rational(0), length - timebase);
|
||||
}
|
||||
break;
|
||||
case LoopMode::kLoopModeLoop:
|
||||
// Loop footage time around job length
|
||||
do {
|
||||
if (time >= length) {
|
||||
time -= length;
|
||||
} else {
|
||||
time += length;
|
||||
}
|
||||
} while (TimeIsOutOfBounds(time, length));
|
||||
if (length <= 0) {
|
||||
// Cannot loop around an empty range
|
||||
time = rational::NaN;
|
||||
} else {
|
||||
// Loop footage time around job length
|
||||
do {
|
||||
if (time >= length) {
|
||||
time -= length;
|
||||
} else {
|
||||
time += length;
|
||||
}
|
||||
} while (TimeIsOutOfBounds(time, length));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -797,7 +817,10 @@ void Footage::Reprobe()
|
||||
}
|
||||
|
||||
if (!cancelled_ || !cancelled_->HeardCancel()) {
|
||||
if (!footage_info.Save(meta_cache_file)) {
|
||||
// Only cache successful probes; caching a failed probe
|
||||
// would make every future load re-use the invalid metadata
|
||||
if (footage_info.IsValid() &&
|
||||
!footage_info.Save(meta_cache_file)) {
|
||||
qWarning()
|
||||
<< "Failed to save stream cache, footage will have to be re-probed";
|
||||
}
|
||||
@@ -898,6 +921,7 @@ void Footage::CheckFootage()
|
||||
|
||||
if (current_file_timestamp != timestamp()) {
|
||||
// File has changed!
|
||||
Clear();
|
||||
Reprobe();
|
||||
InvalidateAll(kFilenameInput);
|
||||
}
|
||||
|
||||
@@ -41,8 +41,11 @@ bool FootageDescription::Load(const QString &filename)
|
||||
if (file.open(QFile::ReadOnly)) {
|
||||
QXmlStreamReader reader(&file);
|
||||
|
||||
bool found_streamcache = false;
|
||||
|
||||
while (XMLReadNextStartElement(&reader)) {
|
||||
if (reader.name() == QStringLiteral("streamcache")) {
|
||||
found_streamcache = true;
|
||||
// Default to first version of metadata (which wasn't versioned at all)
|
||||
unsigned version = 1;
|
||||
|
||||
@@ -126,7 +129,8 @@ bool FootageDescription::Load(const QString &filename)
|
||||
qWarning() << "Failed to load footage description for" << filename
|
||||
<< reader.errorString();
|
||||
} else {
|
||||
return true;
|
||||
// Only accept files whose root element is the one Save() writes
|
||||
return found_streamcache;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -70,6 +70,9 @@ public:
|
||||
|
||||
Track *GetTrackFromReference(const Track::Reference &track_ref) const
|
||||
{
|
||||
if (track_ref.type() < 0 || track_ref.type() >= track_lists_.size()) {
|
||||
return nullptr;
|
||||
}
|
||||
return track_lists_.at(track_ref.type())->GetTrackAt(track_ref.index());
|
||||
}
|
||||
|
||||
|
||||
@@ -120,9 +120,11 @@ ProjectSerializer::Result ProjectSerializer::Load(Project *project,
|
||||
if (attr.name() ==
|
||||
QStringLiteral("version")) { // 230220+ projects
|
||||
version = attr.value().toUInt();
|
||||
} else if (reader->name() ==
|
||||
} else if (attr.name() ==
|
||||
QStringLiteral("url")) { // 230220+ projects
|
||||
project->SetSavedURL(attr.value().toString());
|
||||
if (project) {
|
||||
project->SetSavedURL(attr.value().toString());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user