Mike-Solar
712badbaa7
Compiler hygiene (all platforms): - Silence warnings across the tree: missing override, -Wreorder ctor init, -Wshadow, -Wsign-compare, missing switch cases, unused functions/captures, Qt 6.11 deprecations (QMouseEvent/QDropEvent accessors, qAsConst, Q_FOREACH over non-shared containers, AA_UseHighDpiPixmaps) and the .bak/ backup tree removal. - Fix regressions from the cleanup: missing clip decls in capi/timeline.cpp, plugin.cpp rename fallout, panel setFocus ambiguity, QGraphicsItem::pos vs event->position(), duplicate k_push_button case, boolean test variable. Windows: - Qt portability: CommandLineParser is_set/add_option, QTimeZone systemTimeZone (QTimeZone::LocalTime is 6.11-only), k_progress_* enum. - Linking: stop adding oakengine to OLIVE_LIBRARIES (import lib plus oakengine-obj caused multiple definitions); add OAKENGINE_STATIC so internal consumers no longer reference __imp_* stubs. - oakengine.ver: export olive::Renderer typeinfo so liboakgl.so can be dlopened (Linux), DynamicRenderer no longer dlcloses backend libraries (crash in RenderManager's dtor calling into unmapped memory). - OTIO runtime: copy DLLs next to every binary on Windows instead of relying on PATH (0xc0000135 in gtest discovery). - Headless GL: the runner only has GDI OpenGL 1.1, killing every render worker. Deploy Mesa llvmpipe as opengl32sw.dll (Qt's software-GL channel) with QT_OPENGL=software, and let QT_OPENGL override the AA_UseDesktopOpenGL default. ExportTask fails fast after 8 consecutive undelivered frames instead of segfaulting or grinding forever; FFmpegEncoder::write_frame tolerates null frames. - Tests: GetTempPathA+PID temp dirs, GetLongPathNameA for 8.3 names, forward-slash normalization when comparing project filenames. Linux: - Install libshaderc-dev so oakvulkan compiles GLSL (Vulkan tests). - Accept UNORM floor-or-round (63/64) in the blit ping-pong test. - Skip MainWindow construction test on the offscreen QPA (cannot paint QOpenGLWidget). Also: oak_cli_transcode gets a 300s ctest timeout, worker logs GL context version and LoadGraph/render_frame stages, and docs/plans/eliminate-event-bridge-issues.md (English translation).
76 lines
1.9 KiB
C++
76 lines
1.9 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#include "renderjobtracker.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
void RenderJobTracker::insert(const TimeRange &range, JobTime job_time)
|
|
{
|
|
// First remove any ranges that overlap this one (code copied from TimeRangeList::remove)
|
|
TimeRangeList::util_remove(&jobs_, range);
|
|
|
|
// Now append the job
|
|
TimeRangeWithJob job(range, job_time);
|
|
jobs_.push_back(job);
|
|
}
|
|
|
|
void RenderJobTracker::insert(const TimeRangeList &ranges, JobTime job_time)
|
|
{
|
|
for (const TimeRange &r : ranges) {
|
|
insert(r, job_time);
|
|
}
|
|
}
|
|
|
|
void RenderJobTracker::clear()
|
|
{
|
|
jobs_.clear();
|
|
}
|
|
|
|
bool RenderJobTracker::isCurrent(const Rational &time, JobTime job_time) const
|
|
{
|
|
for (auto it = jobs_.crbegin(); it != jobs_.crend(); it++) {
|
|
if (it->contains(time)) {
|
|
return job_time >= it->get_job_time();
|
|
}
|
|
}
|
|
|
|
return false;
|
|
}
|
|
|
|
TimeRangeList
|
|
RenderJobTracker::getCurrentSubRanges(const TimeRange &range,
|
|
const JobTime &job_time) const
|
|
{
|
|
TimeRangeList current_ranges;
|
|
|
|
for (auto it = jobs_.crbegin(); it != jobs_.crend(); it++) {
|
|
if (job_time >= it->get_job_time() && it->overlaps_with(range)) {
|
|
current_ranges.insert(it->intersected(range));
|
|
}
|
|
}
|
|
|
|
return current_ranges;
|
|
}
|
|
|
|
}
|