{
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;
if (KdenliveSettings::external_display() && m_name != "clip") {
// Use blackmagic card for video output
QMap< QString, QString > profileProperties = ProfilesDialog::getSettingsFromFile(profileName);
- if (BMInterface::isSupportedProfile(KdenliveSettings::blackmagic_output_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()));
+ 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();
QString path;
if (xml.hasAttribute("proxy") && xml.attribute("proxy") != "-") path = xml.attribute("proxy");
else path = xml.attribute("resource");
+
+
KUrl url = KUrl(path);
Mlt::Producer *producer = NULL;
CLIPTYPE type = (CLIPTYPE)xml.attribute("type").toInt();
int full_luma = xml.attribute("full_luma").toInt();
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 (type == COLOR || type == TEXT || type == IMAGE || type == SLIDESHOW) {
int length;
- if (xml.hasAttribute("length")) length = xml.attribute("length").toInt();
+ 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());
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();
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) {
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)
{
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 . ,
}
projects / kdenlive / blobdiff