build/ci: green builds and tests on all three platforms
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).
This commit is contained in:
@@ -2386,14 +2386,14 @@ TimeRange Node::transform_time_to(TimeRange time, Node *target,
|
||||
Node *from = this;
|
||||
Node *to = target;
|
||||
|
||||
if (dir == k_transform_towards_input) {
|
||||
if (dir == k_towards_input) {
|
||||
std::swap(from, to);
|
||||
}
|
||||
|
||||
std::list<NodeInput> path = find_path(from, to, path_index);
|
||||
|
||||
if (!path.empty()) {
|
||||
if (dir == k_transform_towards_input) {
|
||||
if (dir == k_towards_input) {
|
||||
for (auto it = path.crbegin(); it != path.crend(); it++) {
|
||||
const NodeInput &i = (*it);
|
||||
time = i.node()->input_time_adjustment(i.input(), i.element(),
|
||||
@@ -2614,7 +2614,7 @@ void Node::invalidate_from_keyframe_time_change()
|
||||
|
||||
// Invalidate entire area surrounding the keyframe (either where it currently is, or where it used to be before it
|
||||
// was resorted in the if block above)
|
||||
foreach (const TimeRange &r, invalidate_range) {
|
||||
for (const TimeRange &r : invalidate_range) {
|
||||
parameter_value_changed(key->key_track_ref().input(), r);
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -929,8 +929,8 @@ public:
|
||||
static QString get_category_name(const CategoryID &c);
|
||||
|
||||
enum TransformTimeDirection {
|
||||
k_transform_towards_input,
|
||||
k_transform_towards_output
|
||||
k_towards_input,
|
||||
k_towards_output
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -232,8 +232,6 @@ QHash<QString, QVariant> build_default_values(
|
||||
ofx_type == kOfxParamTypePushButton) {
|
||||
continue;
|
||||
}
|
||||
const auto &props = param.second->getProperties();
|
||||
bool is_secret = props.getIntProperty(kOfxParamPropSecret) != 0;
|
||||
const QString input_id =
|
||||
QString::fromStdString(param.second->getName());
|
||||
if (input_id.isEmpty()) {
|
||||
@@ -263,10 +261,10 @@ clip_label_for_name(const std::string &name,
|
||||
}
|
||||
|
||||
if (desc) {
|
||||
const std::string &label =
|
||||
const std::string ¶m_label =
|
||||
desc->getProps().getStringProperty(kOfxPropLabel);
|
||||
if (!label.empty()) {
|
||||
return QString::fromStdString(label);
|
||||
if (!param_label.empty()) {
|
||||
return QString::fromStdString(param_label);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -432,9 +430,9 @@ olive::plugin::PluginNode::PluginNode(OFX::Host::ImageEffect::Instance *plugin)
|
||||
const int value_count = props.getDimension(kOfxParamPropChoiceEnum);
|
||||
|
||||
for (int i = 0; i < label_count; ++i) {
|
||||
const std::string &label =
|
||||
const std::string &choice_label =
|
||||
props.getStringProperty(kOfxParamPropChoiceOption, i);
|
||||
option_labels.append(QString::fromStdString(label));
|
||||
option_labels.append(QString::fromStdString(choice_label));
|
||||
}
|
||||
|
||||
for (int i = 0; i < value_count; ++i) {
|
||||
|
||||
@@ -62,7 +62,7 @@ public:
|
||||
*/
|
||||
virtual void process_samples(const NodeValueRow &values,
|
||||
const SampleBuffer &input, SampleBuffer &output,
|
||||
int index) const;
|
||||
int index) const override;
|
||||
|
||||
/**
|
||||
* @brief If Value() pushes a GenerateJob, override this function for the image to create
|
||||
@@ -71,7 +71,7 @@ public:
|
||||
*
|
||||
* The destination buffer. It will already be allocated and ready for writing to.
|
||||
*/
|
||||
virtual void generate_frame(FramePtr frame, const GenerateJob &job) const;
|
||||
virtual void generate_frame(FramePtr frame, const GenerateJob &job) const override;
|
||||
|
||||
private:
|
||||
QString sub_category_;
|
||||
|
||||
@@ -377,8 +377,8 @@ void Footage::value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
this, QStringLiteral("length"));
|
||||
|
||||
// Push each stream as a footage job
|
||||
for (int i = 0; i < get_total_stream_count(); i++) {
|
||||
Track::Reference ref = get_reference_from_real_index(i);
|
||||
for (int si = 0; si < get_total_stream_count(); si++) {
|
||||
Track::Reference ref = get_reference_from_real_index(si);
|
||||
FootageJob job(globals.time(), decoder_, filename(), ref.type(),
|
||||
get_length(), globals.loop_mode());
|
||||
|
||||
@@ -427,9 +427,10 @@ void Footage::value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
ProxyManager::k_proxy_ready &&
|
||||
ProxyManager::proxy_filename_has_audio(proxy_path_)) {
|
||||
int audio_rank = 0;
|
||||
for (int i = 0; i < get_total_stream_count(); i++) {
|
||||
for (int sj = 0; sj < get_total_stream_count(); sj++) {
|
||||
const Track::Reference other =
|
||||
get_reference_from_real_index(i);
|
||||
get_reference_from_real_index(sj);
|
||||
|
||||
if (other.type() == Track::k_audio &&
|
||||
get_audio_params(other.index()).stream_index() <
|
||||
ap.stream_index()) {
|
||||
@@ -448,8 +449,8 @@ void Footage::value(const NodeValueRow &value, const NodeGlobals &globals,
|
||||
// Media is offline: push a generated warning frame for each video
|
||||
// stream so missing media is clearly visible in the timeline instead
|
||||
// of a transparent/black hole. generate_frame() draws the slat.
|
||||
for (int i = 0; i < get_total_stream_count(); i++) {
|
||||
Track::Reference ref = get_reference_from_real_index(i);
|
||||
for (int si = 0; si < get_total_stream_count(); si++) {
|
||||
Track::Reference ref = get_reference_from_real_index(si);
|
||||
if (ref.type() != Track::k_video) {
|
||||
continue;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ void SerializedLayoutInfo::to_xml(QXmlStreamWriter *writer) const
|
||||
|
||||
writer->writeStartElement(QStringLiteral("folders"));
|
||||
|
||||
foreach (Folder *folder, open_folders) {
|
||||
for (Folder *folder : open_folders) {
|
||||
writer->writeTextElement(
|
||||
QStringLiteral("folder"),
|
||||
QString::number(reinterpret_cast<quintptr>(folder)));
|
||||
@@ -38,7 +38,7 @@ void SerializedLayoutInfo::to_xml(QXmlStreamWriter *writer) const
|
||||
|
||||
writer->writeStartElement(QStringLiteral("timeline"));
|
||||
|
||||
foreach (Sequence *sequence, open_sequences) {
|
||||
for (Sequence *sequence : open_sequences) {
|
||||
writer->writeTextElement(
|
||||
QStringLiteral("sequence"),
|
||||
QString::number(reinterpret_cast<quintptr>(sequence)));
|
||||
@@ -48,7 +48,7 @@ void SerializedLayoutInfo::to_xml(QXmlStreamWriter *writer) const
|
||||
|
||||
writer->writeStartElement(QStringLiteral("viewers"));
|
||||
|
||||
foreach (ViewerOutput *viewer, open_viewers) {
|
||||
for (ViewerOutput *viewer : open_viewers) {
|
||||
writer->writeTextElement(
|
||||
QStringLiteral("viewer"),
|
||||
QString::number(reinterpret_cast<quintptr>(viewer)));
|
||||
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "timeformat.h"
|
||||
|
||||
#include <QDateTime>
|
||||
#include <QTimeZone>
|
||||
|
||||
namespace olive
|
||||
{
|
||||
@@ -75,7 +76,8 @@ void TimeFormatNode::value(const NodeValueRow &value,
|
||||
qint64 ms_since_epoch = value[k_time_input].to_double() * 1000;
|
||||
bool time_is_local = value[k_local_time_input].to_bool();
|
||||
QDateTime dt = QDateTime::fromMSecsSinceEpoch(
|
||||
ms_since_epoch, time_is_local ? Qt::LocalTime : Qt::UTC);
|
||||
ms_since_epoch,
|
||||
time_is_local ? QTimeZone::systemTimeZone() : QTimeZone::utc());
|
||||
QString format = value[k_format_input].to_string();
|
||||
QString output = dt.toString(format);
|
||||
table->push(NodeValue(NodeValue::k_text, output, this));
|
||||
|
||||
@@ -502,9 +502,7 @@ void NodeTraverser::resolve_jobs(NodeValue &val)
|
||||
}
|
||||
|
||||
val.set_value(tex);
|
||||
} else if (plugin::PluginJob *plugin_job =
|
||||
dynamic_cast<plugin::PluginJob *>(
|
||||
base_job)) {
|
||||
} else if (dynamic_cast<plugin::PluginJob *>(base_job)) {
|
||||
VideoParams tex_params = job_tex->params();
|
||||
// Force internal working format (F32) for plugin processing,
|
||||
// matching FootageJob/GenerateJob behavior.
|
||||
|
||||
Reference in New Issue
Block a user