move clamping code from clip to track

Fixes severe regression related to audio transitions
This commit is contained in:
itsmattkc
2022-11-18 10:20:03 -08:00
parent 7e604e7433
commit 9a0e16f504
3 changed files with 11 additions and 30 deletions
+1 -23
View File
@@ -464,29 +464,7 @@ TimeRange ClipBlock::InputTimeAdjustment(const QString& input, int element, cons
Q_UNUSED(element)
if (input == kBufferIn) {
rational in = input_time.in();
rational out = input_time.out();
if (clamp) {
rational minimum = 0;
rational maximum = length();
if (in_transition_) {
minimum -= in_transition_->length();
}
if (out_transition_) {
maximum += out_transition_->length();
}
in = std::max(in, minimum);
out = std::min(out, maximum);
}
in = SequenceToMediaTime(in);
out = SequenceToMediaTime(out);
return TimeRange(in, out);
return TimeRange(SequenceToMediaTime(input_time.in()), SequenceToMediaTime(input_time.out()));
}
return super::InputTimeAdjustment(input, element, input_time, clamp);