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:
2026-07-19 16:10:54 +08:00
parent cb1718a103
commit bb40b4923e
1014 changed files with 44257 additions and 44220 deletions
+246 -246
View File
@@ -22,18 +22,18 @@ namespace
{
// Project save/load and cache paths go through the DiskManager singleton
void EnsureDiskManager(bool *created)
void ensure_disk_manager(bool *created)
{
*created = (olive::DiskManager::instance() == nullptr);
if (*created) {
olive::DiskManager::CreateInstance();
olive::DiskManager::create_instance();
}
}
void ReleaseDiskManager(bool created)
void release_disk_manager(bool created)
{
if (created) {
olive::DiskManager::DestroyInstance();
olive::DiskManager::destroy_instance();
}
}
@@ -43,56 +43,56 @@ TEST(MultiCamNode, DefaultState)
{
olive::MultiCamNode node;
EXPECT_EQ(node.Name(), QStringLiteral("Multi-Cam"));
EXPECT_EQ(node.name(), QStringLiteral("Multi-Cam"));
EXPECT_EQ(node.id(), QStringLiteral("org.olivevideoeditor.Olive.multicam"));
EXPECT_TRUE(node.Category().contains(olive::Node::kCategoryTimeline));
EXPECT_TRUE(node.category().contains(olive::Node::k_category_timeline));
// The "arraystart" property only hints the UI; the sources array itself
// starts empty
EXPECT_EQ(node.GetSourceCount(), 0);
EXPECT_EQ(node.GetCurrentSource(), 0);
EXPECT_EQ(node.get_source_count(), 0);
EXPECT_EQ(node.get_current_source(), 0);
// Sequence type selector stays hidden until a sequence is connected
EXPECT_TRUE(node.GetInputFlags(olive::MultiCamNode::kSequenceTypeInput) &
olive::kInputFlagHidden);
EXPECT_TRUE(node.get_input_flags(olive::MultiCamNode::k_sequence_type_input) &
olive::k_input_flag_hidden);
}
TEST(MultiCamNode, ActiveElementsSelectCurrentSource)
{
olive::MultiCamNode node;
node.InputArrayResize(olive::MultiCamNode::kSourcesInput, 3);
ASSERT_EQ(node.GetSourceCount(), 3);
node.input_array_resize(olive::MultiCamNode::k_sources_input, 3);
ASSERT_EQ(node.get_source_count(), 3);
node.SetStandardValue(olive::MultiCamNode::kCurrentInput, 1);
node.set_standard_value(olive::MultiCamNode::k_current_input, 1);
olive::Node::ActiveElements active = node.GetActiveElementsAtTime(
olive::MultiCamNode::kSourcesInput, olive::TimeRange());
EXPECT_EQ(active.mode(), olive::Node::ActiveElements::kSpecified);
olive::Node::ActiveElements active = node.get_active_elements_at_time(
olive::MultiCamNode::k_sources_input, olive::TimeRange());
EXPECT_EQ(active.mode(), olive::Node::ActiveElements::k_specified);
ASSERT_EQ(active.elements().size(), 1);
EXPECT_EQ(active.elements().front(), 1);
// Any other input defers to the base implementation
olive::Node::ActiveElements all = node.GetActiveElementsAtTime(
olive::MultiCamNode::kCurrentInput, olive::TimeRange());
EXPECT_EQ(all.mode(), olive::Node::ActiveElements::kAllElements);
olive::Node::ActiveElements all = node.get_active_elements_at_time(
olive::MultiCamNode::k_current_input, olive::TimeRange());
EXPECT_EQ(all.mode(), olive::Node::ActiveElements::k_all_elements);
}
TEST(MultiCamNode, ActiveElementsOutOfRangeAreEmpty)
{
olive::MultiCamNode node;
node.InputArrayResize(olive::MultiCamNode::kSourcesInput, 3);
node.input_array_resize(olive::MultiCamNode::k_sources_input, 3);
node.SetStandardValue(olive::MultiCamNode::kCurrentInput, 5);
EXPECT_EQ(node.GetActiveElementsAtTime(olive::MultiCamNode::kSourcesInput,
node.set_standard_value(olive::MultiCamNode::k_current_input, 5);
EXPECT_EQ(node.get_active_elements_at_time(olive::MultiCamNode::k_sources_input,
olive::TimeRange())
.mode(),
olive::Node::ActiveElements::kNoElements);
olive::Node::ActiveElements::k_no_elements);
node.SetStandardValue(olive::MultiCamNode::kCurrentInput, -1);
EXPECT_EQ(node.GetActiveElementsAtTime(olive::MultiCamNode::kSourcesInput,
node.set_standard_value(olive::MultiCamNode::k_current_input, -1);
EXPECT_EQ(node.get_active_elements_at_time(olive::MultiCamNode::k_sources_input,
olive::TimeRange())
.mode(),
olive::Node::ActiveElements::kNoElements);
olive::Node::ActiveElements::k_no_elements);
}
TEST(MultiCamNode, RowsAndColumnsGrowToFitSources)
@@ -101,12 +101,12 @@ TEST(MultiCamNode, RowsAndColumnsGrowToFitSources)
int sources;
int rows;
int cols;
} kCases[] = { { 1, 1, 1 }, { 2, 1, 2 }, { 3, 2, 2 }, { 4, 2, 2 },
} k_cases[] = { { 1, 1, 1 }, { 2, 1, 2 }, { 3, 2, 2 }, { 4, 2, 2 },
{ 5, 2, 3 }, { 6, 2, 3 }, { 9, 3, 3 }, { 12, 3, 4 } };
for (const auto &c : kCases) {
for (const auto &c : k_cases) {
int rows = 0, cols = 0;
olive::MultiCamNode::GetRowsAndColumns(c.sources, &rows, &cols);
olive::MultiCamNode::get_rows_and_columns(c.sources, &rows, &cols);
EXPECT_EQ(rows, c.rows) << "sources=" << c.sources;
EXPECT_EQ(cols, c.cols) << "sources=" << c.sources;
}
@@ -114,7 +114,7 @@ TEST(MultiCamNode, RowsAndColumnsGrowToFitSources)
// The grid always fits all sources and stays as square as possible
for (int s = 1; s <= 16; s++) {
int rows = 0, cols = 0;
olive::MultiCamNode::GetRowsAndColumns(s, &rows, &cols);
olive::MultiCamNode::get_rows_and_columns(s, &rows, &cols);
EXPECT_GE(rows * cols, s);
EXPECT_LE(rows, cols);
}
@@ -123,16 +123,16 @@ TEST(MultiCamNode, RowsAndColumnsGrowToFitSources)
TEST(MultiCamNode, RowColumnIndexRoundTrip)
{
int row = -1, col = -1;
olive::MultiCamNode::IndexToRowCols(5, 2, 3, &row, &col);
olive::MultiCamNode::index_to_row_cols(5, 2, 3, &row, &col);
EXPECT_EQ(row, 1);
EXPECT_EQ(col, 2);
EXPECT_EQ(olive::MultiCamNode::RowsColsToIndex(1, 2, 2, 3), 5);
EXPECT_EQ(olive::MultiCamNode::rows_cols_to_index(1, 2, 2, 3), 5);
const int kRows = 3;
const int kCols = 4;
for (int i = 0; i < kRows * kCols; i++) {
olive::MultiCamNode::IndexToRowCols(i, kRows, kCols, &row, &col);
EXPECT_EQ(olive::MultiCamNode::RowsColsToIndex(row, col, kRows, kCols),
const int k_rows = 3;
const int k_cols = 4;
for (int i = 0; i < k_rows * k_cols; i++) {
olive::MultiCamNode::index_to_row_cols(i, k_rows, k_cols, &row, &col);
EXPECT_EQ(olive::MultiCamNode::rows_cols_to_index(row, col, k_rows, k_cols),
i);
}
}
@@ -140,23 +140,23 @@ TEST(MultiCamNode, RowColumnIndexRoundTrip)
TEST(MultiCamNode, RetranslateSetsInputNamesAndComboStrings)
{
olive::MultiCamNode node;
node.Retranslate();
node.retranslate();
EXPECT_EQ(node.GetInputName(olive::MultiCamNode::kCurrentInput),
EXPECT_EQ(node.get_input_name(olive::MultiCamNode::k_current_input),
QStringLiteral("Current"));
EXPECT_EQ(node.GetInputName(olive::MultiCamNode::kSourcesInput),
EXPECT_EQ(node.get_input_name(olive::MultiCamNode::k_sources_input),
QStringLiteral("Sources"));
EXPECT_EQ(node.GetInputName(olive::MultiCamNode::kSequenceInput),
EXPECT_EQ(node.get_input_name(olive::MultiCamNode::k_sequence_input),
QStringLiteral("Sequence"));
EXPECT_EQ(node.GetInputName(olive::MultiCamNode::kSequenceTypeInput),
EXPECT_EQ(node.get_input_name(olive::MultiCamNode::k_sequence_type_input),
QStringLiteral("Sequence Type"));
EXPECT_EQ(
node.GetComboBoxStrings(olive::MultiCamNode::kSequenceTypeInput),
node.get_combo_box_strings(olive::MultiCamNode::k_sequence_type_input),
(QStringList{ QStringLiteral("Video"), QStringLiteral("Audio") }));
// No sources yet, so no labels
EXPECT_TRUE(node.GetComboBoxStrings(olive::MultiCamNode::kCurrentInput)
EXPECT_TRUE(node.get_combo_box_strings(olive::MultiCamNode::k_current_input)
.isEmpty());
}
@@ -164,10 +164,10 @@ TEST(MultiCamNode, IgnoreInputsForRenderingSkipsSequenceInput)
{
olive::MultiCamNode node;
EXPECT_TRUE(node.IgnoreInputsForRendering().contains(
olive::MultiCamNode::kSequenceInput));
EXPECT_FALSE(node.IgnoreInputsForRendering().contains(
olive::MultiCamNode::kSourcesInput));
EXPECT_TRUE(node.ignore_inputs_for_rendering().contains(
olive::MultiCamNode::k_sequence_input));
EXPECT_FALSE(node.ignore_inputs_for_rendering().contains(
olive::MultiCamNode::k_sources_input));
}
TEST(MultiCamNode, ValuePushesFirstSourceArrayElement)
@@ -175,23 +175,23 @@ TEST(MultiCamNode, ValuePushesFirstSourceArrayElement)
olive::MultiCamNode node;
olive::NodeValueArray sources;
sources[0] = olive::NodeValue(olive::NodeValue::kText,
sources[0] = olive::NodeValue(olive::NodeValue::k_text,
QStringLiteral("cam A"), &node);
sources[1] = olive::NodeValue(olive::NodeValue::kText,
sources[1] = olive::NodeValue(olive::NodeValue::k_text,
QStringLiteral("cam B"), &node);
olive::NodeValueRow row;
row.insert(olive::MultiCamNode::kSourcesInput,
olive::NodeValue(olive::NodeValue::kNone,
row.insert(olive::MultiCamNode::k_sources_input,
olive::NodeValue(olive::NodeValue::k_none,
QVariant::fromValue(sources), &node, true));
olive::NodeValueTable table;
node.Value(row, olive::NodeGlobals(), &table);
node.value(row, olive::NodeGlobals(), &table);
// Value() forwards the first array element; the traverser filters the
// array down to the active element before Value() is ever called
ASSERT_EQ(table.Count(), 1);
EXPECT_EQ(table.at(0).toString(), QStringLiteral("cam A"));
ASSERT_EQ(table.count(), 1);
EXPECT_EQ(table.at(0).to_string(), QStringLiteral("cam A"));
}
TEST(MultiCamNode, ValueWithoutSourcesLeavesTableEmpty)
@@ -199,118 +199,118 @@ TEST(MultiCamNode, ValueWithoutSourcesLeavesTableEmpty)
olive::MultiCamNode node;
olive::NodeValueTable table;
node.Value(olive::NodeValueRow(), olive::NodeGlobals(), &table);
node.value(olive::NodeValueRow(), olive::NodeGlobals(), &table);
EXPECT_TRUE(table.isEmpty());
}
TEST(MultiCamNode, ConnectedSequenceProvidesTrackSources)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
olive::Project project;
project.Initialize();
project.initialize();
auto *sequence = new olive::Sequence();
sequence->setParent(&project);
auto *node = new olive::MultiCamNode();
node->setParent(&project);
node->SetSequenceType(olive::Track::kVideo);
node->set_sequence_type(olive::Track::k_video);
olive::Node::ConnectEdge(
sequence, olive::NodeInput(node, olive::MultiCamNode::kSequenceInput));
olive::Node::connect_edge(
sequence, olive::NodeInput(node, olive::MultiCamNode::k_sequence_input));
// Connecting a sequence exposes the type selector
EXPECT_FALSE(node->GetInputFlags(olive::MultiCamNode::kSequenceTypeInput) &
olive::kInputFlagHidden);
EXPECT_FALSE(node->get_input_flags(olive::MultiCamNode::k_sequence_type_input) &
olive::k_input_flag_hidden);
// The sequence has no tracks yet
EXPECT_EQ(node->GetSourceCount(), 0);
EXPECT_EQ(node->get_source_count(), 0);
olive::TrackList *video_list = sequence->track_list(olive::Track::kVideo);
olive::TrackList *video_list = sequence->track_list(olive::Track::k_video);
video_list->ArrayAppend();
video_list->array_append();
auto *track_a = new olive::Track();
track_a->setParent(&project);
olive::Node::ConnectEdge(track_a, video_list->track_input(0));
olive::Node::connect_edge(track_a, video_list->track_input(0));
video_list->ArrayAppend();
video_list->array_append();
auto *track_b = new olive::Track();
track_b->setParent(&project);
olive::Node::ConnectEdge(track_b, video_list->track_input(1));
olive::Node::connect_edge(track_b, video_list->track_input(1));
// Sources are now pulled from the sequence's track list
ASSERT_EQ(node->GetSourceCount(), 2);
EXPECT_EQ(node->GetConnectedRenderOutput(olive::MultiCamNode::kSourcesInput,
ASSERT_EQ(node->get_source_count(), 2);
EXPECT_EQ(node->get_connected_render_output(olive::MultiCamNode::k_sources_input,
0),
track_a);
EXPECT_EQ(node->GetConnectedRenderOutput(olive::MultiCamNode::kSourcesInput,
EXPECT_EQ(node->get_connected_render_output(olive::MultiCamNode::k_sources_input,
1),
track_b);
EXPECT_TRUE(
node->IsInputConnectedForRender(olive::MultiCamNode::kSourcesInput, 0));
node->is_input_connected_for_render(olive::MultiCamNode::k_sources_input, 0));
EXPECT_TRUE(
node->IsInputConnectedForRender(olive::MultiCamNode::kSourcesInput, 1));
node->is_input_connected_for_render(olive::MultiCamNode::k_sources_input, 1));
// Past the end of the track list the overrides defer to the base class
EXPECT_FALSE(
node->IsInputConnectedForRender(olive::MultiCamNode::kSourcesInput, 2));
EXPECT_EQ(node->GetConnectedRenderOutput(olive::MultiCamNode::kSourcesInput,
node->is_input_connected_for_render(olive::MultiCamNode::k_sources_input, 2));
EXPECT_EQ(node->get_connected_render_output(olive::MultiCamNode::k_sources_input,
2),
nullptr);
node->SetStandardValue(olive::MultiCamNode::kCurrentInput, 1);
olive::Node::ActiveElements active = node->GetActiveElementsAtTime(
olive::MultiCamNode::kSourcesInput, olive::TimeRange());
EXPECT_EQ(active.mode(), olive::Node::ActiveElements::kSpecified);
node->set_standard_value(olive::MultiCamNode::k_current_input, 1);
olive::Node::ActiveElements active = node->get_active_elements_at_time(
olive::MultiCamNode::k_sources_input, olive::TimeRange());
EXPECT_EQ(active.mode(), olive::Node::ActiveElements::k_specified);
ASSERT_EQ(active.elements().size(), 1);
EXPECT_EQ(active.elements().front(), 1);
// Retranslate names each angle after its track
node->Retranslate();
EXPECT_EQ(node->GetComboBoxStrings(olive::MultiCamNode::kCurrentInput),
node->retranslate();
EXPECT_EQ(node->get_combo_box_strings(olive::MultiCamNode::k_current_input),
(QStringList{ QStringLiteral("1: Video Track 0"),
QStringLiteral("2: Video Track 1") }));
// Disconnecting hides the type selector and falls back to the sources array
olive::Node::DisconnectEdge(
sequence, olive::NodeInput(node, olive::MultiCamNode::kSequenceInput));
EXPECT_TRUE(node->GetInputFlags(olive::MultiCamNode::kSequenceTypeInput) &
olive::kInputFlagHidden);
olive::Node::disconnect_edge(
sequence, olive::NodeInput(node, olive::MultiCamNode::k_sequence_input));
EXPECT_TRUE(node->get_input_flags(olive::MultiCamNode::k_sequence_type_input) &
olive::k_input_flag_hidden);
// With nothing appended to the sources array, it falls back to zero
EXPECT_EQ(node->GetSourceCount(), 0);
EXPECT_EQ(node->get_source_count(), 0);
}
TEST(MultiCamNode, SequenceTypeSelectsTrackList)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
olive::Project project;
project.Initialize();
project.initialize();
auto *sequence = new olive::Sequence();
sequence->setParent(&project);
auto *node = new olive::MultiCamNode();
node->setParent(&project);
olive::Node::ConnectEdge(
sequence, olive::NodeInput(node, olive::MultiCamNode::kSequenceInput));
olive::Node::connect_edge(
sequence, olive::NodeInput(node, olive::MultiCamNode::k_sequence_input));
node->SetSequenceType(olive::Track::kAudio);
EXPECT_EQ(node->GetSourceCount(), 0);
node->set_sequence_type(olive::Track::k_audio);
EXPECT_EQ(node->get_source_count(), 0);
olive::TrackList *audio_list = sequence->track_list(olive::Track::kAudio);
audio_list->ArrayAppend();
olive::TrackList *audio_list = sequence->track_list(olive::Track::k_audio);
audio_list->array_append();
auto *track = new olive::Track();
track->setParent(&project);
olive::Node::ConnectEdge(track, audio_list->track_input(0));
olive::Node::connect_edge(track, audio_list->track_input(0));
EXPECT_EQ(node->GetSourceCount(), 1);
EXPECT_EQ(node->GetConnectedRenderOutput(olive::MultiCamNode::kSourcesInput,
EXPECT_EQ(node->get_source_count(), 1);
EXPECT_EQ(node->get_connected_render_output(olive::MultiCamNode::k_sources_input,
0),
track);
// Switching the type swaps which track list feeds the sources
node->SetSequenceType(olive::Track::kVideo);
EXPECT_EQ(node->GetSourceCount(), 0);
node->set_sequence_type(olive::Track::k_video);
EXPECT_EQ(node->get_source_count(), 0);
}
TEST(FootageDescription, DefaultStateIsInvalid)
@@ -318,79 +318,79 @@ TEST(FootageDescription, DefaultStateIsInvalid)
olive::FootageDescription desc;
EXPECT_TRUE(desc.decoder().isEmpty());
EXPECT_EQ(desc.GetStreamCount(), 0);
EXPECT_TRUE(desc.GetVideoStreams().isEmpty());
EXPECT_TRUE(desc.GetAudioStreams().isEmpty());
EXPECT_TRUE(desc.GetSubtitleStreams().isEmpty());
EXPECT_FALSE(desc.HasSourceStartTime());
EXPECT_FALSE(desc.IsValid());
EXPECT_EQ(desc.get_stream_count(), 0);
EXPECT_TRUE(desc.get_video_streams().isEmpty());
EXPECT_TRUE(desc.get_audio_streams().isEmpty());
EXPECT_TRUE(desc.get_subtitle_streams().isEmpty());
EXPECT_FALSE(desc.has_source_start_time());
EXPECT_FALSE(desc.is_valid());
}
TEST(FootageDescription, ValidityRequiresDecoderAndStream)
{
olive::VideoParams video(640, 480, olive::rational(1, 24),
olive::core::PixelFormat::U8, 4);
olive::VideoParams video(640, 480, olive::Rational(1, 24),
olive::core::PixelFormat::u8, 4);
video.set_stream_index(0);
// A stream without a decoder name is not enough
olive::FootageDescription no_decoder;
no_decoder.AddVideoStream(video);
EXPECT_FALSE(no_decoder.IsValid());
no_decoder.add_video_stream(video);
EXPECT_FALSE(no_decoder.is_valid());
// A decoder without any stream is not enough either
olive::FootageDescription desc(QStringLiteral("fakedecoder"));
EXPECT_FALSE(desc.IsValid());
EXPECT_FALSE(desc.is_valid());
desc.AddVideoStream(video);
EXPECT_TRUE(desc.IsValid());
desc.add_video_stream(video);
EXPECT_TRUE(desc.is_valid());
}
TEST(FootageDescription, StreamTypeLookup)
{
olive::FootageDescription desc(QStringLiteral("fakedecoder"));
olive::VideoParams video(1920, 1080, olive::rational(1, 24),
olive::core::PixelFormat::U8, 4);
olive::VideoParams video(1920, 1080, olive::Rational(1, 24),
olive::core::PixelFormat::u8, 4);
video.set_stream_index(0);
desc.AddVideoStream(video);
desc.add_video_stream(video);
olive::core::AudioParams audio(48000, olive::core::kChannelLayoutStereo,
olive::core::SampleFormat::F32P);
olive::core::AudioParams audio(48000, olive::core::k_channel_layout_stereo,
olive::core::SampleFormat::f32_p);
audio.set_stream_index(1);
desc.AddAudioStream(audio);
desc.add_audio_stream(audio);
olive::SubtitleParams subs;
subs.set_stream_index(2);
subs.push_back(olive::Subtitle(olive::TimeRange(olive::rational(0),
olive::rational(3)),
subs.push_back(olive::Subtitle(olive::TimeRange(olive::Rational(0),
olive::Rational(3)),
QStringLiteral("subtitle text")));
desc.AddSubtitleStream(subs);
desc.add_subtitle_stream(subs);
desc.SetStreamCount(3);
desc.set_stream_count(3);
EXPECT_EQ(desc.decoder(), QStringLiteral("fakedecoder"));
EXPECT_EQ(desc.GetStreamCount(), 3);
EXPECT_EQ(desc.get_stream_count(), 3);
EXPECT_TRUE(desc.StreamIsVideo(0));
EXPECT_FALSE(desc.StreamIsVideo(1));
EXPECT_TRUE(desc.StreamIsAudio(1));
EXPECT_FALSE(desc.StreamIsAudio(2));
EXPECT_TRUE(desc.StreamIsSubtitle(2));
EXPECT_FALSE(desc.StreamIsSubtitle(0));
EXPECT_TRUE(desc.stream_is_video(0));
EXPECT_FALSE(desc.stream_is_video(1));
EXPECT_TRUE(desc.stream_is_audio(1));
EXPECT_FALSE(desc.stream_is_audio(2));
EXPECT_TRUE(desc.stream_is_subtitle(2));
EXPECT_FALSE(desc.stream_is_subtitle(0));
EXPECT_TRUE(desc.HasStreamIndex(0));
EXPECT_TRUE(desc.HasStreamIndex(1));
EXPECT_TRUE(desc.HasStreamIndex(2));
EXPECT_FALSE(desc.HasStreamIndex(3));
EXPECT_TRUE(desc.has_stream_index(0));
EXPECT_TRUE(desc.has_stream_index(1));
EXPECT_TRUE(desc.has_stream_index(2));
EXPECT_FALSE(desc.has_stream_index(3));
EXPECT_EQ(desc.GetTypeOfStream(0), olive::Track::kVideo);
EXPECT_EQ(desc.GetTypeOfStream(1), olive::Track::kAudio);
EXPECT_EQ(desc.GetTypeOfStream(2), olive::Track::kSubtitle);
EXPECT_EQ(desc.GetTypeOfStream(99), olive::Track::kNone);
EXPECT_EQ(desc.get_type_of_stream(0), olive::Track::k_video);
EXPECT_EQ(desc.get_type_of_stream(1), olive::Track::k_audio);
EXPECT_EQ(desc.get_type_of_stream(2), olive::Track::k_subtitle);
EXPECT_EQ(desc.get_type_of_stream(99), olive::Track::k_none);
ASSERT_EQ(desc.GetVideoStreams().size(), 1);
ASSERT_EQ(desc.GetAudioStreams().size(), 1);
ASSERT_EQ(desc.GetSubtitleStreams().size(), 1);
ASSERT_EQ(desc.get_video_streams().size(), 1);
ASSERT_EQ(desc.get_audio_streams().size(), 1);
ASSERT_EQ(desc.get_subtitle_streams().size(), 1);
}
TEST(FootageDescription, SaveLoadRoundTrip)
@@ -402,77 +402,77 @@ TEST(FootageDescription, SaveLoadRoundTrip)
olive::FootageDescription desc(QStringLiteral("fakedecoder"));
olive::VideoParams video(1920, 1080, olive::rational(1, 24),
olive::core::PixelFormat::U8, 4);
olive::VideoParams video(1920, 1080, olive::Rational(1, 24),
olive::core::PixelFormat::u8, 4);
video.set_stream_index(0);
video.set_duration(48);
desc.AddVideoStream(video);
desc.add_video_stream(video);
olive::core::AudioParams audio(48000, olive::core::kChannelLayoutStereo,
olive::core::SampleFormat::F32P);
olive::core::AudioParams audio(48000, olive::core::k_channel_layout_stereo,
olive::core::SampleFormat::f32_p);
audio.set_stream_index(1);
audio.set_duration(96000);
desc.AddAudioStream(audio);
desc.add_audio_stream(audio);
olive::SubtitleParams subs;
subs.set_stream_index(2);
subs.push_back(olive::Subtitle(olive::TimeRange(olive::rational(0),
olive::rational(3)),
subs.push_back(olive::Subtitle(olive::TimeRange(olive::Rational(0),
olive::Rational(3)),
QStringLiteral("subtitle text")));
desc.AddSubtitleStream(subs);
desc.add_subtitle_stream(subs);
desc.SetStreamCount(3);
desc.set_stream_count(3);
ASSERT_TRUE(desc.Save(path));
ASSERT_TRUE(desc.save(path));
olive::FootageDescription loaded;
ASSERT_TRUE(loaded.Load(path));
ASSERT_TRUE(loaded.load(path));
EXPECT_TRUE(loaded.IsValid());
EXPECT_TRUE(loaded.is_valid());
EXPECT_EQ(loaded.decoder(), QStringLiteral("fakedecoder"));
EXPECT_EQ(loaded.GetStreamCount(), 3);
EXPECT_EQ(loaded.get_stream_count(), 3);
ASSERT_EQ(loaded.GetVideoStreams().size(), 1);
const olive::VideoParams &loaded_video = loaded.GetVideoStreams().first();
ASSERT_EQ(loaded.get_video_streams().size(), 1);
const olive::VideoParams &loaded_video = loaded.get_video_streams().first();
EXPECT_EQ(loaded_video.width(), 1920);
EXPECT_EQ(loaded_video.height(), 1080);
EXPECT_EQ(loaded_video.stream_index(), 0);
EXPECT_EQ(loaded_video.duration(), video.duration());
EXPECT_EQ(loaded_video.time_base(), video.time_base());
ASSERT_EQ(loaded.GetAudioStreams().size(), 1);
ASSERT_EQ(loaded.get_audio_streams().size(), 1);
const olive::core::AudioParams &loaded_audio =
loaded.GetAudioStreams().first();
loaded.get_audio_streams().first();
EXPECT_EQ(loaded_audio.sample_rate(), 48000);
EXPECT_EQ(loaded_audio.channel_layout(), olive::core::kChannelLayoutStereo);
EXPECT_EQ(loaded_audio.channel_layout(), olive::core::k_channel_layout_stereo);
EXPECT_EQ(loaded_audio.stream_index(), 1);
EXPECT_EQ(loaded_audio.duration(), audio.duration());
ASSERT_EQ(loaded.GetSubtitleStreams().size(), 1);
ASSERT_EQ(loaded.get_subtitle_streams().size(), 1);
const olive::SubtitleParams &loaded_subs =
loaded.GetSubtitleStreams().first();
loaded.get_subtitle_streams().first();
EXPECT_EQ(loaded_subs.stream_index(), 2);
ASSERT_EQ(loaded_subs.size(), 1);
EXPECT_EQ(loaded_subs.front().text(), QStringLiteral("subtitle text"));
EXPECT_EQ(loaded_subs.front().time().out(), olive::rational(3));
EXPECT_EQ(loaded_subs.front().time().out(), olive::Rational(3));
}
TEST(FootageDescription, LoadMissingFileFailsAndResetsState)
{
olive::FootageDescription desc(QStringLiteral("stale"));
olive::VideoParams video(640, 480, olive::rational(1, 24),
olive::core::PixelFormat::U8, 4);
olive::VideoParams video(640, 480, olive::Rational(1, 24),
olive::core::PixelFormat::u8, 4);
video.set_stream_index(0);
desc.AddVideoStream(video);
ASSERT_TRUE(desc.IsValid());
desc.add_video_stream(video);
ASSERT_TRUE(desc.is_valid());
EXPECT_FALSE(
desc.Load(QStringLiteral("/definitely/nonexistent/cache.xml")));
desc.load(QStringLiteral("/definitely/nonexistent/cache.xml")));
// A failed load must not leave stale streams behind
EXPECT_TRUE(desc.decoder().isEmpty());
EXPECT_TRUE(desc.GetVideoStreams().isEmpty());
EXPECT_FALSE(desc.IsValid());
EXPECT_TRUE(desc.get_video_streams().isEmpty());
EXPECT_FALSE(desc.is_valid());
}
TEST(FootageDescription, LoadRejectsMismatchedVersion)
@@ -490,23 +490,23 @@ TEST(FootageDescription, LoadRejectsMismatchedVersion)
file.close();
olive::FootageDescription desc(QStringLiteral("stale"));
olive::VideoParams video(640, 480, olive::rational(1, 24),
olive::core::PixelFormat::U8, 4);
olive::VideoParams video(640, 480, olive::Rational(1, 24),
olive::core::PixelFormat::u8, 4);
video.set_stream_index(0);
desc.AddVideoStream(video);
desc.add_video_stream(video);
EXPECT_FALSE(desc.Load(path));
EXPECT_FALSE(desc.load(path));
EXPECT_TRUE(desc.decoder().isEmpty());
EXPECT_FALSE(desc.IsValid());
EXPECT_FALSE(desc.is_valid());
}
TEST(ProjectSerializer, FileRoundTripPreservesMultiCamNode)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
bool created_disk_manager = false;
EnsureDiskManager(&created_disk_manager);
olive::NodeFactory::Initialize();
olive::ProjectSerializer::Initialize();
ensure_disk_manager(&created_disk_manager);
olive::NodeFactory::initialize();
olive::ProjectSerializer::initialize();
QTemporaryDir dir;
ASSERT_TRUE(dir.isValid());
@@ -514,18 +514,18 @@ TEST(ProjectSerializer, FileRoundTripPreservesMultiCamNode)
QDir(dir.path()).filePath(QStringLiteral("multicam.ove"));
olive::Project project;
project.Initialize();
project.initialize();
auto *node = new olive::MultiCamNode();
node->SetLabel(QStringLiteral("Angles"));
node->SetStandardValue(olive::MultiCamNode::kCurrentInput, 2);
node->set_label(QStringLiteral("Angles"));
node->set_standard_value(olive::MultiCamNode::k_current_input, 2);
node->setParent(&project);
olive::ProjectSerializer::Result save_result =
olive::ProjectSerializer::Save(olive::ProjectSerializer::SaveData(
olive::ProjectSerializer::kProject,
olive::ProjectSerializer::save(olive::ProjectSerializer::SaveData(
olive::ProjectSerializer::k_project,
&project, filename),
false);
ASSERT_EQ(save_result.code(), olive::ProjectSerializer::kSuccess);
ASSERT_EQ(save_result.code(), olive::ProjectSerializer::k_success);
ASSERT_TRUE(QFile::exists(filename));
// An uncompressed project is plain XML
@@ -536,9 +536,9 @@ TEST(ProjectSerializer, FileRoundTripPreservesMultiCamNode)
olive::Project loaded_project;
olive::ProjectSerializer::Result load_result =
olive::ProjectSerializer::Load(&loaded_project, filename,
olive::ProjectSerializer::kProject);
ASSERT_EQ(load_result.code(), olive::ProjectSerializer::kSuccess);
olive::ProjectSerializer::load(&loaded_project, filename,
olive::ProjectSerializer::k_project);
ASSERT_EQ(load_result.code(), olive::ProjectSerializer::k_success);
olive::MultiCamNode *loaded_node = nullptr;
foreach (olive::Node *n, loaded_project.nodes()) {
@@ -547,21 +547,21 @@ TEST(ProjectSerializer, FileRoundTripPreservesMultiCamNode)
}
}
ASSERT_NE(loaded_node, nullptr);
EXPECT_EQ(loaded_node->GetLabel(), QStringLiteral("Angles"));
EXPECT_EQ(loaded_node->GetCurrentSource(), 2);
EXPECT_EQ(loaded_node->get_label(), QStringLiteral("Angles"));
EXPECT_EQ(loaded_node->get_current_source(), 2);
olive::ProjectSerializer::Destroy();
olive::NodeFactory::Destroy();
ReleaseDiskManager(created_disk_manager);
olive::ProjectSerializer::destroy();
olive::NodeFactory::destroy();
release_disk_manager(created_disk_manager);
}
TEST(ProjectSerializer, CompressedFileRoundTrip)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
bool created_disk_manager = false;
EnsureDiskManager(&created_disk_manager);
olive::NodeFactory::Initialize();
olive::ProjectSerializer::Initialize();
ensure_disk_manager(&created_disk_manager);
olive::NodeFactory::initialize();
olive::ProjectSerializer::initialize();
QTemporaryDir dir;
ASSERT_TRUE(dir.isValid());
@@ -569,17 +569,17 @@ TEST(ProjectSerializer, CompressedFileRoundTrip)
QDir(dir.path()).filePath(QStringLiteral("compressed.ove"));
olive::Project project;
project.Initialize();
project.initialize();
auto *node = new olive::MultiCamNode();
node->SetLabel(QStringLiteral("Compressed"));
node->set_label(QStringLiteral("Compressed"));
node->setParent(&project);
olive::ProjectSerializer::Result save_result =
olive::ProjectSerializer::Save(olive::ProjectSerializer::SaveData(
olive::ProjectSerializer::kProject,
olive::ProjectSerializer::save(olive::ProjectSerializer::SaveData(
olive::ProjectSerializer::k_project,
&project, filename),
true);
ASSERT_EQ(save_result.code(), olive::ProjectSerializer::kSuccess);
ASSERT_EQ(save_result.code(), olive::ProjectSerializer::k_success);
// Compressed projects are marked with the OVEC signature
QFile raw(filename);
@@ -589,41 +589,41 @@ TEST(ProjectSerializer, CompressedFileRoundTrip)
olive::Project loaded_project;
olive::ProjectSerializer::Result load_result =
olive::ProjectSerializer::Load(&loaded_project, filename,
olive::ProjectSerializer::kProject);
ASSERT_EQ(load_result.code(), olive::ProjectSerializer::kSuccess);
olive::ProjectSerializer::load(&loaded_project, filename,
olive::ProjectSerializer::k_project);
ASSERT_EQ(load_result.code(), olive::ProjectSerializer::k_success);
bool found = false;
foreach (olive::Node *n, loaded_project.nodes()) {
if (dynamic_cast<olive::MultiCamNode *>(n)) {
found = true;
EXPECT_EQ(n->GetLabel(), QStringLiteral("Compressed"));
EXPECT_EQ(n->get_label(), QStringLiteral("Compressed"));
break;
}
}
EXPECT_TRUE(found);
olive::ProjectSerializer::Destroy();
olive::NodeFactory::Destroy();
ReleaseDiskManager(created_disk_manager);
olive::ProjectSerializer::destroy();
olive::NodeFactory::destroy();
release_disk_manager(created_disk_manager);
}
TEST(ProjectSerializer, LoadNonexistentFileFails)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
olive::Project project;
olive::ProjectSerializer::Result result = olive::ProjectSerializer::Load(
olive::ProjectSerializer::Result result = olive::ProjectSerializer::load(
&project, QStringLiteral("/definitely/nonexistent/project.ove"),
olive::ProjectSerializer::kProject);
olive::ProjectSerializer::k_project);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kFileError);
EXPECT_FALSE(result.GetDetails().isEmpty());
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_file_error);
EXPECT_FALSE(result.get_details().isEmpty());
}
TEST(ProjectSerializer, LoadGarbageXmlReportsUnknownVersion)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
QTemporaryDir dir;
ASSERT_TRUE(dir.isValid());
@@ -635,55 +635,55 @@ TEST(ProjectSerializer, LoadGarbageXmlReportsUnknownVersion)
file.close();
olive::Project project;
olive::ProjectSerializer::Result result = olive::ProjectSerializer::Load(
&project, filename, olive::ProjectSerializer::kProject);
olive::ProjectSerializer::Result result = olive::ProjectSerializer::load(
&project, filename, olive::ProjectSerializer::k_project);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kUnknownVersion);
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_unknown_version);
}
TEST(ProjectSerializer, LoadOlderVersionReportsTooOld)
{
olive::ProjectSerializer::Initialize();
olive::ProjectSerializer::initialize();
// 190219 predates every registered serializer
QXmlStreamReader reader(
QStringLiteral("<olive version=\"190219\"><foo/></olive>"));
olive::ProjectSerializer::Result result = olive::ProjectSerializer::Load(
nullptr, &reader, olive::ProjectSerializer::kOnlyNodes);
olive::ProjectSerializer::Result result = olive::ProjectSerializer::load(
nullptr, &reader, olive::ProjectSerializer::k_only_nodes);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kProjectTooOld);
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_project_too_old);
olive::ProjectSerializer::Destroy();
olive::ProjectSerializer::destroy();
}
TEST(ProjectSerializer, LoadNewerVersionReportsTooNew)
{
olive::ProjectSerializer::Initialize();
olive::ProjectSerializer::initialize();
QXmlStreamReader reader(
QStringLiteral("<olive version=\"999999\"><foo/></olive>"));
olive::ProjectSerializer::Result result = olive::ProjectSerializer::Load(
nullptr, &reader, olive::ProjectSerializer::kOnlyNodes);
olive::ProjectSerializer::Result result = olive::ProjectSerializer::load(
nullptr, &reader, olive::ProjectSerializer::k_only_nodes);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kProjectTooNew);
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_project_too_new);
olive::ProjectSerializer::Destroy();
olive::ProjectSerializer::destroy();
}
TEST(ProjectSerializer, LoadWithoutVersionReportsUnknown)
{
// A project element without a version attribute
QXmlStreamReader no_version(QStringLiteral("<olive><foo/></olive>"));
olive::ProjectSerializer::Result result = olive::ProjectSerializer::Load(
nullptr, &no_version, olive::ProjectSerializer::kOnlyNodes);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kUnknownVersion);
olive::ProjectSerializer::Result result = olive::ProjectSerializer::load(
nullptr, &no_version, olive::ProjectSerializer::k_only_nodes);
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_unknown_version);
// No recognizable root element at all
QXmlStreamReader wrong_root(
QStringLiteral("<unrelated><foo/></unrelated>"));
result = olive::ProjectSerializer::Load(
nullptr, &wrong_root, olive::ProjectSerializer::kOnlyNodes);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kUnknownVersion);
result = olive::ProjectSerializer::load(
nullptr, &wrong_root, olive::ProjectSerializer::k_only_nodes);
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_unknown_version);
}
TEST(ProjectSerializer, CheckCompressedIDDetectsSignature)
@@ -701,7 +701,7 @@ TEST(ProjectSerializer, CheckCompressedIDDetectsSignature)
QFile check(compressed);
ASSERT_TRUE(check.open(QFile::ReadOnly));
EXPECT_TRUE(olive::ProjectSerializer::CheckCompressedID(&check));
EXPECT_TRUE(olive::ProjectSerializer::check_compressed_id(&check));
check.close();
const QString plain =
@@ -713,29 +713,29 @@ TEST(ProjectSerializer, CheckCompressedIDDetectsSignature)
QFile check_plain(plain);
ASSERT_TRUE(check_plain.open(QFile::ReadOnly));
EXPECT_FALSE(olive::ProjectSerializer::CheckCompressedID(&check_plain));
EXPECT_FALSE(olive::ProjectSerializer::check_compressed_id(&check_plain));
check_plain.close();
}
TEST(ProjectSerializer, SaveToInvalidDirectoryFails)
{
olive::ColorManager::SetUpDefaultConfig();
olive::ColorManager::set_up_default_config();
bool created_disk_manager = false;
EnsureDiskManager(&created_disk_manager);
olive::ProjectSerializer::Initialize();
ensure_disk_manager(&created_disk_manager);
olive::ProjectSerializer::initialize();
olive::Project project;
project.Initialize();
project.initialize();
olive::ProjectSerializer::Result result = olive::ProjectSerializer::Save(
olive::ProjectSerializer::Result result = olive::ProjectSerializer::save(
olive::ProjectSerializer::SaveData(
olive::ProjectSerializer::kProject, &project,
olive::ProjectSerializer::k_project, &project,
QStringLiteral("/definitely/nonexistent/project.ove")),
false);
EXPECT_EQ(result.code(), olive::ProjectSerializer::kFileError);
EXPECT_FALSE(result.GetDetails().isEmpty());
EXPECT_EQ(result.code(), olive::ProjectSerializer::k_file_error);
EXPECT_FALSE(result.get_details().isEmpty());
olive::ProjectSerializer::Destroy();
ReleaseDiskManager(created_disk_manager);
olive::ProjectSerializer::destroy();
release_disk_manager(created_disk_manager);
}