#endif
self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
+ if (frame_ptr->convert_image)
+ self->emitFrameUpdated(frame);
if (frame.get_double("_speed") == 0.0) {
self->emitConsumerStopped();
} else if (frame.get_double("_speed") < 0.0 && mlt_frame_get_position(frame_ptr) <= 0) {
delete[] tmp;
}
+ int volume = KdenliveSettings::volume();
+ m_mltConsumer->set("volume", (float)volume / 100);
m_mltConsumer->set("progressive", 1);
m_mltConsumer->set("audio_buffer", 1024);
QString videoDriver = KdenliveSettings::videodrivername();
QString currentDriver = m_mltConsumer->get("video_driver");
if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
- if (m_activeProfile == profileName && currentDriver == videoDriver) {
+ QString background = KdenliveSettings::window_background().name();
+ QString currentBackground = m_mltConsumer->get("window_background");
+ int volume = KdenliveSettings::volume();
+ int currentVolume = (int)(QString(m_mltConsumer->get("volume")).toDouble() * 100.0);
+ if (m_activeProfile == profileName && currentDriver == videoDriver && volume == currentVolume && background == currentBackground) {
kDebug() << "reset to same profile, nothing to do";
return 1;
}
if (aindex != 0) producer->set("audio_index", aindex);
}
+ // setup length here as otherwise default length (currently 15000 frames in MLT) will be taken although outpoint is larger
+ if (xml.attribute("type").toInt() == COLOR || xml.attribute("type").toInt() == TEXT
+ || xml.attribute("type").toInt() == IMAGE || xml.attribute("type").toInt() == SLIDESHOW)
+ producer->set("length", xml.attribute("out").toInt() - xml.attribute("in").toInt() + 1);
+
if (xml.hasAttribute("out")) producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
char *tmp = decodedString(clipId);
int frame_height = imageHeight;
uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32);
- QPixmap pix(frame_width, frame_height);
+ QPixmap pix;
if (!image.isNull()) {
- pix = QPixmap::fromImage(image.rgbSwapped());
+ if (frame_width > (2 * width)) {
+ // there was a scaling problem, do it manually
+ QImage scaled = image.scaled(width, imageHeight);
+ pix = QPixmap::fromImage(scaled.rgbSwapped());
+ } else pix = QPixmap::fromImage(image.rgbSwapped());
} else
pix.fill(Qt::black);
return m_name;
}
+void Render::emitFrameUpdated(Mlt::Frame& frame)
+{
+ mlt_image_format format = mlt_image_rgb24a;
+ int width = 0;
+ int height = 0;
+ const uchar* image = frame.get_image(format, width, height);
+ QImage qimage(width, height, QImage::Format_ARGB32);
+ memcpy(qimage.bits(), image, width * height * 4);
+ emit frameUpdated(qimage.rgbSwapped());
+}
+
void Render::emitFrameNumber(double position)
{
- if (position == m_framePosition) {
- emit frameUpdated((int) position);
- return;
- }
m_framePosition = position;
emit rendererPosition((int) position);
}
return newLength;
}
+bool Render::mltRemoveTrackEffect(int track, QString index, bool updateIndex)
+{
+ kDebug() << "REMOVE TK EFF: " << track << ", IX: " << index;
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ bool success = false;
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ Mlt::Service clipService(trackPlaylist.get_service());
+
+ m_isBlocked = true;
+ int ct = 0;
+ Mlt::Filter *filter = clipService.filter(ct);
+ while (filter) {
+ if ((index == "-1" && strcmp(filter->get("kdenlive_id"), "")) || filter->get("kdenlive_ix") == index) {
+ if (clipService.detach(*filter) == 0) success = true;
+ } else if (updateIndex) {
+ // Adjust the other effects index
+ if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+ ct++;
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+ m_isBlocked = false;
+ refresh();
+ return success;
+}
+
bool Render::mltRemoveEffect(int track, GenTime position, QString index, bool updateIndex, bool doRefresh)
{
+ if (position < GenTime()) {
+ // Remove track effect
+ return mltRemoveTrackEffect(track, index, updateIndex);
+ }
Mlt::Service service(m_mltProducer->parent().get_service());
bool success = false;
Mlt::Tractor tractor(service);
return success;
}
+bool Render::mltAddTrackEffect(int track, EffectsParameterList params)
+{
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ Mlt::Service trackService(trackProducer.get_service()); //trackPlaylist
+ return mltAddEffect(trackService, params, 15000, true);
+}
+
bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh)
{
Mlt::Service clipService(clip->get_service());
m_isBlocked = true;
int duration = clip->get_playtime();
- bool updateIndex = false;
if (doRefresh) {
// Check if clip is visible in monitor
int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
if (diff < 0 || diff > duration) doRefresh = false;
}
delete clip;
+ return mltAddEffect(clipService, params, duration, doRefresh);
+}
+bool Render::mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh)
+{
+ bool updateIndex = false;
const int filter_ix = params.paramValue("kdenlive_ix").toInt();
const QString region = params.paramValue("region");
int ct = 0;
- Mlt::Filter *filter = clipService.filter(ct);
+ Mlt::Filter *filter = service.filter(ct);
while (filter) {
if (QString(filter->get("kdenlive_ix")).toInt() == filter_ix) {
// A filter at that position already existed, so we will increase all indexes later
break;
}
ct++;
- filter = clipService.filter(ct);
+ filter = service.filter(ct);
}
if (params.paramValue("id") == "speed") {
// special case, speed effect is not really inserted, we just update the other effects index (kdenlive_ix)
ct = 0;
- filter = clipService.filter(ct);
+ filter = service.filter(ct);
while (filter) {
if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) {
if (updateIndex) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1);
}
ct++;
- filter = clipService.filter(ct);
+ filter = service.filter(ct);
}
m_isBlocked = false;
if (doRefresh) refresh();
// temporarily remove all effects after insert point
QList <Mlt::Filter *> filtersList;
ct = 0;
- filter = clipService.filter(ct);
+ filter = service.filter(ct);
while (filter) {
if (QString(filter->get("kdenlive_ix")).toInt() >= filter_ix) {
filtersList.append(filter);
- clipService.detach(*filter);
+ service.detach(*filter);
} else ct++;
- filter = clipService.filter(ct);
+ filter = service.filter(ct);
}
// create filter
//kDebug() << "// ADDING KEYFRAME vals: " << min<<" / "<<max<<", "<<y1<<", factor: "<<factor;
filter->set(starttag, QString::number((min + y1) / factor).toUtf8().data());
filter->set(endtag, QString::number((min + y2) / factor).toUtf8().data());
- clipService.attach(*filter);
+ service.attach(*filter);
offset = 1;
}
}
// attach filter to the clip
- clipService.attach(*filter);
+ service.attach(*filter);
}
delete[] filterId;
delete[] filterTag;
Mlt::Filter *filter = filtersList.at(i);
if (updateIndex)
filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() + 1);
- clipService.attach(*filter);
+ service.attach(*filter);
}
m_isBlocked = false;
if (doRefresh) refresh();
return true;
}
+bool Render::mltEditTrackEffect(int track, EffectsParameterList params)
+{
+ kDebug() << "EDIT TK, FILTER: " << track;
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+ Mlt::Service clipService(trackPlaylist.get_service());
+ m_isBlocked = true;
+ int ct = 0;
+ QString index = params.paramValue("kdenlive_ix");
+ QString tag = params.paramValue("tag");
+
+ Mlt::Filter *filter = clipService.filter(ct);
+ while (filter) {
+ if (filter->get("kdenlive_ix") == index) {
+ break;
+ }
+ ct++;
+ filter = clipService.filter(ct);
+ }
+
+ if (!filter) {
+ kDebug() << "WARINIG, FILTER FOR EDITING NOT FOUND, ADDING IT! " << index << ", " << tag;
+ // filter was not found, it was probably a disabled filter, so add it to the correct place...
+
+ bool success = false;//mltAddTrackEffect(track, params);
+ m_isBlocked = false;
+ return success;
+ }
+ QString prefix;
+ QString ser = filter->get("mlt_service");
+ if (ser == "region") prefix = "filter0.";
+ mlt_service_lock(service.get_service());
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(prefix + params.at(j).name());
+ char *value = decodedString(params.at(j).value());
+ filter->set(name, value);
+ delete[] name;
+ delete[] value;
+ }
+ mlt_service_unlock(service.get_service());
+
+ m_isBlocked = false;
+ refresh();
+ return true;
+
+}
+
bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params)
{
QString index = params.paramValue("kdenlive_ix");
bool success = mltAddEffect(track, position, params);
return success;
}
-
+ if (position < GenTime()) {
+ return mltEditTrackEffect(track, params);
+ }
// find filter
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
void Render::mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos)
{
-
- kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
Mlt::Service service(m_mltProducer->parent().get_service());
-
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+
+ int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
if (!clip) {
kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
return;
}
+
Mlt::Service clipService(clip->get_service());
+ int duration = clip->get_playtime();
+ bool doRefresh = true;
+ // Check if clip is visible in monitor
+ int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
+ if (diff < 0 || diff > duration) doRefresh = false;
delete clip;
+
m_isBlocked = true;
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
}
m_isBlocked = false;
- refresh();
+ if (doRefresh) refresh();
}
void Render::mltMoveEffect(int track, GenTime position, int oldPos, int newPos)
{
-
- kDebug() << "MOVING EFFECT FROM " << oldPos << ", TO: " << newPos;
+ if (position < GenTime()) {
+ mltMoveTrackEffect(track, oldPos, newPos);
+ return;
+ }
Mlt::Service service(m_mltProducer->parent().get_service());
-
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- //int clipIndex = trackPlaylist.get_clip_index_at(position.frames(m_fps));
- Mlt::Producer *clip = trackPlaylist.get_clip_at((int) position.frames(m_fps));
+
+ int clipIndex = trackPlaylist.get_clip_index_at((int) position.frames(m_fps));
+ Mlt::Producer *clip = trackPlaylist.get_clip(clipIndex);
if (!clip) {
kDebug() << "WARINIG, CANNOT FIND CLIP ON track: " << track << ", AT POS: " << position.frames(m_fps);
return;
}
+
Mlt::Service clipService(clip->get_service());
+ int duration = clip->get_playtime();
+ bool doRefresh = true;
+ // Check if clip is visible in monitor
+ int diff = trackPlaylist.clip_start(clipIndex) + duration - m_mltProducer->position();
+ if (diff < 0 || diff > duration) doRefresh = false;
delete clip;
+
m_isBlocked = true;
int ct = 0;
QList <Mlt::Filter *> filtersList;
clipService.attach(*(filtersList.at(i)));
}
+ m_isBlocked = false;
+ if (doRefresh) refresh();
+}
+
+void Render::mltMoveTrackEffect(int track, int oldPos, int newPos)
+{
+ Mlt::Service service(m_mltProducer->parent().get_service());
+ Mlt::Tractor tractor(service);
+ Mlt::Producer trackProducer(tractor.track(track));
+ Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
+
+ Mlt::Service clipService(trackPlaylist.get_service());
+
+ m_isBlocked = true;
+ int ct = 0;
+ QList <Mlt::Filter *> filtersList;
+ Mlt::Filter *filter = clipService.filter(ct);
+ bool found = false;
+ if (newPos > oldPos) {
+ while (filter) {
+ if (!found && QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+ filter->set("kdenlive_ix", newPos);
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ filter = clipService.filter(ct);
+ while (filter && QString(filter->get("kdenlive_ix")).toInt() <= newPos) {
+ filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+ ct++;
+ filter = clipService.filter(ct);
+ }
+ found = true;
+ }
+ if (filter && QString(filter->get("kdenlive_ix")).toInt() > newPos) {
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+ } else {
+ while (filter) {
+ if (QString(filter->get("kdenlive_ix")).toInt() == oldPos) {
+ filter->set("kdenlive_ix", newPos);
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+
+ ct = 0;
+ filter = clipService.filter(ct);
+ while (filter) {
+ int pos = QString(filter->get("kdenlive_ix")).toInt();
+ if (pos >= newPos) {
+ if (pos < oldPos) filter->set("kdenlive_ix", pos + 1);
+ filtersList.append(filter);
+ clipService.detach(*filter);
+ } else ct++;
+ filter = clipService.filter(ct);
+ }
+ }
+
+ for (int i = 0; i < filtersList.count(); i++) {
+ clipService.attach(*(filtersList.at(i)));
+ }
m_isBlocked = false;
refresh();
}
int new_in = (int)newIn.frames(m_fps);
int new_out = (int)newOut.frames(m_fps) - 1;
if (new_in >= new_out) return false;
+ int old_in = (int)oldIn.frames(m_fps);
+ int old_out = (int)oldOut.frames(m_fps) - 1;
Mlt::Service service(m_mltProducer->parent().get_service());
Mlt::Tractor tractor(service);
Mlt::Field *field = tractor.field();
+ bool doRefresh = true;
+ // Check if clip is visible in monitor
+ int diff = old_out - m_mltProducer->position();
+ if (diff < 0 || diff > old_out - old_in) doRefresh = false;
+ if (doRefresh) {
+ diff = new_out - m_mltProducer->position();
+ if (diff < 0 || diff > new_out - new_in) doRefresh = false;
+ }
+
m_isBlocked++;
mlt_service_lock(service.get_service());
mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
QString mlt_type = mlt_properties_get(properties, "mlt_type");
QString resource = mlt_properties_get(properties, "mlt_service");
- int old_pos = (int)(oldIn.frames(m_fps) + oldOut.frames(m_fps)) / 2;
+ int old_pos = (int)(old_in + old_out) / 2;
bool found = false;
while (mlt_type == "transition") {
}
mlt_service_unlock(service.get_service());
m_isBlocked--;
- refresh();
+ if (doRefresh) refresh();
//if (m_isBlocked == 0) m_mltConsumer->set("refresh", 1);
return found;
}
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
mltAddTransition(tag, a_track, b_track, in, out, xml, false);
}
- refresh();
- //mltSavePlaylist();
+
+ if (m_mltProducer->position() > in.frames(m_fps) && m_mltProducer->position() < out.frames(m_fps)) refresh();
}
void Render::mltUpdateTransitionParams(QString type, int a_track, int b_track, GenTime in, GenTime out, QDomElement xml)
QMap<QString, QString>::Iterator it;
QString key;
mlt_properties transproperties = MLT_TRANSITION_PROPERTIES(tr);
+
+ QString currentId = mlt_properties_get(transproperties, "kdenlive_id");
+ if (currentId != xml.attribute("id")) {
+ // The transition ID is not the same, so reset all properties
+ char *tmp = decodedString(xml.attribute("id"));
+ mlt_properties_set(transproperties, "kdenlive_id", tmp);
+ delete[] tmp;
+ // Cleanup previous properties
+ QStringList permanentProps;
+ permanentProps << "factory" << "kdenlive_id" << "mlt_service" << "mlt_type" << "in";
+ permanentProps << "out" << "a_track" << "b_track";
+ for (int i = 0; i < mlt_properties_count(transproperties); i++) {
+ QString propName = mlt_properties_get_name(transproperties, i);
+ if (!propName.startsWith('_') && ! permanentProps.contains(propName)) {
+ tmp = decodedString(propName);
+ mlt_properties_set(transproperties, tmp, "");
+ delete[] tmp;
+ }
+ }
+ }
+
mlt_properties_set_int(transproperties, "force_track", xml.attribute("force_track").toInt());
mlt_properties_set_int(transproperties, "automatic", xml.attribute("automatic", "0").toInt());
- // update the transition id in case it uses the same MLT service but different Kdenlive id
- char *tmp = decodedString(xml.attribute("id"));
- mlt_properties_set(transproperties, "kdenlive_id", tmp);
- delete[] tmp;
+
if (currentBTrack != a_track) {
- mlt_properties_set_int(properties, "a_track", a_track);
+ mlt_properties_set_int(transproperties, "a_track", a_track);
}
for (it = map.begin(); it != map.end(); ++it) {
key = it.key();
Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, transId);
if (out != GenTime())
transition->set_in_and_out((int) in.frames(m_fps), (int) out.frames(m_fps) - 1);
+
+ if (do_refresh && (m_mltProducer->position() < in.frames(m_fps) || m_mltProducer->position() > out.frames(m_fps))) do_refresh = false;
QMap<QString, QString>::Iterator it;
QString key;
if (xml.attribute("automatic") == "1") transition->set("automatic", 1);