Skip to content

Commit 4bab24b

Browse files
markreidvfxmarkreidvfx
committed
fixes #1635 
1 parent ee3e317 commit 4bab24b

File tree

2 files changed

+173
-30
lines changed

2 files changed

+173
-30
lines changed

‎src/opentimelineio/stackAlgorithm.cpp‎

Lines changed: 75 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,17 @@ namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
1212
typedef std::map<Track*, std::map<Composable*, TimeRange>> RangeTrackMap;
1313
typedef std::vector<SerializableObject::Retainer<Track>> TrackRetainerVector;
1414

15+
static bool
16+
_is_not_visible(
17+
SerializableObject::Retainer<Composable> thing)
18+
{
19+
auto item = dynamic_retainer_cast<Item>(thing);
20+
if (!item)
21+
return false;
22+
23+
return !item->visible();
24+
}
25+
1526
static void
1627
_flatten_next_item(
1728
RangeTrackMap& range_track_map,
@@ -61,54 +72,88 @@ _flatten_next_item(
6172
}
6273
track_map = &result.first->second;
6374
}
64-
for (auto child: track->children())
75+
76+
auto children = track->children();
77+
for (int i = 0; i < children.size(); i++)
6578
{
66-
auto item = dynamic_retainer_cast<Item>(child);
67-
if (!item)
79+
std::optional<TimeRange> trim = std::nullopt;;
80+
SerializableObject::Retainer<Composable> child = children[i];
81+
82+
// combine all non visible children into one continuous range
83+
while(track_index > 0 && _is_not_visible(child))
6884
{
69-
if (!dynamic_retainer_cast<Transition>(child))
85+
TimeRange child_trim = (*track_map)[child];
86+
87+
// offset ranges so they are in track range before being trimmed
88+
if (trim_range)
7089
{
71-
if (error_status)
72-
{
73-
*error_status = ErrorStatus(
74-
ErrorStatus::TYPE_MISMATCH,
75-
"expected item of type Item* || Transition*",
76-
child);
77-
}
78-
return;
90+
trim = TimeRange(
91+
child_trim.start_time() + trim_range->start_time(),
92+
child_trim.duration());
93+
(*track_map)[child] = child_trim;
94+
}
95+
96+
if (trim.has_value())
97+
{
98+
trim = trim->duration_extended_by(child_trim.duration());
99+
}
100+
else
101+
{
102+
trim = child_trim;
103+
}
104+
105+
if (i+1 < children.size())
106+
{
107+
child = children[i++];
108+
}
109+
else
110+
{
111+
// last item is not visible
112+
child = nullptr;
113+
break;
79114
}
80115
}
81116

82-
if (!item || item->visible() || track_index == 0)
117+
if (trim.has_value())
83118
{
84-
flat_track->insert_child(
85-
static_cast<int>(flat_track->children().size()),
86-
static_cast<Composable*>(child->clone(error_status)),
119+
_flatten_next_item(
120+
range_track_map,
121+
flat_track,
122+
tracks,
123+
track_index - 1,
124+
trim,
87125
error_status);
126+
88127
if (is_error(error_status))
89128
{
90129
return;
91130
}
92131
}
93-
else
132+
133+
if (child)
94134
{
95-
TimeRange trim = (*track_map)[item];
96-
if (trim_range)
135+
auto item = dynamic_retainer_cast<Item>(child);
136+
if (!item)
97137
{
98-
trim = TimeRange(
99-
trim.start_time() + trim_range->start_time(),
100-
trim.duration());
101-
(*track_map)[item] = trim;
138+
if (!dynamic_retainer_cast<Transition>(child))
139+
{
140+
if (error_status)
141+
{
142+
*error_status = ErrorStatus(
143+
ErrorStatus::TYPE_MISMATCH,
144+
"expected item of type Item* || Transition*",
145+
child);
146+
}
147+
return;
148+
}
102149
}
103150

104-
_flatten_next_item(
105-
range_track_map,
106-
flat_track,
107-
tracks,
108-
track_index - 1,
109-
trim,
151+
flat_track->insert_child(
152+
static_cast<int>(flat_track->children().size()),
153+
static_cast<Composable*>(child->clone(error_status)),
110154
error_status);
111-
if (track == nullptr || is_error(error_status))
155+
156+
if (is_error(error_status))
112157
{
113158
return;
114159
}

‎tests/test_stack_algo.cpp‎

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <opentimelineio/clip.h>
88
#include <opentimelineio/stack.h>
99
#include <opentimelineio/track.h>
10+
#include <opentimelineio/gap.h>
1011
#include <opentimelineio/stackAlgorithm.h>
1112

1213
#include <iostream>
@@ -213,6 +214,103 @@ main(int argc, char** argv)
213214
assertEqual(result->duration().value(), 300);
214215
});
215216

217+
tests.add_test(
218+
"test_flatten_stack_04", [] {
219+
using namespace otio;
220+
221+
otio::RationalTime rt_0_24{0, 24};
222+
otio::RationalTime rt_150_24{150, 24};
223+
otio::TimeRange tr_AB_150_24{rt_0_24, rt_150_24};
224+
225+
otio::TimeRange tr_C_150_24{rt_0_24, otio::RationalTime(300, 24)};
226+
227+
// A and B are Gaps placed over clip C
228+
// C should remain uncut
229+
// 0 150 300
230+
// [ A | B ]
231+
// [ C ]
232+
//
233+
// should flatten to:
234+
// [ C ]
235+
236+
otio::SerializableObject::Retainer<otio::Gap> cl_A =
237+
new otio::Gap(tr_AB_150_24, "track1_A");
238+
otio::SerializableObject::Retainer<otio::Gap> cl_B =
239+
new otio::Gap(tr_AB_150_24, "track1_B");
240+
otio::SerializableObject::Retainer<otio::Clip> cl_C =
241+
new otio::Clip("track2_C", nullptr, tr_C_150_24);
242+
243+
otio::SerializableObject::Retainer<otio::Track> tr_over =
244+
new otio::Track();
245+
tr_over->append_child(cl_A);
246+
tr_over->append_child(cl_B);
247+
248+
otio::SerializableObject::Retainer<otio::Track> tr_under =
249+
new otio::Track();
250+
tr_under->append_child(cl_C);
251+
252+
otio::SerializableObject::Retainer<otio::Stack> st =
253+
new otio::Stack();
254+
st->append_child(tr_under);
255+
st->append_child(tr_over);
256+
257+
auto result = flatten_stack(st);
258+
259+
assertEqual(result->children().size(), 1);
260+
assertEqual(result->children()[0]->name(), std::string("track2_C"));
261+
assertEqual(result->duration().value(), 300);
262+
});
263+
264+
tests.add_test(
265+
"test_flatten_stack_05", [] {
266+
using namespace otio;
267+
268+
otio::RationalTime rt_0_24{0, 24};
269+
otio::RationalTime rt_150_24{150, 24};
270+
otio::TimeRange tr_150_24{rt_0_24, rt_150_24};
271+
272+
// A and B are Gaps placed over clips C and D
273+
// with a cut at the same location
274+
// 0 150 300
275+
// [ A | B ]
276+
// [ C | D ]
277+
//
278+
// should flatten to:
279+
// [ C | D ]
280+
281+
otio::SerializableObject::Retainer<otio::Gap> cl_A =
282+
new otio::Gap(tr_150_24, "track1_A");
283+
otio::SerializableObject::Retainer<otio::Gap> cl_B =
284+
new otio::Gap(tr_150_24, "track1_B");
285+
otio::SerializableObject::Retainer<otio::Clip> cl_C =
286+
new otio::Clip("track2_C", nullptr, tr_150_24);
287+
otio::SerializableObject::Retainer<otio::Clip> cl_D =
288+
new otio::Clip("track2_D", nullptr, tr_150_24);
289+
290+
291+
otio::SerializableObject::Retainer<otio::Track> tr_over =
292+
new otio::Track();
293+
tr_over->append_child(cl_A);
294+
tr_over->append_child(cl_B);
295+
296+
otio::SerializableObject::Retainer<otio::Track> tr_under =
297+
new otio::Track();
298+
tr_under->append_child(cl_C);
299+
tr_under->append_child(cl_D);
300+
301+
otio::SerializableObject::Retainer<otio::Stack> st =
302+
new otio::Stack();
303+
st->append_child(tr_under);
304+
st->append_child(tr_over);
305+
306+
auto result = flatten_stack(st);
307+
308+
assertEqual(result->children().size(), 2);
309+
assertEqual(result->children()[0]->name(), std::string("track2_C"));
310+
assertEqual(result->children()[1]->name(), std::string("track2_D"));
311+
assertEqual(result->duration().value(), 300);
312+
});
313+
216314
tests.run(argc, argv);
217315
return 0;
218316
}

0 commit comments

Comments
 (0)