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

use speed value instead of media out value

Browse Source 
This functions more or less identically to using a media out value, but the
desired speed is preserved through block length changes, even if the block's
length is reduced to zero (i.e. no rounding errors).
This commit is contained in:
itsmattkc
2020-01-06 15:21:27 +11:00
parent 31b60664a7
commit dae09abf45
12 changed files with 79 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/block.cpp
+19 -59
View File
@@ -39,10 +39,11 @@ Block::Block() :
media_in_input_->set_is_keyframable(false);
AddInput(media_in_input_);
media_out_input_ = new NodeInput("media_out_in", NodeParam::kRational);
media_out_input_->SetConnectable(false);
media_out_input_->set_is_keyframable(false);
AddInput(media_out_input_);
speed_input_ = new NodeInput("speed_in", NodeParam::kRational);
speed_input_->set_standard_value(QVariant::fromValue(rational(1)));
speed_input_->SetConnectable(false);
speed_input_->set_is_keyframable(false);
AddInput(speed_input_);
// A block's length must be greater than 0
set_length_and_media_out(1);
@@ -78,7 +79,7 @@ rational Block::length() const
return length_input_->get_standard_value().value<rational>();
}
void Block::set_length(const rational &length)
void Block::set_length_and_media_out(const rational &length)
{
Q_ASSERT(length > 0);
@@ -89,26 +90,6 @@ void Block::set_length(const rational &length)
length_input_->set_standard_value(QVariant::fromValue(length));
}
void Block::set_length_and_media_out(const rational &length)
{
Q_ASSERT(length > 0);
if (length == this->length()) {
return;
}
rational media_out_diff = length - this->length();
// Try to maintain the same speed (which is determined by the media in to out points)
if (media_length() != this->length()) {
media_out_diff = media_out_diff / this->length() * media_length();
}
set_media_out(media_out() + media_out_diff);
set_length(length);
}
void Block::set_length_and_media_in(const rational &length)
{
Q_ASSERT(length > 0);
@@ -117,18 +98,11 @@ void Block::set_length_and_media_in(const rational &length)
return;
}
rational media_in_diff = this->length() - length;
// Try to maintain the same speed (which is determined by the media in to out points)
if (media_length() != this->length()) {
media_in_diff = media_in_diff / this->length() * media_length();
}
// Calculate media_in adjustment
set_media_in(media_in() + media_in_diff);
set_media_in(media_in() + (this->length() - length) * speed());
// Set the length without setting media out
set_length(length);
set_length_and_media_out(length);
}
Block *Block::previous()
@@ -163,32 +137,27 @@ void Block::set_media_in(const rational &media_in)
rational Block::media_out() const
{
return media_out_input_->get_standard_value().value<rational>();
return media_in() + length() * speed();
}
void Block::set_media_out(const rational &media_out)
rational Block::speed() const
{
media_out_input_->set_standard_value(QVariant::fromValue(media_out));
return speed_input_->get_standard_value().value<rational>();
}
rational Block::media_length() const
void Block::set_speed(const rational &speed)
{
return media_out() - media_in();
}
double Block::speed() const
{
return qAbs(media_length().toDouble() / length().toDouble());
speed_input_->set_standard_value(QVariant::fromValue(speed));
}
bool Block::is_still() const
{
return (media_in() == media_out());
return speed() == 0;
}
bool Block::is_reversed() const
{
return (media_out() < media_in());
return speed() < 0;
}
const QString &Block::block_name() const
@@ -208,7 +177,7 @@ rational Block::SequenceToMediaTime(const rational &sequence_time) const
return sequence_time;
}
return ((sequence_time - in()) * media_length() / length()) + media_in();
return (sequence_time - in()) * speed() + media_in();
}
rational Block::MediaToSequenceTime(const rational &media_time) const
@@ -218,21 +187,12 @@ rational Block::MediaToSequenceTime(const rational &media_time) const
return media_time;
}
return (media_time - media_in()) * length() / media_length() + in();
return (media_time - media_in()) / speed() + in();
}
void Block::CopyParameters(const Block *source, Block *dest)
{
dest->set_block_name(source->block_name());
if (source->type() == kTransition && dest->type() == kTransition) {
const TransitionBlock* src_t = static_cast<const TransitionBlock*>(source);
TransitionBlock* dst_t = static_cast<TransitionBlock*>(dest);
dst_t->set_in_and_out_offset(src_t->in_offset(), src_t->out_offset());
} else {
dest->set_length_and_media_out(source->length());
}
}
void Block::LengthInputChanged()
@@ -308,8 +268,8 @@ NodeInput *Block::media_in_input() const
return media_in_input_;
}
NodeInput *Block::media_out_input() const
NodeInput *Block::speed_input() const
{
return media_out_input_;
return speed_input_;
}
app/node/block/block.h
+6 -8
View File
@@ -56,9 +56,8 @@ public:
void set_out(const rational& out);
rational length() const;
virtual void set_length(const rational &length);
virtual void set_length_and_media_out(const rational &length);
virtual void set_length_and_media_in(const rational &length);
void set_length_and_media_out(const rational &length);
void set_length_and_media_in(const rational &length);
Block* previous();
Block* next();
@@ -69,10 +68,9 @@ public:
void set_media_in(const rational& media_in);
rational media_out() const;
void set_media_out(const rational& media_out);
rational media_length() const;
double speed() const;
rational speed() const;
void set_speed(const rational& speed);
bool is_still() const;
bool is_reversed() const;
@@ -92,7 +90,7 @@ public:
NodeInput* length_input() const;
NodeInput* media_in_input() const;
NodeInput* media_out_input() const;
NodeInput* speed_input() const;
public slots:
@@ -119,7 +117,7 @@ protected:
private:
NodeInput* length_input_;
NodeInput* media_in_input_;
NodeInput* media_out_input_;
NodeInput* speed_input_;
rational in_point_;
rational out_point_;
app/node/block/transition/transition.cpp
+7 -34
View File
@@ -1,6 +1,8 @@
#include "transition.h"
TransitionBlock::TransitionBlock()
TransitionBlock::TransitionBlock() :
connected_out_block_(nullptr),
connected_in_block_(nullptr)
{
out_block_input_ = new NodeInput("out_block_in", NodeParam::kBuffer);
out_block_input_->set_is_keyframable(false);
@@ -9,9 +11,6 @@ TransitionBlock::TransitionBlock()
in_block_input_ = new NodeInput("in_block_in", NodeParam::kBuffer);
in_block_input_->set_is_keyframable(false);
AddInput(in_block_input_);
// A block's length must be greater than 0
set_in_and_out_offset(1, 1);
}
Block::Type TransitionBlock::type() const
@@ -35,38 +34,12 @@ void TransitionBlock::Retranslate()
in_block_input_->set_name(tr("To"));
}
void TransitionBlock::set_length_and_media_out(const rational &length)
rational TransitionBlock::in_offset() const
{
Q_UNUSED(length)
qCritical() << "Set length is not permitted on a transition";
abort();
return 0;
}
void TransitionBlock::set_length_and_media_in(const rational &length)
rational TransitionBlock::out_offset() const
{
Q_UNUSED(length)
qCritical() << "Set length and media in is not permitted on a transition";
abort();
}
const rational &TransitionBlock::in_offset() const
{
return in_offset_;
}
const rational &TransitionBlock::out_offset() const
{
return out_offset_;
}
void TransitionBlock::set_in_and_out_offset(const rational &in_offset, const rational &out_offset)
{
in_offset_ = in_offset;
out_offset_ = out_offset;
RecalculateLength();
}
void TransitionBlock::RecalculateLength()
{
Block::set_length_and_media_out(in_offset_ + out_offset_);
return 0;
}
app/node/block/transition/transition.h
+4 -10
View File
@@ -15,23 +15,17 @@ public:
virtual void Retranslate() override;
virtual void set_length_and_media_out(const rational &length) override;
virtual void set_length_and_media_in(const rational &length) override;
const rational& in_offset() const;
const rational& out_offset() const;
void set_in_and_out_offset(const rational& in_offset, const rational& out_offset);
rational in_offset() const;
rational out_offset() const;
private:
void RecalculateLength();
NodeInput* out_block_input_;
NodeInput* in_block_input_;
rational in_offset_;
Block* connected_out_block_;
rational out_offset_;
Block* connected_in_block_;
};