m_isSplitView(false),
m_blackClip(NULL),
m_winid(winid),
- m_paused(true)
+ m_paused(true),
+ m_isActive(false)
{
qRegisterMetaType<stringMap> ("stringMap");
analyseAudio = KdenliveSettings::monitor_audio();
setenv("MLT_PROFILE", m_activeProfile.toUtf8().constData(), 1);
m_mltProfile->set_explicit(true);
- m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black");
+ m_blackClip = new Mlt::Producer(*m_mltProfile, "colour:black");
m_blackClip->set("id", "black");
m_blackClip->set("mlt_type", "producer");
if (KdenliveSettings::external_display() && m_name != Kdenlive::clipMonitor && m_winid != 0) {
if (m_mltConsumer->is_valid()) {
externalConsumer = true;
m_mltConsumer->set("terminate_on_pause", 0);
- m_mltConsumer->set("deinterlace_method", "onefield");
- m_mltConsumer->set("rescale", "nearest");
+ m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
+ m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
m_mltConsumer->set("buffer", "1");
m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
}
// Set defaults for decklink consumer
if (m_mltConsumer) {
m_mltConsumer->set("terminate_on_pause", 0);
- m_mltConsumer->set("deinterlace_method", "onefield");
+ m_mltConsumer->set("deinterlace_method", KdenliveSettings::mltdeinterlacer().toUtf8().constData());
externalConsumer = true;
}
}
}
//m_mltConsumer->set("resize", 1);
m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData());
- m_mltConsumer->set("rescale", "nearest");
+ m_mltConsumer->set("rescale", KdenliveSettings::mltinterpolation().toUtf8().constData());
mlt_log_set_callback(kdenlive_callback);
QString audioDevice = KdenliveSettings::audiodevicename();
void Render::seek(GenTime time)
{
- if (!m_mltProducer)
+ if (!m_mltProducer || !m_isActive)
return;
int pos = time.frames(m_fps);
seek(pos);
return;
}
m_mltConsumer->set("refresh", 1);
+ m_isActive = true;
}
int Render::setSceneList(QDomDocument list, int position)
kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART";
return;
}
- if (!m_mltConsumer) return;
+ if (!m_mltConsumer) {
+ kDebug()<<" / - - - STARTED BEFORE CONSUMER!!!";
+ return;
+ }
if (m_mltConsumer->is_stopped()) {
if (m_mltConsumer->start() == -1) {
//KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it."));
requestedSeekPosition = SEEK_INACTIVE;
m_refreshTimer.stop();
QMutexLocker locker(&m_mutex);
+ m_isActive = false;
if (m_mltProducer == NULL) return;
if (m_mltConsumer) {
m_mltConsumer->set("refresh", 0);
requestedSeekPosition = SEEK_INACTIVE;
m_refreshTimer.stop();
QMutexLocker locker(&m_mutex);
+ m_isActive = false;
if (m_mltProducer) {
if (m_isZoneMode) resetZoneMode();
m_mltProducer->set_speed(0.0);
void Render::pause()
{
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer || !m_mltConsumer)
+ if (!m_mltProducer || !m_mltConsumer || !m_isActive)
return;
m_paused = true;
m_mltProducer->set_speed(0.0);
m_mltProducer->seek(m_mltConsumer->position());*/
}
+void Render::setActiveMonitor()
+{
+ if (!m_isActive) emit activateMonitor(m_name);
+}
+
void Render::switchPlay(bool play)
{
QMutexLocker locker(&m_mutex);
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer || !m_mltConsumer)
+ if (!m_mltProducer || !m_mltConsumer || !m_isActive)
return;
if (m_isZoneMode) resetZoneMode();
if (play && m_paused) {
void Render::play(double speed)
{
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer) return;
+ if (!m_mltProducer || !m_isActive) return;
double current_speed = m_mltProducer->get_speed();
if (current_speed == speed) return;
if (m_isZoneMode) resetZoneMode();
void Render::play(const GenTime & startTime)
{
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer || !m_mltConsumer)
+ if (!m_mltProducer || !m_mltConsumer || !m_isActive)
return;
m_paused = false;
m_mltProducer->seek((int)(startTime.frames(m_fps)));
void Render::loopZone(const GenTime & startTime, const GenTime & stopTime)
{
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer || !m_mltConsumer)
+ if (!m_mltProducer || !m_mltConsumer || !m_isActive)
return;
//m_mltProducer->set("eof", "loop");
m_isLoopMode = true;
void Render::playZone(const GenTime & startTime, const GenTime & stopTime)
{
requestedSeekPosition = SEEK_INACTIVE;
- if (!m_mltProducer || !m_mltConsumer)
+ if (!m_mltProducer || !m_mltConsumer || !m_isActive)
return;
m_mltProducer->set("out", (int)(stopTime.frames(m_fps)));
m_mltProducer->seek((int)(startTime.frames(m_fps)));
void Render::seekToFrame(int pos)
{
- if (!m_mltProducer)
+ if (!m_mltProducer || !m_isActive)
return;
resetZoneMode();
seek(pos);
void Render::seekToFrameDiff(int diff)
{
- if (!m_mltProducer)
+ if (!m_mltProducer || !m_isActive)
return;
resetZoneMode();
if (requestedSeekPosition == SEEK_INACTIVE)
void Render::refreshIfActive()
{
- if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused) m_refreshTimer.start();
+ if (!m_mltConsumer->is_stopped() && m_mltProducer && m_paused && m_isActive) m_refreshTimer.start();
}
void Render::doRefresh()
{
- if (m_mltProducer && m_paused) m_refreshTimer.start();
+ if (m_mltProducer && m_paused && m_isActive) m_refreshTimer.start();
}
void Render::refresh()
{
m_refreshTimer.stop();
QMutexLocker locker(&m_mutex);
- if (!m_mltProducer)
+ if (!m_mltProducer || !m_isActive)
return;
if (m_mltConsumer) {
if (m_mltConsumer->is_stopped()) m_mltConsumer->start();
int dropFrames = KdenliveSettings::mltthreads();
if (show == false) dropFrames = -dropFrames;
m_mltConsumer->stop();
- if (m_winid == 0)
- m_mltConsumer->set("real_time", dropFrames);
- else
- m_mltConsumer->set("play.real_time", dropFrames);
-
+ m_mltConsumer->set("real_time", dropFrames);
if (m_mltConsumer->start() == -1) {
kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
}
}
}
+void Render::setConsumerProperty(const QString &name, const QString &value)
+{
+ QMutexLocker locker(&m_mutex);
+ if (m_mltConsumer) {
+ m_mltConsumer->stop();
+ m_mltConsumer->set(name.toUtf8().constData(), value.toUtf8().constData());
+ if (m_isActive && m_mltConsumer->start() == -1) {
+ kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
+ }
+
+ }
+}
+
bool Render::isPlaying() const
{
if (!m_mltConsumer || m_mltConsumer->is_stopped()) return false;
void Render::emitFrameUpdated(Mlt::Frame& frame)
{
- mlt_image_format format = mlt_image_rgb24a;
+ mlt_image_format format = mlt_image_rgb24;
int width = 0;
int height = 0;
const uchar* image = frame.get_image(format, width, height);
- QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
- memcpy(qimage.scanLine(0), image, width * height * 4);
- emit frameUpdated(qimage.rgbSwapped());
+ QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied);
+ memcpy(qimage.scanLine(0), image, width * height * 3);
+ emit frameUpdated(qimage);
}
int Render::getCurrentSeekPosition() const
void Render::emitFrameNumber()
{
int currentPos = m_mltConsumer->position();
- if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
+ if (currentPos == requestedSeekPosition) {
+ requestedSeekPosition = SEEK_INACTIVE;
+ m_paused = true;
+ }
emit rendererPosition(currentPos);
if (requestedSeekPosition != SEEK_INACTIVE) {
m_mltConsumer->purge();
m_mltProducer->seek(requestedSeekPosition);
- if (m_mltProducer->get_speed() == 0 && m_paused) {
- m_paused = false;
+ if (m_mltProducer->get_speed() == 0 && !m_paused) {
m_mltConsumer->set("refresh", 1);
}
requestedSeekPosition = SEEK_INACTIVE;
if (currentPos == requestedSeekPosition) requestedSeekPosition = SEEK_INACTIVE;
emit rendererPosition(currentPos);
if (frame->is_valid()) {
- mlt_image_format format = mlt_image_rgb24a;
+ mlt_image_format format = mlt_image_rgb24;
int width = 0;
int height = 0;
const uchar* image = frame->get_image(format, width, height);
- QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
- memcpy(qimage.scanLine(0), image, width * height * 4);
+ QImage qimage(width, height, QImage::Format_RGB888); //Format_ARGB32_Premultiplied);
+ memcpy(qimage.scanLine(0), image, width * height * 3);
if (analyseAudio) showAudio(*frame);
delete frame;
emit showImageSignal(qimage);
if (sendFrameForAnalysis) {
- emit frameUpdated(qimage.rgbSwapped());
+ emit frameUpdated(qimage);
}
} else delete frame;
showFrameSemaphore.release();
int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
trackPlaylist.insert_blank(clipIndex, cutDuration);
}
+ trackPlaylist.consolidate_blanks(0);
int newIndex = trackPlaylist.insert_at(insertPos, clip, 1);
delete clip;
/*if (QString(prod->get("transparency")).toInt() == 1)
newLength = trackPlaylist.clip_length(clipIndex);
service.unlock();
} else if (speed == 1.0 && strobe < 2) {
+ if (!prod || !prod->is_valid()) {
+ kDebug()<<"// Something is wrong with producer";
+ return -1;
+ }
service.lock();
Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
filter = service.filter(ct);
}
- addFilterToService(service, params, duration);
+ bool success = addFilterToService(service, params, duration);
// re-add following filters
for (int i = 0; i < filtersList.count(); i++) {
}
service.unlock();
if (doRefresh) refresh();
- return true;
+ return success;
}
// create filter
QString tag = params.paramValue("tag");
//kDebug() << " / / INSERTING EFFECT: " << tag << ", REGI: " << region;
- char *filterTag = qstrdup(tag.toUtf8().constData());
- char *filterId = qstrdup(params.paramValue("id").toUtf8().constData());
QString kfr = params.paramValue("keyframes");
- if (!kfr.isEmpty()) {
+ if (!kfr.isEmpty()) {
QStringList keyFrames = kfr.split(';', QString::SkipEmptyParts);
//kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
char *starttag = qstrdup(params.paramValue("starttag", "start").toUtf8().constData());
int offset = 0;
// Special case, only one keyframe, means we want a constant value
if (keyFrames.count() == 1) {
- Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData()));
if (filter && filter->is_valid()) {
- filter->set("kdenlive_id", filterId);
+ filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData()));
int x1 = keyFrames.at(0).section(':', 0, 0).toInt();
double y1 = keyFrames.at(0).section(':', 1, 1).toDouble();
for (int j = 0; j < params.count(); j++) {
//kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
filter->set(starttag, m_locale.toString(((min + y1) - paramOffset) / factor).toUtf8().data());
service.attach(*filter);
- }
+ } else {
+ delete[] starttag;
+ delete[] endtag;
+ kDebug() << "filter is NULL";
+ service.unlock();
+ return false;
+ }
} else for (int i = 0; i < keyFrames.size() - 1; ++i) {
- Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData()));
if (filter && filter->is_valid()) {
- filter->set("kdenlive_id", filterId);
+ filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData()));
int x1 = keyFrames.at(i).section(':', 0, 0).toInt() + offset;
double y1 = keyFrames.at(i).section(':', 1, 1).toDouble();
int x2 = keyFrames.at(i + 1).section(':', 0, 0).toInt();
filter->set(endtag, m_locale.toString(((min + y2) - paramOffset) / factor).toUtf8().data());
service.attach(*filter);
offset = 1;
- }
+ } else {
+ delete[] starttag;
+ delete[] endtag;
+ kDebug() << "filter is NULL";
+ service.unlock();
+ return false;
+ }
}
delete[] starttag;
delete[] endtag;
} else {
Mlt::Filter *filter;
QString prefix;
- filter = new Mlt::Filter(*m_mltProfile, filterTag);
+ filter = new Mlt::Filter(*m_mltProfile, qstrdup(tag.toUtf8().constData()));
if (filter && filter->is_valid()) {
- filter->set("kdenlive_id", filterId);
+ filter->set("kdenlive_id", qstrdup(params.paramValue("id").toUtf8().constData()));
} else {
kDebug() << "filter is NULL";
service.unlock();
// attach filter to the clip
service.attach(*filter);
}
-
- delete[] filterId;
- delete[] filterTag;
return true;
}
bool checkLength = false;
if (endTrack == startTrack) {
Mlt::Producer *clipProducer = trackPlaylist.replace_with_blank(clipIndex);
+ if (!clipProducer) {
+ kDebug() << "// Cannot get clip at index: "<<clipIndex<<" / "<< moveStart;
+ service.unlock();
+ return false;
+ }
+ trackPlaylist.consolidate_blanks(0);
if (!overwrite) {
bool success = true;
if (!trackPlaylist.is_blank_at(moveEnd) || !clipProducer || !clipProducer->is_valid() || clipProducer->is_blank()) {
service.unlock();
return false;
}
- }
-
- if (overwrite) {
+ } else {
+ // Overwrite mode
trackPlaylist.remove_region(moveEnd, clipProducer->get_playtime());
- int clipIndex = trackPlaylist.get_clip_index_at(moveEnd);
- trackPlaylist.insert_blank(clipIndex, clipProducer->get_playtime() - 1);
+ int ix = trackPlaylist.get_clip_index_at(moveEnd);
+ trackPlaylist.insert_blank(ix, clipProducer->get_playtime() - 1);
+ trackPlaylist.consolidate_blanks(0);
}
int newIndex = trackPlaylist.insert_at(moveEnd, clipProducer, 1);
if (newIndex == -1) {
service.unlock();
return false;
}
- trackPlaylist.consolidate_blanks(1);
+ trackPlaylist.consolidate_blanks(0);
delete clipProducer;
- if (newIndex + 1 == trackPlaylist.count()) checkLength = true;
+ if (newIndex + 1 >= trackPlaylist.count()) checkLength = true;
} else {
Mlt::Producer destTrackProducer(tractor.track(endTrack));
Mlt::Playlist destTrackPlaylist((mlt_playlist) destTrackProducer.get_service());
destTrackPlaylist.remove_region(moveEnd, clip->get_playtime());
int clipIndex = destTrackPlaylist.get_clip_index_at(moveEnd);
destTrackPlaylist.insert_blank(clipIndex, clip->get_playtime() - 1);
+ destTrackPlaylist.consolidate_blanks(0);
}
int newIndex = destTrackPlaylist.insert_at(moveEnd, clip, 1);
Mlt::Properties trans_props(transition.get_properties());
Mlt::Transition new_transition(*m_mltProfile, transition.get("mlt_service"));
Mlt::Properties new_trans_props(new_transition.get_properties());
- new_trans_props.inherit(trans_props);
- new_transition.set_in_and_out(new_in, new_out);
+ // We cannot use MLT's property inherit because it also clones internal values like _unique_id which messes up the playlist
+ cloneProperties(new_trans_props, trans_props);
+ new_transition.set_in_and_out(new_in, new_out);
field->disconnect_service(transition);
mltPlantTransition(field, new_transition, newTransitionTrack, newTrack);
- //field->plant_transition(new_transition, newTransitionTrack, newTrack);
} else transition.set_in_and_out(new_in, new_out);
break;
}
return found;
}
+void Render::cloneProperties(Mlt::Properties &dest, Mlt::Properties &source)
+{
+ int count = source.count();
+ int i = 0;
+ for ( i = 0; i < count; i ++ )
+ {
+ char *value = source.get(i);
+ if ( value != NULL )
+ {
+ char *name = source.get_name( i );
+ if (name != NULL && name[0] != '_') dest.set(name, value);
+ }
+ }
+}
void Render::mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track)
{
Mlt::Properties trans_props(transition.get_properties());
Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
Mlt::Properties new_trans_props(cp->get_properties());
- new_trans_props.inherit(trans_props);
+ //new_trans_props.inherit(trans_props);
+ cloneProperties(new_trans_props, trans_props);
trList.append(cp);
field->disconnect_service(transition);
}
Mlt::Properties trans_props(transition.get_properties());
Mlt::Transition *cp = new Mlt::Transition(*m_mltProfile, transition.get("mlt_service"));
Mlt::Properties new_trans_props(cp->get_properties());
- new_trans_props.inherit(trans_props);
+ cloneProperties(new_trans_props, trans_props);
+ //new_trans_props.inherit(trans_props);
if (trackChanged) {
// Transition track needs to be adjusted
projects / kdenlive / blobdiff