Skip to content

Fix copy/paste transition causes bad audio #1880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bmatherly wants to merge 2 commits into
base: master
Choose a base branch
from
+194 −12
Open

Fix copy/paste transition causes bad audio #1880

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
715106d
Fix copy/paste transition causes bad audio
bmatherly Jul 30, 2026
294e94a
Resolve review comments to simplify the code
bmatherly Jul 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
173 changes: 163 additions & 10 deletions src/docks/timelinedock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2659,21 +2659,69 @@ void TimelineDock::append(int trackIndex)
if (srcTrack) {
const auto trackIndex = currentTrack() + mltTrackIndex;
addTrackIfNeeded(trackIndex, srcTrack.get());
int pendingTransitionDuration = 0;
int pendingTransitionRightIn = -1;
Mlt::Producer pendingTransitionRightClip;

// Insert the clips for this track
Mlt::Playlist playlist(*srcTrack);
for (int mltClipIndex = 0; mltClipIndex < playlist.count(); mltClipIndex++) {
if (!playlist.is_blank(mltClipIndex)) {
playlist.clip_info(mltClipIndex, &info);
bool isTransitionClip = info.producer && info.producer->is_valid()
&& info.producer->get(
kShotcutTransitionProperty);
if (isTransitionClip) {
pendingTransitionDuration = qMax(1, info.frame_count);
pendingTransitionRightIn = -1;
pendingTransitionRightClip = Mlt::Producer();
Mlt::Tractor transition(*info.producer);
QScopedPointer<Mlt::Producer> transitionRight(transition.track(1));
if (transitionRight && transitionRight->is_valid()) {
pendingTransitionRightIn = transitionRight->get_in();
pendingTransitionRightClip = Mlt::Producer(*transitionRight);
}
continue;
}
Mlt::Producer clip(info.producer);
clip.set_in_and_out(info.frame_in, info.frame_out);
if (pendingTransitionDuration > 0 && pendingTransitionRightIn >= 0
&& pendingTransitionRightClip.is_valid()
&& clip.same_clip(pendingTransitionRightClip)) {
clip.set_in_and_out(qMin(pendingTransitionRightIn, info.frame_out),
info.frame_out);
} else {
clip.set_in_and_out(info.frame_in, info.frame_out);
}
bool lastClip = mltTrackIndex == tractor.count() - 1
&& mltClipIndex == playlist.count() - 1;
MAIN.undoStack()->push(new Timeline::AppendCommand(m_model,
trackIndex,
MLT.XML(&clip),
false,
lastClip));

if (pendingTransitionDuration > 0) {
const int rightClipIndex = clipCount(trackIndex) - 1;
const int leftClipIndex = rightClipIndex - 1;
if (leftClipIndex >= 0 && rightClipIndex >= 0
&& !isBlank(trackIndex, leftClipIndex)
&& !isBlank(trackIndex, rightClipIndex)
&& !isTransition(trackIndex, leftClipIndex)
&& !isTransition(trackIndex, rightClipIndex)
&& m_model.addTransitionByTrimOutValid(
trackIndex, leftClipIndex, -pendingTransitionDuration)) {
MAIN.undoStack()->push(
new Timeline::AddTransitionByTrimOutCommand(
m_model,
trackIndex,
leftClipIndex,
-pendingTransitionDuration,
0));
}
pendingTransitionDuration = 0;
pendingTransitionRightIn = -1;
pendingTransitionRightClip = Mlt::Producer();
}
Comment thread
bmatherly marked this conversation as resolved.
Outdated
// AppendCommand executed immediately; record group membership
if (info.cut && info.cut->property_exists(kShotcutGroupProperty)) {
int group = info.cut->get_int(kShotcutGroupProperty);
Expand Down Expand Up @@ -4202,22 +4250,75 @@ void TimelineDock::insert(int trackIndex, int position, const QString &xml, bool
if (srcTrack) {
const auto trackIndex = currentTrack() + mltTrackIndex;
addTrackIfNeeded(trackIndex, srcTrack.get());
int pendingTransitionDuration = 0;
int skippedTransitionDuration = 0;
int pendingTransitionRightIn = -1;
Mlt::Producer pendingTransitionRightClip;

// Insert the clips for this track
Mlt::Playlist playlist(*srcTrack);
for (int mltClipIndex = 0; mltClipIndex < playlist.count(); mltClipIndex++) {
if (!playlist.is_blank(mltClipIndex)) {
playlist.clip_info(mltClipIndex, &info);
bool isTransitionClip = info.producer && info.producer->is_valid()
&& info.producer->get(
kShotcutTransitionProperty);
if (isTransitionClip) {
pendingTransitionDuration = qMax(1, info.frame_count);
skippedTransitionDuration += pendingTransitionDuration;
pendingTransitionRightIn = -1;
pendingTransitionRightClip = Mlt::Producer();
Mlt::Tractor transition(*info.producer);
QScopedPointer<Mlt::Producer> transitionRight(transition.track(1));
if (transitionRight && transitionRight->is_valid()) {
pendingTransitionRightIn = transitionRight->get_in();
pendingTransitionRightClip = Mlt::Producer(*transitionRight);
}
continue;
}
Mlt::Producer clip(info.producer);
clip.set_in_and_out(info.frame_in, info.frame_out);
if (pendingTransitionDuration > 0 && pendingTransitionRightIn >= 0
&& pendingTransitionRightClip.is_valid()
&& clip.same_clip(pendingTransitionRightClip)) {
clip.set_in_and_out(qMin(pendingTransitionRightIn, info.frame_out),
info.frame_out);
} else {
clip.set_in_and_out(info.frame_in, info.frame_out);
}
const int insertPosition = position + info.start
- skippedTransitionDuration;
bool lastClip = mltTrackIndex == tractor.count() - 1
&& mltClipIndex == playlist.count() - 1;
MAIN.undoStack()->push(new Timeline::InsertCommand(m_model,
m_markersModel,
trackIndex,
position + info.start,
insertPosition,
MLT.XML(&clip),
Comment thread
bmatherly marked this conversation as resolved.
lastClip));

if (pendingTransitionDuration > 0) {
const int rightClipIndex = clipIndexAtPosition(trackIndex,
insertPosition);
const int leftClipIndex = rightClipIndex - 1;
if (leftClipIndex >= 0 && rightClipIndex >= 0
&& !isBlank(trackIndex, leftClipIndex)
&& !isBlank(trackIndex, rightClipIndex)
&& !isTransition(trackIndex, leftClipIndex)
&& !isTransition(trackIndex, rightClipIndex)
&& m_model.addTransitionByTrimOutValid(
trackIndex, leftClipIndex, -pendingTransitionDuration)) {
MAIN.undoStack()->push(
new Timeline::AddTransitionByTrimOutCommand(
m_model,
trackIndex,
leftClipIndex,
-pendingTransitionDuration,
0));
}
pendingTransitionDuration = 0;
pendingTransitionRightIn = -1;
pendingTransitionRightClip = Mlt::Producer();
}
}
}
}
Expand Down Expand Up @@ -4387,20 +4488,72 @@ void TimelineDock::overwrite(int trackIndex, int position, const QString &xml, b
if (srcTrack) {
const auto trackIndex = currentTrack() + mltTrackIndex;
addTrackIfNeeded(trackIndex, srcTrack.get());
int pendingTransitionDuration = 0;
int skippedTransitionDuration = 0;
int pendingTransitionRightIn = -1;
Mlt::Producer pendingTransitionRightClip;

// Insert the clips for this track
Mlt::Playlist playlist(*srcTrack);
for (int mltClipIndex = 0; mltClipIndex < playlist.count(); mltClipIndex++) {
if (!playlist.is_blank(mltClipIndex)) {
playlist.clip_info(mltClipIndex, &info);
bool isTransitionClip = info.producer && info.producer->is_valid()
&& info.producer->get(
kShotcutTransitionProperty);
if (isTransitionClip) {
pendingTransitionDuration = qMax(1, info.frame_count);
skippedTransitionDuration += pendingTransitionDuration;
pendingTransitionRightIn = -1;
pendingTransitionRightClip = Mlt::Producer();
Mlt::Tractor transition(*info.producer);
QScopedPointer<Mlt::Producer> transitionRight(transition.track(1));
if (transitionRight && transitionRight->is_valid()) {
pendingTransitionRightIn = transitionRight->get_in();
pendingTransitionRightClip = Mlt::Producer(*transitionRight);
}
continue;
}
Mlt::Producer clip(info.producer);
clip.set_in_and_out(info.frame_in, info.frame_out);
MAIN.undoStack()->push(
new Timeline::OverwriteCommand(m_model,
trackIndex,
position + info.start,
MLT.XML(&clip),
false));
if (pendingTransitionDuration > 0 && pendingTransitionRightIn >= 0
&& pendingTransitionRightClip.is_valid()
&& clip.same_clip(pendingTransitionRightClip)) {
clip.set_in_and_out(qMin(pendingTransitionRightIn, info.frame_out),
info.frame_out);
} else {
clip.set_in_and_out(info.frame_in, info.frame_out);
}
const int overwritePosition = position + info.start
- skippedTransitionDuration;
MAIN.undoStack()->push(new Timeline::OverwriteCommand(m_model,
trackIndex,
overwritePosition,
MLT.XML(&clip),
false));

if (pendingTransitionDuration > 0) {
const int rightClipIndex = clipIndexAtPosition(trackIndex,
overwritePosition);
const int leftClipIndex = rightClipIndex - 1;
if (leftClipIndex >= 0 && rightClipIndex >= 0
&& !isBlank(trackIndex, leftClipIndex)
&& !isBlank(trackIndex, rightClipIndex)
&& !isTransition(trackIndex, leftClipIndex)
&& !isTransition(trackIndex, rightClipIndex)
&& m_model.addTransitionByTrimOutValid(
trackIndex, leftClipIndex, -pendingTransitionDuration)) {
MAIN.undoStack()->push(
new Timeline::AddTransitionByTrimOutCommand(
m_model,
trackIndex,
leftClipIndex,
-pendingTransitionDuration,
0));
}
pendingTransitionDuration = 0;
pendingTransitionRightIn = -1;
pendingTransitionRightClip = Mlt::Producer();
}
}
}
}
Expand Down