oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

R8: finish app/ pure C ABI migration (P3-P9) and make OTIO required

Browse Source 
- app/ no longer includes engine C++ headers nor holds engine C++ types:
  engine access goes through the oakengine C ABI plus C++ wrappers
  (oakutil/oaknode.h, oakutil/oakvideo.h) and app-local mirror types
  (tooltypes, trackreferencehandle, timelinecommonapp, keyframetypes,
  subtitleapp, serializedlayoutinfoapp, nodevaluehandle, sliderdisplaytypeapp)
- engine: new C ABI functions for block/track/clip/transition navigation
  and predicates, links, caches, waveform/playback, disk folder,
  sequence_track_list, node_free, footage_is_valid, block_get_track,
  get_brush; loadotio/saveotio ported to the current engine API
- OTIO is now a required dependency: CI and CD build it on every
  platform, FindOpenTimelineIO fixed for OTIO 0.16/0.19 (the old deps
  include requirement silently disabled OTIO everywhere), runtime
  libraries are bundled into packages and copied next to macOS binaries
  (oak_copy_otio_runtime)
- fix ProjectViewModel drag&drop mime read/write size mismatch (segfault)
- unify color label naming (k_olive -> "Oak") in the app-side mirror
- docs: OTIO required, FFmpeg minimum corrected to 6.0 (en/zh)
- gtest suite: 1925 passed, 0 failed
This commit is contained in:
Mike-Solar
2026-07-31 22:46:52 +08:00
parent 18aed979a2
commit 66d761b4b7
285 changed files with 13261 additions and 5895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/widget/timelinewidget/tool/transition.cpp
+119 -57
View File
@@ -21,17 +21,47 @@
#include "widget/timelinewidget/timelinewidget.h"
#include "node/block/transition/crossdissolve/crossdissolvetransition.h"
#include "node/block/transition/transition.h"
#include "oakengine/node.h"
#include "oakengine/undo.h"
#include "oakengine/timeline.h"
#include "timeline/timelineundopointer.h"
#include "transition.h"
#include "widget/timelinewidget/trackhandle.h"
namespace olive
{
namespace
{
/// Block::in() as rational seconds.
Rational ghost_block_in(const OakEngineBlock *block)
{
int num = 0, den = 1;
oakengine_block_get_in_rational(
reinterpret_cast<const OakEngineNode *>(block), &num, &den);
return Rational(num, den);
}
/// Block::out() as rational seconds.
Rational ghost_block_out(const OakEngineBlock *block)
{
int num = 0, den = 1;
oakengine_block_get_out_rational(
reinterpret_cast<const OakEngineNode *>(block), &num, &den);
return Rational(num, den);
}
/// Block::length() as rational seconds.
Rational ghost_block_length(const OakEngineBlock *block)
{
int num = 0, den = 1;
oakengine_block_get_length_rational(
reinterpret_cast<const OakEngineNode *>(block), &num, &den);
return Rational(num, den);
}
} // namespace
TransitionTool::TransitionTool(TimelineWidget *parent)
: AddTool(parent)
{
@@ -39,15 +69,15 @@ TransitionTool::TransitionTool(TimelineWidget *parent)
void TransitionTool::hover_move(TimelineViewMouseEvent *event)
{
ClipBlock *primary = nullptr;
ClipBlock *secondary = nullptr;
Timeline::MovementMode trim_mode = Timeline::k_none;
OakEngineClip *primary = nullptr;
OakEngineClip *secondary = nullptr;
TimelineApp::MovementMode trim_mode = TimelineApp::k_none;
Rational transition_start_point;
get_blocks_at_coord(event->get_coordinates(), &primary, &secondary, &trim_mode,
&transition_start_point);
if (trim_mode == Timeline::k_trim_in) {
if (trim_mode == TimelineApp::k_trim_in) {
std::swap(primary, secondary);
}
@@ -56,8 +86,8 @@ void TransitionTool::hover_move(TimelineViewMouseEvent *event)
void TransitionTool::mouse_press(TimelineViewMouseEvent *event)
{
ClipBlock *primary, *secondary;
Timeline::MovementMode trim_mode;
OakEngineClip *primary, *secondary;
TimelineApp::MovementMode trim_mode;
Rational transition_start_point;
if (!get_blocks_at_coord(event->get_coordinates(), &primary, &secondary,
&trim_mode, &transition_start_point)) {
@@ -97,51 +127,68 @@ void TransitionTool::mouse_move(TimelineViewMouseEvent *event)
void TransitionTool::mouse_release(TimelineViewMouseEvent *event)
{
const Track::Reference &track = ghost_->get_track();
const TrackReference &track = ghost_->get_track();
if (ghost_) {
if (!ghost_->get_adjusted_length().isNull()) {
TransitionBlock *transition;
OakEngineNode *transition;
if (Core::instance()->get_selected_transition().isEmpty()) {
// Fallback if the user hasn't selected one yet
transition = reinterpret_cast<CrossDissolveTransition*>(oakengine_node_factory_create_from_id("org.olivevideoeditor.Olive.crossdissolve"));
transition = oakengine_node_factory_create_from_id("org.olivevideoeditor.Olive.crossdissolve");
} else {
transition =
reinterpret_cast<TransitionBlock *>(oakengine_node_factory_create_from_id(
Core::instance()->get_selected_transition().toUtf8().constData()));
oakengine_node_factory_create_from_id(
Core::instance()->get_selected_transition().toUtf8().constData());
}
// Set transition length
// Set transition length: routed through a trim command child
// added before the placement child below (children redo in
// order, so the length is set before the block is placed).
// oakengine_block_set_length_and_media_out() itself cannot be
// used here -- it requires the block to already be on a track
// (OAKENGINE_E_STATE). Before placement the block has no
// adjacent blocks, so a trim-out command reduces to
// Block::set_length_and_media_out().
Rational len = ghost_->get_adjusted_length();
transition->set_length_and_media_out(len);
void *command = oakengine_undo_command_create_multi();
auto *seq_handle = sequence();
// Place transition in place
oakengine_undo_command_multi_add_child(command,
oakengine_node_add_to_project_command(
reinterpret_cast<OakEngineProject *>(parent()->get_connected_node()->parent()),
reinterpret_cast<OakEngineNode *>(transition)));
oakengine_node_parent(reinterpret_cast<OakEngineNode *>(
parent()->get_connected_node())),
transition));
oakengine_undo_command_multi_add_child(command, oakengine_node_set_position_command(reinterpret_cast<void *>(transition), reinterpret_cast<void *>(transition), 0, 0, 0));
oakengine_undo_command_multi_add_child(command, oakengine_track_place_block_command(reinterpret_cast<void *>(sequence()->track_list(track.type())), track.index(), reinterpret_cast<void *>(transition), core::Timecode::time_to_timestamp(ghost_->get_adjusted_in(), parent()->timebase())));
oakengine_undo_command_multi_add_child(command,
oakengine_block_trim_command(
reinterpret_cast<void *>(oakengine_sequence_track_at(
seq_handle, track.type(), track.index())),
reinterpret_cast<void *>(transition),
len.numerator(), len.denominator(),
OAKENGINE_MOVEMENT_MODE_TRIM_OUT, 0));
oakengine_undo_command_multi_add_child(command, oakengine_track_place_block_command(reinterpret_cast<void *>(oakengine_sequence_track_list(seq_handle, track.type())), track.index(), reinterpret_cast<void *>(transition), core::Timecode::time_to_timestamp(ghost_->get_adjusted_in(), parent()->timebase())));
if (dual_transition_) {
// Block mouse is hovering over
Block *active_block = QtUtils::value_to_ptr<Block>(
OakEngineBlock *active_block = QtUtils::value_to_ptr<OakEngineBlock>(
ghost_->get_data(TimelineViewGhostItem::k_attached_block));
// Block mouse is next to
Block *friend_block = QtUtils::value_to_ptr<Block>(
OakEngineBlock *friend_block = QtUtils::value_to_ptr<OakEngineBlock>(
ghost_->get_data(TimelineViewGhostItem::k_reference_block));
// Use ghost mode to determine which block is which
Block *out_block = (ghost_->get_mode() == Timeline::k_trim_in) ?
OakEngineBlock *out_block = (ghost_->get_mode() == TimelineApp::k_trim_in) ?
friend_block :
active_block;
Block *in_block = (ghost_->get_mode() == Timeline::k_trim_in) ?
OakEngineBlock *in_block = (ghost_->get_mode() == TimelineApp::k_trim_in) ?
active_block :
friend_block;
@@ -150,7 +197,7 @@ void TransitionTool::mouse_release(TimelineViewMouseEvent *event)
command,
oakengine_node_connect_command(
reinterpret_cast<OakEngineNode *>(out_block),
reinterpret_cast<OakEngineNode *>(transition),
transition,
QLatin1String(oakengine_transition_out_block_input_id()).toUtf8().constData(),
-1));
@@ -158,18 +205,18 @@ void TransitionTool::mouse_release(TimelineViewMouseEvent *event)
command,
oakengine_node_connect_command(
reinterpret_cast<OakEngineNode *>(in_block),
reinterpret_cast<OakEngineNode *>(transition),
transition,
QLatin1String(oakengine_transition_in_block_input_id()).toUtf8().constData(),
-1));
oakengine_undo_command_multi_add_child(command, oakengine_node_set_position_command(reinterpret_cast<void *>(out_block), reinterpret_cast<void *>(transition), -1, -0.5, 0));
oakengine_undo_command_multi_add_child(command, oakengine_node_set_position_command(reinterpret_cast<void *>(in_block), reinterpret_cast<void *>(transition), -1, 0.5, 0));
} else {
Block *block_to_transition = QtUtils::value_to_ptr<Block>(
OakEngineBlock *block_to_transition = QtUtils::value_to_ptr<OakEngineBlock>(
ghost_->get_data(TimelineViewGhostItem::k_attached_block));
QString transition_input_to_connect;
if (ghost_->get_mode() == Timeline::k_trim_in) {
if (ghost_->get_mode() == TimelineApp::k_trim_in) {
transition_input_to_connect =
QLatin1String(oakengine_transition_in_block_input_id());
} else {
@@ -182,7 +229,7 @@ void TransitionTool::mouse_release(TimelineViewMouseEvent *event)
command,
oakengine_node_connect_command(
reinterpret_cast<OakEngineNode *>(block_to_transition),
reinterpret_cast<OakEngineNode *>(transition),
transition,
transition_input_to_connect.toUtf8().constData(),
-1));
@@ -203,68 +250,83 @@ void TransitionTool::mouse_release(TimelineViewMouseEvent *event)
}
bool TransitionTool::get_blocks_at_coord(const TimelineCoordinate &coord,
ClipBlock **primary,
ClipBlock **secondary,
Timeline::MovementMode *ptrim_mode,
OakEngineClip **primary,
OakEngineClip **secondary,
TimelineApp::MovementMode *ptrim_mode,
Rational *start_point)
{
const Track::Reference &track = coord.get_track();
Track *t = parent()->get_track_from_reference(track);
const TrackReference &coord_track = coord.get_track();
OakEngineTrack *t = parent()->get_track_from_reference(coord_track);
Rational cursor_frame = coord.get_frame();
if (!t || t->is_locked()) {
if (!t || track_is_locked(t)) {
return false;
}
Block *block_at_time = t->nearest_block_before_or_at(coord.get_frame());
if (!dynamic_cast<ClipBlock *>(block_at_time)) {
OakEngineBlock *block_at_time =
oakengine_track_nearest_block_before_or_at(
t,
core::Timecode::time_to_timestamp(coord.get_frame(),
parent()->timebase()));
if (!oakengine_node_is_clip(reinterpret_cast<OakEngineNode *>(block_at_time))) {
return false;
}
// Determine which side of the clip the transition belongs to
Rational transition_start_point;
Timeline::MovementMode trim_mode;
Rational tenth_point = block_at_time->length() / 10;
Block *other_block = nullptr;
if (cursor_frame < (block_at_time->in() + block_at_time->length() / 2)) {
if (static_cast<ClipBlock *>(block_at_time)->in_transition()) {
TimelineApp::MovementMode trim_mode;
Rational tenth_point = ghost_block_length(block_at_time) / 10;
OakEngineBlock *other_block = nullptr;
if (cursor_frame <
(ghost_block_in(block_at_time) +
ghost_block_length(block_at_time) / 2)) {
if (oakengine_clip_in_transition(block_at_time)) {
// This clip already has a transition here
return false;
}
ClipBlock *adjacent =
dynamic_cast<ClipBlock *>(block_at_time->previous());
OakEngineBlock *previous = oakengine_block_prev(block_at_time);
OakEngineClip *adjacent =
oakengine_node_is_clip(reinterpret_cast<OakEngineNode *>(previous)) ?
reinterpret_cast<OakEngineClip *>(previous) :
nullptr;
if (adjacent) {
tenth_point = std::min(tenth_point, adjacent->length() / 10);
tenth_point = std::min(tenth_point, ghost_block_length(reinterpret_cast<const OakEngineBlock *>(adjacent)) / 10);
}
transition_start_point = block_at_time->in();
trim_mode = Timeline::k_trim_in;
transition_start_point = ghost_block_in(block_at_time);
trim_mode = TimelineApp::k_trim_in;
if (cursor_frame < (block_at_time->in() + tenth_point) && adjacent) {
other_block = adjacent;
if (cursor_frame < (ghost_block_in(block_at_time) + tenth_point) &&
adjacent) {
other_block = reinterpret_cast<OakEngineBlock *>(adjacent);
}
} else {
if (static_cast<ClipBlock *>(block_at_time)->out_transition()) {
if (oakengine_clip_out_transition(block_at_time)) {
// This clip already has a transition here
return false;
}
ClipBlock *adjacent = dynamic_cast<ClipBlock *>(block_at_time->next());
OakEngineBlock *next = oakengine_block_next(block_at_time);
OakEngineClip *adjacent =
oakengine_node_is_clip(reinterpret_cast<OakEngineNode *>(next)) ?
reinterpret_cast<OakEngineClip *>(next) :
nullptr;
if (adjacent) {
tenth_point = std::min(tenth_point, adjacent->length() / 10);
tenth_point = std::min(tenth_point, ghost_block_length(reinterpret_cast<const OakEngineBlock *>(adjacent)) / 10);
}
transition_start_point = block_at_time->out();
trim_mode = Timeline::k_trim_out;
transition_start_point = ghost_block_out(block_at_time);
trim_mode = TimelineApp::k_trim_out;
if (cursor_frame > block_at_time->out() - tenth_point && adjacent) {
other_block = block_at_time->next();
if (cursor_frame > ghost_block_out(block_at_time) - tenth_point &&
adjacent) {
other_block = next;
}
}
*primary = static_cast<ClipBlock *>(block_at_time);
*secondary = static_cast<ClipBlock *>(other_block);
*primary = reinterpret_cast<OakEngineClip *>(block_at_time);
*secondary = reinterpret_cast<OakEngineClip *>(other_block);
*ptrim_mode = trim_mode;
*start_point = transition_start_point;