#include "kthumb.h"
#include "definitions.h"
#include "slideshowclip.h"
+#include "profilesdialog.h"
+#include "blackmagic/devices.h"
#include <mlt++/Mlt.h>
#include <cstdlib>
#include <cstdarg>
-
+#include <QDebug>
static void kdenlive_callback(void* /*ptr*/, int level, const char* fmt, va_list vl)
{
if (self->sendFrameForAnalysis && frame_ptr->convert_image) {
self->emitFrameUpdated(frame);
}
- self->showAudio(frame);
+ if (self->analyseAudio) {
+ self->showAudio(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) {
Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
QObject(parent),
m_isBlocked(0),
+ analyseAudio(KdenliveSettings::monitor_audio()),
sendFrameForAnalysis(false),
m_name(rendererName),
m_mltConsumer(NULL),
m_mltProducer(NULL),
m_mltProfile(NULL),
m_framePosition(0),
+ m_externalConsumer(false),
m_isZoneMode(false),
m_isLoopMode(false),
m_isSplitView(false),
{
m_isBlocked = 1;
closeMlt();
+ delete m_mltProfile;
}
nextservicetodisconnect = nextservice;
nextservice = mlt_service_producer(nextservice);
mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
- nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
properties = MLT_SERVICE_PROPERTIES(nextservice);
mlt_type = mlt_properties_get(properties, "mlt_type");
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
if (trackPlaylist.type() == playlist_type) trackPlaylist.clear();
}
+ delete field;
+ field = NULL;
}
mlt_service_unlock(service.get_service());
}
m_blackClip = NULL;
//TODO: uncomment following line when everything is clean
- //if (m_mltProfile) delete m_mltProfile;
+ // uncommented Feb 2011 --Granjow
+ if (m_mltProfile) delete m_mltProfile;
+
m_mltProfile = new Mlt::Profile(tmp);
+ m_mltProfile->get_profile()->is_explicit = 1;
delete[] tmp;
+ 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 != "clip") {
+ // Use blackmagic card for video output
+ QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName);
+ int device = KdenliveSettings::blackmagic_output_device();
+ if (device >= 0) {
+ if (BMInterface::isSupportedProfile(device, profileProperties)) {
+ QString decklink = "decklink:" + QString::number(KdenliveSettings::blackmagic_output_device());
+ tmp = qstrdup(decklink.toUtf8().constData());
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile, tmp);
+ delete[] tmp;
+ if (m_mltConsumer->is_valid()) {
+ m_externalConsumer = true;
+ m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+ m_mltConsumer->set("terminate_on_pause", 0);
+ m_mltConsumer->set("buffer", 12);
+ m_mltConsumer->set("deinterlace_method", "onefield");
+ m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
+ mlt_log_set_callback(kdenlive_callback);
+ }
+ if (m_mltConsumer && m_mltConsumer->is_valid()) return;
+ } else KMessageBox::informationList(qApp->activeWindow(), i18n("Your project's profile %1 is not compatible with the blackmagic output card. Please see supported profiles below. Switching to normal video display.", m_mltProfile->description()), BMInterface::supportedModes(KdenliveSettings::blackmagic_output_device()));
+ }
+ }
+ m_externalConsumer = false;
QString videoDriver = KdenliveSettings::videodrivername();
if (!videoDriver.isEmpty()) {
if (videoDriver == "x11_noaccel") {
m_mltConsumer->set("progressive", 1);
m_mltConsumer->set("audio_buffer", 1024);
m_mltConsumer->set("frequency", 48000);
-
- m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black");
- m_blackClip->set("id", "black");
- m_blackClip->set("mlt_type", "producer");
+ m_mltConsumer->set("real_time", KdenliveSettings::mltthreads());
}
Mlt::Producer *Render::invalidProducer(const QString &id)
int Render::resetProfile(const QString profileName)
{
if (m_mltConsumer) {
- QString videoDriver = KdenliveSettings::videodrivername();
- QString currentDriver = m_mltConsumer->get("video_driver");
- if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
- QString background = KdenliveSettings::window_background().name();
- QString currentBackground = m_mltConsumer->get("window_background");
- if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
- kDebug() << "reset to same profile, nothing to do";
- return 1;
+ if (m_externalConsumer == KdenliveSettings::external_display()) {
+ if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1;
+ QString videoDriver = KdenliveSettings::videodrivername();
+ QString currentDriver = m_mltConsumer->get("video_driver");
+ if (getenv("SDL_VIDEO_YUV_HWACCEL") != NULL && currentDriver == "x11") currentDriver = "x11_noaccel";
+ QString background = KdenliveSettings::window_background().name();
+ QString currentBackground = m_mltConsumer->get("window_background");
+ if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
+ kDebug() << "reset to same profile, nothing to do";
+ return 1;
+ }
}
if (m_isSplitView) slotSplitView(false);
refresh();
}
+void Render::seek(int time)
+{
+ if (!m_mltProducer)
+ return;
+ m_isBlocked = false;
+ m_mltProducer->seek(time);
+ refresh();
+}
+
//static
/*QPixmap Render::frameThumbnail(Mlt::Frame *frame, int width, int height, bool border) {
QPixmap pix(width, height);
return m_mltProfile->dar();
}
+double Render::sar() const
+{
+ return m_mltProfile->sar();
+}
void Render::slotSplitView(bool doit)
{
}
}
-void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer)
+void Render::getFileProperties(const QDomElement xml, const QString &clipId, int imageHeight, bool replaceProducer, bool selectClip)
{
- KUrl url = KUrl(xml.attribute("resource", QString()));
+ QString path;
+ bool proxyProducer;
+ if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") {
+ path = xml.attribute("proxy");
+ proxyProducer = true;
+ }
+ else {
+ path = xml.attribute("resource");
+ proxyProducer = false;
+ }
+
+
+ KUrl url = KUrl(path);
Mlt::Producer *producer = NULL;
+ CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt();
//kDebug() << "PROFILE WIDT: "<< xml.attribute("mlt_service") << ": "<< m_mltProfile->width() << "\n...................\n\n";
/*if (xml.attribute("type").toInt() == TEXT && !QFile::exists(url.path())) {
emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
return;
}*/
- if (xml.attribute("type").toInt() == COLOR) {
+
+ if (type == COLOR) {
producer = new Mlt::Producer(*m_mltProfile, 0, ("colour:" + xml.attribute("colour")).toUtf8().constData());
- } else if (xml.attribute("type").toInt() == TEXT) {
+ } else if (type == TEXT) {
producer = new Mlt::Producer(*m_mltProfile, 0, ("kdenlivetitle:" + xml.attribute("resource")).toUtf8().constData());
if (producer && producer->is_valid() && xml.hasAttribute("xmldata"))
producer->set("xmldata", xml.attribute("xmldata").toUtf8().constData());
producer = new Mlt::Producer(*m_mltProfile, url.path().toUtf8().constData());
}
+
if (producer == NULL || producer->is_blank() || !producer->is_valid()) {
kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: ";
- emit removeInvalidClip(clipId, replaceProducer);
+ if (proxyProducer) {
+ // Proxy file is corrupted
+ emit removeInvalidProxy(clipId, false);
+ }
+ else emit removeInvalidClip(clipId, replaceProducer);
delete producer;
return;
}
+ if (proxyProducer && xml.hasAttribute("proxy_out") && producer->get_out() != xml.attribute("proxy_out").toInt()) {
+ // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip
+ emit removeInvalidProxy(clipId, true);
+ }
+
if (xml.hasAttribute("force_aspect_ratio")) {
double aspect = xml.attribute("force_aspect_ratio").toDouble();
if (aspect > 0) producer->set("force_aspect_ratio", aspect);
}
+ if (xml.hasAttribute("force_aspect_num") && xml.hasAttribute("force_aspect_den")) {
+ int width = xml.attribute("frame_size").section('x', 0, 0).toInt();
+ int height = xml.attribute("frame_size").section('x', 1, 1).toInt();
+ int aspectNumerator = xml.attribute("force_aspect_num").toInt();
+ int aspectDenominator = xml.attribute("force_aspect_den").toInt();
+ if (aspectDenominator != 0 && width != 0)
+ producer->set("force_aspect_ratio", double(height) * aspectNumerator / aspectDenominator / width);
+ }
+
if (xml.hasAttribute("force_fps")) {
double fps = xml.attribute("force_fps").toDouble();
if (fps > 0) producer->set("force_fps", fps);
int progressive = xml.attribute("force_progressive").toInt(&ok);
if (ok) producer->set("force_progressive", progressive);
}
+ if (xml.hasAttribute("force_tff")) {
+ bool ok;
+ int fieldOrder = xml.attribute("force_tff").toInt(&ok);
+ if (ok) producer->set("force_tff", fieldOrder);
+ }
if (xml.hasAttribute("threads")) {
int threads = xml.attribute("threads").toInt();
if (threads != 1) producer->set("threads", threads);
if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
}
+ int clipOut = 0;
+ int duration = 0;
+ if (xml.hasAttribute("out")) clipOut = xml.attribute("out").toInt();
+
// setup length here as otherwise default length (currently 15000 frames in MLT) will be taken even if 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 (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
+ int length;
+ if (xml.hasAttribute("length")) {
+ if (clipOut > 0) duration = clipOut + 1;
+ length = xml.attribute("length").toInt();
+ clipOut = length - 1;
+ }
+ else length = xml.attribute("out").toInt() - xml.attribute("in").toInt();
+ producer->set("length", length);
+ }
- if (xml.hasAttribute("out"))
- producer->set_in_and_out(xml.attribute("in").toInt(), xml.attribute("out").toInt());
+ if (clipOut > 0) producer->set_in_and_out(xml.attribute("in").toInt(), clipOut);
producer->set("id", clipId.toUtf8().constData());
if (xml.hasAttribute("templatetext"))
producer->set("templatetext", xml.attribute("templatetext").toUtf8().constData());
- if (!replaceProducer && xml.hasAttribute("file_hash")) {
+ if ((!replaceProducer && xml.hasAttribute("file_hash")) || xml.hasAttribute("proxy")) {
// Clip already has all properties
- emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer);
+ emit replyGetFileProperties(clipId, producer, QMap < QString, QString >(), QMap < QString, QString >(), replaceProducer, selectClip);
return;
}
int frameNumber = xml.attribute("thumbnail", "0").toInt();
if (frameNumber != 0) producer->seek(frameNumber);
- filePropertyMap["duration"] = QString::number(producer->get_playtime());
- //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer.get_playtime();
+ filePropertyMap["duration"] = QString::number(duration > 0 ? duration : producer->get_playtime());
+ //kDebug() << "/////// PRODUCER: " << url.path() << " IS: " << producer->get_playtime();
Mlt::Frame *frame = producer->get_frame();
- if (xml.attribute("type").toInt() == SLIDESHOW) {
+ if (type == SLIDESHOW) {
int ttl = xml.hasAttribute("ttl") ? xml.attribute("ttl").toInt() : 0;
if (ttl) producer->set("ttl", ttl);
if (!xml.attribute("animation").isEmpty()) {
else
filePropertyMap["type"] = "video";
+ int variance;
mlt_image_format format = mlt_image_rgb24a;
int frame_width = width;
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_Premultiplied);
QPixmap pix;
-
- if (!image.isNull()) {
- 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);
-
+ do {
+ variance = 100;
+ uint8_t *data = frame->get_image(format, frame_width, frame_height, 0);
+ QImage image((uchar *)data, frame_width, frame_height, QImage::Format_ARGB32_Premultiplied);
+
+ if (!image.isNull()) {
+ 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());
+ variance = KThumb::imageVariance(image);
+ } else
+ pix.fill(Qt::black);
+
+ if (frameNumber == 0 && variance < 6) {
+ // Thumbnail is not interesting (for example all black, seek to fetch better thumb
+ frameNumber = 100;
+ producer->seek(frameNumber);
+ delete frame;
+ frame = producer->get_frame();
+ variance = -1;
+ }
+ } while (variance == -1);
emit replyGetImage(clipId, pix);
} else if (frame->get_int("test_audio") == 0) {
filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData());
filePropertyMap["colorspace"] = producer->get("meta.media.colorspace");
- if (KdenliveSettings::dropbframes()) {
- kDebug() << "// LOOKING FOR H264 on: " << default_video;
- snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
- kDebug() << "PROP: " << property << " = " << producer->get(property);
- if (producer->get(property) && strcmp(producer->get(property), "h264") == 0) {
- kDebug() << "// GOT H264 CLIP, SETTING FAST PROPS";
- producer->set("skip_loop_filter", "all");
- producer->set("skip_frame", "bidir");
- }
- }
-
} else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
if (producer->get_int("audio_index") > -1) {
// Get the audio_index
metadataPropertyMap[ name.section('.', 0, -2)] = value;
}
producer->seek(0);
- kDebug() << "REquested fuile info for: " << url.path();
- emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer);
+ emit replyGetFileProperties(clipId, producer, filePropertyMap, metadataPropertyMap, replaceProducer, selectClip);
// FIXME: should delete this to avoid a leak...
//delete producer;
}
m_mltProducer = new Mlt::Producer(producer->get_producer());
} else m_mltProducer = m_blackClip->cut(0, 50);
- /*if (KdenliveSettings::dropbframes()) {
- m_mltProducer->set("skip_loop_filter", "all");
- m_mltProducer->set("skip_frame", "bidir");
- }*/
if (!m_mltProducer || !m_mltProducer->is_valid()) {
kDebug() << " WARNING - - - - -INVALID PLAYLIST: ";
return -1;
m_isBlocked = true;
int error = 0;
- kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
+ //kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
+
+ // Remove previous profile info
+ QDomDocument doc;
+ doc.setContent(playlist);
+ QDomElement profile = doc.documentElement().firstChildElement("profile");
+ doc.documentElement().removeChild(profile);
+ playlist = doc.toString();
if (m_mltConsumer) {
if (!m_mltConsumer->is_stopped()) {
m_mltProducer->set_speed(0);
//if (KdenliveSettings::osdtimecode() && m_osdInfo) m_mltProducer->detach(*m_osdInfo);
-
Mlt::Service service(m_mltProducer->parent().get_service());
mlt_service_lock(service.get_service());
}
blockSignals(true);
- m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
+ // TODO: Better way to do this
+ if (KdenliveSettings::projectloading_avformatnovalidate())
+ playlist.replace(">avformat</property>", ">avformat-novalidate</property>");
+ else
+ playlist.replace(">avformat-novalidate</property>", ">avformat</property>");
+ m_mltProducer = new Mlt::Producer(*m_mltProfile, "xml-string", playlist.toUtf8().constData());
if (!m_mltProducer || !m_mltProducer->is_valid()) {
kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << playlist.toUtf8().constData();
m_mltProducer = m_blackClip->cut(0, 50);
void Render::setDropFrames(bool show)
{
if (m_mltConsumer) {
- int dropFrames = 1;
- if (show == false) dropFrames = 0;
+ int dropFrames = KdenliveSettings::mltthreads();
+ if (show == false) dropFrames = -dropFrames;
m_mltConsumer->stop();
if (m_winid == 0)
m_mltConsumer->set("real_time", dropFrames);
QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
memcpy(qimage.scanLine(0), image, width * height * 4);
emit showImageSignal(qimage);
- showAudio(frame);
+ if (analyseAudio) showAudio(frame);
if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
emit frameUpdated(qimage.rgbSwapped());
}
void Render::showAudio(Mlt::Frame& frame)
{
- if (!frame.is_valid() || frame.get_int("test_audio") != 0) return;
+ if (!frame.is_valid() || frame.get_int("test_audio") != 0) {
+ return;
+ }
mlt_audio_format audio_format = mlt_audio_s16;
int freq = 0;
int num_channels = 0;
int samples = 0;
int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples);
- if (!data)
+
+ if (!data) {
return;
- int num_samples = samples > 200 ? 200 : samples;
- QByteArray channels;
- for (int i = 0; i < num_channels; i++) {
- long val = 0;
- for (int s = 0; s < num_samples; s ++) {
- val += abs(data[i+s*num_channels] / 128);
- }
- channels.append(val / num_samples);
}
+ // Data format: [ c00 c10 c01 c11 c02 c12 c03 c13 ... c0{samples-1} c1{samples-1} for 2 channels.
+ // So the vector is of size samples*channels.
+ QVector<int16_t> sampleVector(samples*num_channels);
+ memcpy(sampleVector.data(), data, samples*num_channels*sizeof(int16_t));
- if (samples > 0)
- emit showAudioSignal(channels);
- else
- emit showAudioSignal(QByteArray());
+ if (samples > 0) {
+ emit audioSamplesSignal(sampleVector, freq, num_channels, samples);
+ }
}
/*
mlt_service_unlock(service.get_service());
return false;
}
- Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps));
+
+ Mlt::Producer *clip2 = prod->cut(info.cropStart.frames(m_fps), (info.cropDuration + info.cropStart).frames(m_fps) - 1);
trackPlaylist.insert_at(info.startPos.frames(m_fps), clip2, 1);
delete clip2;
}
int position = trackPlaylist.clip_start(clipIndex);
int blankDuration = trackPlaylist.clip_length(clipIndex);
- diff = -diff;
- if (blankDuration - diff == 0) {
+ if (blankDuration + diff == 0) {
trackPlaylist.remove(clipIndex);
- } else trackPlaylist.remove_region(position, diff);
+ } else trackPlaylist.remove_region(position, -diff);
}
trackPlaylist.consolidate_blanks(0);
}
QString id = clipparent.get("id");
if (speed <= 0 && speed > -1) speed = 1.0;
//kDebug() << "CLIP SERVICE: " << serv;
- if (serv == "avformat" && (speed != 1.0 || strobe > 1)) {
+ if ((serv == "avformat" || serv == "avformat-novalidate") && (speed != 1.0 || strobe > 1)) {
mlt_service_lock(service.get_service());
QString url = QString::fromUtf8(clipparent.get("resource"));
url.append('?' + QString::number(speed));
if (threads != 0) slowprod->set("threads", threads);
if (original->parent().get("force_progressive"))
slowprod->set("force_progressive", original->parent().get_int("force_progressive"));
+ if (original->parent().get("force_tff"))
+ slowprod->set("force_tff", original->parent().get_int("force_tff"));
int ix = original->parent().get_int("video_index");
if (ix != 0) slowprod->set("video_index", ix);
int colorspace = original->parent().get_int("force_colorspace");
if (fps != 0.0) slowprod->set("force_fps", fps);
if (original->parent().get("force_progressive"))
slowprod->set("force_progressive", original->parent().get_int("force_progressive"));
+ if (original->parent().get("force_tff"))
+ slowprod->set("force_tff", original->parent().get_int("force_tff"));
int threads = original->parent().get_int("threads");
if (threads != 0) slowprod->set("threads", threads);
int ix = original->parent().get_int("video_index");
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);
+ return mltAddEffect(trackService, params, trackProducer.get_playtime() - 1, true);
}
if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle" || params.hasParam("region")) {
// This is a keyframe effect, to edit it, we remove it and re-add it.
bool success = mltRemoveEffect(track, position, index, false);
- if (!success) kDebug() << "// ERROR Removing effect : " << index;
- if (position < GenTime()) success = mltAddTrackEffect(track, params);
- else success = mltAddEffect(track, position, params);
- if (!success) kDebug() << "// ERROR Adding effect : " << index;
+// if (!success) kDebug() << "// ERROR Removing effect : " << index;
+ if (position < GenTime())
+ success = mltAddTrackEffect(track, params);
+ else
+ success = mltAddEffect(track, position, params);
+// if (!success) kDebug() << "// ERROR Adding effect : " << index;
return success;
}
if (position < GenTime()) {
return false;
}
- 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;
+ if (diff < 0 || diff > duration)
+ doRefresh = false;
m_isBlocked = true;
int ct = 0;
- /* kDebug() << "EDITING FILTER: "<<index <<", "<<tag;
- kDebug() << "EFFect stack: ++++++++++++++++++++++++++";
- while (filter) {
- kDebug() << "Filter: "<< filter->get("kdenlive_id") <<", IX: "<<filter->get("kdenlive_ix");
- ct++;
- filter = clipService.filter(ct);
- }
- kDebug() << "++++++++++++++++++++++++++";
- ct = 0;
- filter = clipService.filter(ct); */
- Mlt::Filter *filter = clipService.filter(ct);
+ Mlt::Filter *filter = clip->filter(ct);
while (filter) {
if (filter->get_int("kdenlive_ix") == index.toInt()) {
break;
}
ct++;
- filter = clipService.filter(ct);
+ filter = clip->filter(ct);
}
if (!filter) {
for (int j = 0; j < params.count(); j++) {
filter->set((prefix + params.at(j).name()).toUtf8().constData(), params.at(j).value().toUtf8().constData());
}
+
+ if (params.paramValue("id") == "pan_zoom")
+ filter->set_in_and_out(clip->get_in(), clip->get_out() + 1);
+
+ delete clip;
mlt_service_unlock(service.get_service());
m_isBlocked = false;
Mlt::Tractor tractor(service);
Mlt::Producer trackProducer(tractor.track(track));
+ // Make sure muting will not produce problems with our audio mixing transition,
+ // because audio mixing is done between each track and the lowest one
+ bool audioMixingBroken = false;
+ if (mute && trackProducer.get_int("hide") < 2 ) {
+ // We mute a track with sound
+ if (track == getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+ }
+ else if (!mute && trackProducer.get_int("hide") > 1 ) {
+ // We un-mute a previously muted track
+ if (track < getLowestNonMutedAudioTrack(tractor)) audioMixingBroken = true;
+ }
+
if (mute) {
if (blind) trackProducer.set("hide", 3);
else trackProducer.set("hide", 2);
} else {
trackProducer.set("hide", 0);
}
+ if (audioMixingBroken) fixAudioMixing(tractor);
+
tractor.multitrack()->refresh();
tractor.refresh();
refresh();
}
+int Render::getLowestNonMutedAudioTrack(Mlt::Tractor tractor)
+{
+ for (int i = 1; i < tractor.count(); i++) {
+ Mlt::Producer trackProducer(tractor.track(i));
+ if (trackProducer.get_int("hide") < 2) return i;
+ }
+ return tractor.count() - 1;
+}
+
+void Render::fixAudioMixing(Mlt::Tractor tractor)
+{
+ // Make sure the audio mixing transitions are applied to the lowest audible (non muted) track
+ int lowestTrack = getLowestNonMutedAudioTrack(tractor);
+
+ mlt_service serv = m_mltProducer->parent().get_service();
+ Mlt::Field *field = tractor.field();
+ mlt_service_lock(serv);
+ m_isBlocked++;
+
+ mlt_service nextservice = mlt_service_get_producer(serv);
+ mlt_properties properties = MLT_SERVICE_PROPERTIES(nextservice);
+ QString mlt_type = mlt_properties_get(properties, "mlt_type");
+ QString resource = mlt_properties_get(properties, "mlt_service");
+
+ mlt_service nextservicetodisconnect;
+ // Delete all audio mixing transitions
+ while (mlt_type == "transition") {
+ if (resource == "mix") {
+ nextservicetodisconnect = nextservice;
+ nextservice = mlt_service_producer(nextservice);
+ mlt_field_disconnect_service(field->get_field(), nextservicetodisconnect);
+ }
+ else nextservice = mlt_service_producer(nextservice);
+ if (nextservice == NULL) break;
+ properties = MLT_SERVICE_PROPERTIES(nextservice);
+ mlt_type = mlt_properties_get(properties, "mlt_type");
+ resource = mlt_properties_get(properties, "mlt_service");
+ }
+
+ // Re-add correct audio transitions
+ for (int i = lowestTrack + 1; i < tractor.count(); i++) {
+ Mlt::Transition *transition = new Mlt::Transition(*m_mltProfile, "mix");
+ transition->set("always_active", 1);
+ transition->set("combine", 1);
+ transition->set("internal_added", 237);
+ field->plant_transition(*transition, lowestTrack, i);
+ }
+ mlt_service_unlock(serv);
+ m_isBlocked--;
+}
bool Render::mltResizeClipCrop(ItemInfo info, GenTime diff)
{
m_isBlocked = true;
previousStart += moveFrame;
+ if (previousStart < 0) {
+ // this is possible for images and color clips
+ previousOut -= previousStart;
+ previousStart = 0;
+ }
+
int length = previousOut + 1;
if (length > clip->get_length()) {
clip->parent().set("length", length + 1);
mlt_type = mlt_properties_get(properties, "mlt_type");
resource = mlt_properties_get(properties, "mlt_service");
}
-
field->plant_transition(tr, a_track, b_track);
// re-add upper transitions
- for (int i = 0; i < trList.count(); i++) {
- // kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
+ for (int i = trList.count() - 1; i >= 0; i--) {
+ //kDebug()<< "REPLANT ON TK: "<<trList.at(i)->get_a_track()<<", "<<trList.at(i)->get_b_track();
field->plant_transition(*trList.at(i), trList.at(i)->get_a_track(), trList.at(i)->get_b_track());
}
}
{
if (oldTag == tag && !force) mltUpdateTransitionParams(tag, a_track, b_track, in, out, xml);
else {
+ kDebug()<<"// DELETING TRANS: "<<a_track<<"-"<<b_track;
mltDeleteTransition(oldTag, a_track, b_track, in, out, xml, false);
mltAddTransition(tag, a_track, b_track, in, out, xml, false);
}
if (!e.attribute("value").isEmpty()) {
map[name] = e.attribute("value");
}
- if (!e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
- map[name] = QString::number(map[name].toDouble() / e.attribute("factor").toDouble());
+ if (e.attribute("type") != "addedgeometry" && !e.attribute("factor").isEmpty() && e.attribute("factor").toDouble() > 0) {
+ map[name] = QString::number(map.value(name).toDouble() / e.attribute("factor").toDouble());
//map[name]=map[name].replace(".",","); //FIXME how to solve locale conversion of . ,
}
//kDebug() << " ------ ADDING TRANS PARAM: " << key << ": " << it.value();
}
// attach transition
+ m_isBlocked++;
+ mlt_service_lock(service.get_service());
mltPlantTransition(field, *transition, a_track, b_track);
// field->plant_transition(*transition, a_track, b_track);
+ mlt_service_unlock(service.get_service());
+ m_isBlocked--;
if (do_refresh) refresh();
return true;
}
projects / kdenlive / blobdiff