style: unify identifier naming per updated conventions
Automated with clang-tidy readability-identifier-naming (config added to .clang-tidy) plus scripted passes, per the updated rules now documented in CONTRIBUTING.md: - types (class/struct/enum/alias/template params): PascalCase - functions, variables, members: snake_case (incl. rational -> Rational) - private/protected members: trailing underscore; static member variables likewise (instance_, available_themes_) - constants and enum values: snake_case (kLinear -> k_linear, F32P -> f32p); ALL_CAPS reserved for macros - macros: OAK_ prefix (OLIVE_ADD_TEST/OLIVE_ASSERT/OLIVE_CONFIG -> OAK_ADD_TEST/OAK_ASSERT/OAK_CONFIG, GL_PREAMBLE -> OAK_GL_PREAMBLE, include guards -> OAK_*) - file names: all lowercase (Current/Plugin/OliveHost/OliveClip/ OlivePluginInstance -> current/plugin/olivehost/oliveclip/ oliveplugininstance) - getters share the member name sans underscore, setters set_foo() - Qt and third-party (OpenFX) virtual overrides and framework callbacks keep their original names (exempt in .clang-tidy) Manual follow-ups required where automation could not reach: - string-based QMetaObject/SIGNAL/SLOT references updated to renamed methods (AddTask, CreatedFile, DeleteSpecificFile, moveSelectionUp, ...) - macro bodies referencing renamed methods (OLIVE_CONFIG, NODE_DEFAULT_DESTRUCTOR, MANAGEDDISPLAYWIDGET_*) - self-shadowing locals renamed where signals/methods became same-named (size_changed, worker_count, selected_items, import param, filters) - third_party OFX member/namespace usages restored (OFX::Host::*, _created, _clipPrefsDirty, createInstance, clearPersistentMessage) - STL protocol aliases restored (const_iterator) with .clang-tidy ignore rules; qHash overloads restored Full build and test suite pass: ctest 4/4, ~1960 gtest cases green.
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
|
||||
#include "common/ffmpegutils.h"
|
||||
#include "node/value.h"
|
||||
#include "pluginSupport/OliveHost.h"
|
||||
#include "pluginSupport/OlivePluginInstance.h"
|
||||
#include "pluginSupport/olivehost.h"
|
||||
#include "pluginSupport/oliveplugininstance.h"
|
||||
#include "render/job/pluginjob.h"
|
||||
#include "render/plugin/pluginrenderer.h"
|
||||
#include "render/texture.h"
|
||||
@@ -14,14 +14,14 @@
|
||||
namespace
|
||||
{
|
||||
|
||||
olive::TexturePtr CreateSolidTexture(const olive::VideoParams ¶ms)
|
||||
olive::TexturePtr create_solid_texture(const olive::VideoParams ¶ms)
|
||||
{
|
||||
olive::AVFramePtr frame = olive::CreateAVFramePtr();
|
||||
frame->set_format(olive::FFmpegUtils::GetFFmpegPixelFormat(
|
||||
olive::AVFramePtr frame = olive::create_av_frame_ptr();
|
||||
frame->set_format(olive::FFmpegUtils::get_f_fmpeg_pixel_format(
|
||||
params.format(), params.channel_count()));
|
||||
frame->set_width(params.width());
|
||||
frame->set_height(params.height());
|
||||
if (frame->format() == FB_PIX_FMT_NONE) {
|
||||
if (frame->format() == fb_pix_fmt_none) {
|
||||
return nullptr;
|
||||
}
|
||||
if (frame->get_buffer(0) < 0) {
|
||||
@@ -37,7 +37,7 @@ olive::TexturePtr CreateSolidTexture(const olive::VideoParams ¶ms)
|
||||
}
|
||||
|
||||
olive::TexturePtr texture = std::make_shared<olive::Texture>(params);
|
||||
texture->handleFrame(frame);
|
||||
texture->handle_frame(frame);
|
||||
return texture;
|
||||
}
|
||||
|
||||
@@ -66,7 +66,7 @@ TEST(PluginIntegration, ChromaKeyerCreateAndRender)
|
||||
const QChar separator = QDir::listSeparator();
|
||||
const QStringList paths = raw.split(separator, Qt::SkipEmptyParts);
|
||||
for (const QString &p : paths) {
|
||||
olive::plugin::loadPlugins(p);
|
||||
olive::plugin::load_plugins(p);
|
||||
}
|
||||
|
||||
auto *cache = OFX::Host::PluginCache::getPluginCache();
|
||||
@@ -101,23 +101,23 @@ TEST(PluginIntegration, ChromaKeyerCreateAndRender)
|
||||
ASSERT_TRUE(olive_instance);
|
||||
|
||||
// Use U16 format as the ChromaKeyer plugin expects 16-bit input
|
||||
olive::VideoParams params(320, 240, olive::core::PixelFormat::U16, 4);
|
||||
olive::VideoParams params(320, 240, olive::core::PixelFormat::u16, 4);
|
||||
olive_instance->setVideoParam(params);
|
||||
|
||||
olive::TexturePtr input = CreateSolidTexture(params);
|
||||
olive::TexturePtr input = create_solid_texture(params);
|
||||
ASSERT_TRUE(input);
|
||||
|
||||
olive::NodeValueRow row;
|
||||
row.insert(QString::fromStdString(kOfxImageEffectSimpleSourceClipName),
|
||||
olive::NodeValue(olive::NodeValue::kTexture, input));
|
||||
olive::NodeValue(olive::NodeValue::k_texture, input));
|
||||
row.insert(QStringLiteral("Bg"),
|
||||
olive::NodeValue(olive::NodeValue::kTexture, input));
|
||||
olive::NodeValue(olive::NodeValue::k_texture, input));
|
||||
|
||||
olive::plugin::PluginJob job(instance, nullptr, row);
|
||||
olive::TexturePtr output = std::make_shared<olive::Texture>(params);
|
||||
|
||||
olive::plugin::PluginRenderer renderer(nullptr);
|
||||
renderer.RenderPlugin(input, job, output, params, true, false);
|
||||
renderer.render_plugin(input, job, output, params, true, false);
|
||||
|
||||
EXPECT_TRUE(output->frame());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user