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

transition: reworked hashing

Browse Source
This commit is contained in:
itsmattkc
2021-07-29 13:23:24 -07:00
parent 8f7adaa5d7
commit c3faa49686
4 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/block/block.cpp
+14
View File
@@ -215,6 +215,20 @@ void Block::LinkChangeEvent()
} }
} }
bool Block::HashPassthrough(const QString &input, const QString &output, QCryptographicHash &hash, const rational &time, const VideoParams &video_params) const
{
if (IsInputConnected(input)) {
rational t = InputTimeAdjustment(input, -1, TimeRange(time, time)).in();
NodeOutput output = GetConnectedOutput(input);
output.node()->Hash(output.output(), hash, t, video_params);
return true;
}
return false;
}
void Block::set_length_internal(const rational &length) void Block::set_length_internal(const rational &length)
{ {
SetStandardValue(kLengthInput, QVariant::fromValue(length)); SetStandardValue(kLengthInput, QVariant::fromValue(length));
app/node/block/block.h
+2
View File
@@ -179,6 +179,8 @@ protected:
virtual void LinkChangeEvent() override; virtual void LinkChangeEvent() override;
bool HashPassthrough(const QString &input, const QString& output, QCryptographicHash &hash, const rational &time, const VideoParams& video_params) const;
Block* previous_; Block* previous_;
Block* next_; Block* next_;
app/node/block/clip/clip.cpp
+1 -8
View File
@@ -117,14 +117,7 @@ void ClipBlock::Retranslate()
void ClipBlock::Hash(const QString &out, QCryptographicHash &hash, const rational &time, const VideoParams &video_params) const void ClipBlock::Hash(const QString &out, QCryptographicHash &hash, const rational &time, const VideoParams &video_params) const
{ {
Q_UNUSED(out) HashPassthrough(kBufferIn, out, hash, time, video_params);
if (IsInputConnected(kBufferIn)) {
rational t = InputTimeAdjustment(kBufferIn, -1, TimeRange(time, time)).in();
NodeOutput output = GetConnectedOutput(kBufferIn);
output.node()->Hash(output.output(), hash, t, video_params);
}
} }
} }
app/node/block/transition/transition.cpp
+10 -8
View File
@@ -121,16 +121,18 @@ double TransitionBlock::GetInProgress(const double &time) const
void TransitionBlock::Hash(const QString &output, QCryptographicHash &hash, const rational &time, const VideoParams &video_params) const void TransitionBlock::Hash(const QString &output, QCryptographicHash &hash, const rational &time, const VideoParams &video_params) const
{ {
Node::Hash(output, hash, time, video_params); if (HashPassthrough(kInBlockInput, output, hash, time, video_params) || HashPassthrough(kOutBlockInput, output, hash, time, video_params)) {
HashAddNodeSignature(hash, output);
double time_dbl = time.toDouble(); double time_dbl = time.toDouble();
double all_prog = GetTotalProgress(time_dbl); double all_prog = GetTotalProgress(time_dbl);
double in_prog = GetInProgress(time_dbl); double in_prog = GetInProgress(time_dbl);
double out_prog = GetOutProgress(time_dbl); double out_prog = GetOutProgress(time_dbl);
hash.addData(reinterpret_cast<const char*>(&all_prog), sizeof(double)); hash.addData(reinterpret_cast<const char*>(&all_prog), sizeof(all_prog));
hash.addData(reinterpret_cast<const char*>(&in_prog), sizeof(double)); hash.addData(reinterpret_cast<const char*>(&in_prog), sizeof(in_prog));
hash.addData(reinterpret_cast<const char*>(&out_prog), sizeof(double)); hash.addData(reinterpret_cast<const char*>(&out_prog), sizeof(out_prog));
}
} }
double TransitionBlock::GetInternalTransitionTime(const double &time) const double TransitionBlock::GetInternalTransitionTime(const double &time) const