* *
***************************************************************************/
-// ffmpeg Header files
-
-extern "C" {
-#include <avformat.h>
-}
-
#include <stdlib.h>
#include <QTimer>
#include <mlt++/Mlt.h>
-#if LIBAVCODEC_VERSION_MAJOR > 51 || (LIBAVCODEC_VERSION_MAJOR > 50 && LIBAVCODEC_VERSION_MINOR > 54)
-// long_name was added in FFmpeg avcodec version 51.55
-#define ENABLE_FFMPEG_CODEC_DESCRIPTION 1
-#endif
-
-
static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr) {
// detect if the producer has finished playing. Is there a better way to do it ?
if (xml.attribute("fade") == "1") {
// user wants a fade effect to slideshow
Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, "luma");
- if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1);
- if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt());
- if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) {
- char *tmp = decodedString(xml.attribute("luma_file"));
- filter->set("luma.resource", tmp);
- delete[] tmp;
- if (xml.hasAttribute("softness")) {
- int soft = xml.attribute("softness").toInt();
- filter->set("luma.softness", (double) soft / 100.0);
+ if (filter && filter->is_valid()) {
+ if (xml.hasAttribute("ttl")) filter->set("period", xml.attribute("ttl").toInt() - 1);
+ if (xml.hasAttribute("luma_duration") && !xml.attribute("luma_duration").isEmpty()) filter->set("luma.out", xml.attribute("luma_duration").toInt());
+ if (xml.hasAttribute("luma_file") && !xml.attribute("luma_file").isEmpty()) {
+ char *tmp = decodedString(xml.attribute("luma_file"));
+ filter->set("luma.resource", tmp);
+ delete[] tmp;
+ if (xml.hasAttribute("softness")) {
+ int soft = xml.attribute("softness").toInt();
+ filter->set("luma.softness", (double) soft / 100.0);
+ }
}
+ Mlt::Service clipService(producer->get_service());
+ clipService.attach(*filter);
}
- Mlt::Service clipService(producer->get_service());
- clipService.attach(*filter);
}
}
if (frame->get_int("test_image") == 0) {
if (url.path().endsWith(".westley") || url.path().endsWith(".kdenlive")) {
filePropertyMap["type"] = "playlist";
- metadataPropertyMap["comment"] = QString::fromUtf8(mlt_properties_get(MLT_SERVICE_PROPERTIES(producer->get_service()), "title"));
+ metadataPropertyMap["comment"] = QString::fromUtf8(producer->get("title"));
} else if (frame->get_int("test_audio") == 0)
filePropertyMap["type"] = "av";
else
// Retrieve audio / video codec name
- // Fetch the video_context
-#if 1
-
- AVFormatContext *context = (AVFormatContext *) mlt_properties_get_data(properties, "video_context", NULL);
- if (context != NULL) {
+ // If there is a
+ char property[200];
+ if (producer->get_int("video_index") > -1) {
/*if (context->duration == AV_NOPTS_VALUE) {
kDebug() << " / / / / / / / /ERRROR / / / CLIP HAS UNKNOWN DURATION";
emit removeInvalidClip(clipId);
return;
}*/
// Get the video_index
- int index = mlt_properties_get_int(properties, "video_index");
- int default_video = -1;
+ int default_video = producer->get_int("video_index");
int video_max = 0;
- int default_audio = -1;
+ int default_audio = producer->get_int("audio_index");
int audio_max = 0;
- // Find default audio stream (borrowed from MLT)
- for (int ix = 0; ix < context->nb_streams; ix++) {
- // Get the codec context
- AVCodecContext *codec_context = context->streams[ ix ]->codec;
-
- if (avcodec_find_decoder(codec_context->codec_id) == NULL)
- continue;
- // Determine the type and obtain the first index of each type
- switch (codec_context->codec_type) {
- case CODEC_TYPE_VIDEO:
- if (default_video < 0) default_video = ix;
+
+ // Find maximum stream index values
+ for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) {
+ snprintf(property, sizeof(property), "meta.media.%d.stream.type", ix);
+ QString type = producer->get(property);
+ if (type == "video")
video_max = ix;
- break;
- case CODEC_TYPE_AUDIO:
- if (default_audio < 0) default_audio = ix;
+ else if (type == "audio")
audio_max = ix;
- break;
- default:
- break;
- }
}
filePropertyMap["default_video"] = QString::number(default_video);
filePropertyMap["video_max"] = QString::number(video_max);
filePropertyMap["default_audio"] = QString::number(default_audio);
filePropertyMap["audio_max"] = QString::number(audio_max);
-
-#if ENABLE_FFMPEG_CODEC_DESCRIPTION
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name) {
- filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->long_name;
- } else
-#endif
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name) {
- filePropertyMap["videocodec"] = context->streams[ index ]->codec->codec->name;
- }
+ snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video);
+ if (producer->get(property)) {
+ filePropertyMap["videocodec"] = producer->get(property);
+ } else {
+ snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video);
+ if (producer->get(property))
+ filePropertyMap["videocodec"] = producer->get(property);
+ }
} else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
- context = (AVFormatContext *) mlt_properties_get_data(properties, "audio_context", NULL);
- if (context != NULL) {
+ if (producer->get_int("audio_index") > -1) {
// Get the audio_index
- int index = mlt_properties_get_int(properties, "audio_index");
+ int index = producer->get_int("audio_index");
-#if ENABLE_FFMPEG_CODEC_DESCRIPTION
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->long_name)
- filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->long_name;
- else
-#endif
- if (index > -1 && context->streams && context->streams [index] && context->streams[ index ]->codec && context->streams[ index ]->codec->codec->name)
- filePropertyMap["audiocodec"] = context->streams[ index ]->codec->codec->name;
+ snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", index);
+ if (producer->get(property)) {
+ filePropertyMap["audiocodec"] = producer->get(property);
+ } else {
+ snprintf(property, sizeof(property), "meta.media.%d.codec.name", index);
+ if (producer->get(property))
+ filePropertyMap["audiocodec"] = producer->get(property);
+ }
}
-#endif
- // metadata
- mlt_properties metadata = mlt_properties_new();
- mlt_properties_pass(metadata, properties, "meta.attr.");
- int count = mlt_properties_count(metadata);
+ // metadata
+ Mlt::Properties metadata;
+ metadata.pass_values(*producer, "meta.attr.");
+ int count = metadata.count();
for (int i = 0; i < count; i ++) {
- QString name = mlt_properties_get_name(metadata, i);
- QString value = QString::fromUtf8(mlt_properties_get_value(metadata, i));
+ QString name = metadata.get_name(i);
+ QString value = QString::fromUtf8(metadata.get(i));
if (name.endsWith("markup") && !value.isEmpty())
metadataPropertyMap[ name.section(".", 0, -2)] = value;
}
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (filter->get("kdenlive_id") != "") {
+ if (filter->is_valid() && filter->get("kdenlive_id") != "") {
// looks like there is no easy way to duplicate a filter,
// so we will create a new one and duplicate its properties
Mlt::Filter *dup = new Mlt::Filter(*m_mltProfile, filter->get("mlt_service"));
- Mlt::Properties entries(filter->get_properties());
- for (int i = 0;i < entries.count();i++) {
- dup->set(entries.get_name(i), entries.get(i));
+ if (dup && dup->is_valid()) {
+ Mlt::Properties entries(filter->get_properties());
+ for (int i = 0;i < entries.count();i++) {
+ dup->set(entries.get_name(i), entries.get(i));
+ }
+ dupService.attach(*dup);
}
- dupService.attach(*dup);
}
ct++;
filter = clipService.filter(ct);
return true;
}
-int Render::mltGetSpaceLength(const GenTime pos, int track) {
+int Render::mltGetSpaceLength(const GenTime pos, int track, bool fromBlankStart) {
if (!m_mltProducer) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
return -1;
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
if (!trackPlaylist.is_blank(clipIndex)) return -1;
- return trackPlaylist.clip_length(clipIndex);
+ if (fromBlankStart) return trackPlaylist.clip_length(clipIndex);
+ return trackPlaylist.clip_length(clipIndex) + trackPlaylist.clip_start(clipIndex) - insertPos;
}
-void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration) {
+void Render::mltInsertSpace(QMap <int, int> trackClipStartList, QMap <int, int> trackTransitionStartList, int track, const GenTime duration, const GenTime timeOffset) {
if (!m_mltProducer) {
kDebug() << "PLAYLIST NOT INITIALISED //////";
return;
kDebug() << "PLAYLIST BROKEN, CANNOT INSERT CLIP //////";
return;
}
+ //kDebug()<<"// CLP STRT LST: "<<trackClipStartList;
+ //kDebug()<<"// TRA STRT LST: "<<trackTransitionStartList;
Mlt::Service service(parentProd.get_service());
Mlt::Tractor tractor(service);
mlt_service_lock(service.get_service());
- int insertPos = pos.frames(m_fps);
int diff = duration.frames(m_fps);
+ int offset = timeOffset.frames(m_fps);
+ int insertPos;
if (track != -1) {
// insert space in one track only
Mlt::Producer trackProducer(tractor.track(track));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
- int position = trackPlaylist.clip_start(clipIndex);
- trackPlaylist.remove_region(position + diff, -diff - 1);
+ insertPos = trackClipStartList.value(track);
+ if (insertPos != -1) {
+ insertPos += offset;
+ int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
+ if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
+ else {
+ if (!trackPlaylist.is_blank(clipIndex)) clipIndex --;
+ if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos;
+ int position = trackPlaylist.clip_start(clipIndex);
+ trackPlaylist.remove_region(position, - diff - 1);
+ }
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.consolidate_blanks(0);
-
// now move transitions
mlt_service serv = m_mltProducer->parent().get_service();
mlt_service nextservice = mlt_service_get_producer(serv);
int currentTrack = mlt_transition_get_b_track(tr);
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
-
- if (track == currentTrack && currentOut > insertPos && resource != "mix") {
- mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ insertPos = trackTransitionStartList.value(track);
+ if (insertPos != -1) {
+ insertPos += offset;
+ if (track == currentTrack && currentOut > insertPos && resource != "mix") {
+ mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ }
}
nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
while (trackNb > 1) {
Mlt::Producer trackProducer(tractor.track(trackNb - 1));
Mlt::Playlist trackPlaylist((mlt_playlist) trackProducer.get_service());
- int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
- if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
- else {
- int position = trackPlaylist.clip_start(clipIndex);
- trackPlaylist.remove_region(position + diff, -diff - 1);
+
+
+ int clipNb = trackPlaylist.count();
+ insertPos = trackClipStartList.value(trackNb - 1);
+ if (insertPos != -1) {
+ insertPos += offset;
+
+ /* kDebug()<<"-------------\nTRACK "<<trackNb<<" HAS "<<clipNb<<" CLPIS";
+ kDebug() << "INSERT SPACE AT: "<<insertPos<<", DIFF: "<<diff<<", TK: "<<trackNb;
+ for (int i = 0; i < clipNb; i++) {
+ kDebug()<<"CLIP "<<i<<", START: "<<trackPlaylist.clip_start(i)<<", END: "<<trackPlaylist.clip_start(i) + trackPlaylist.clip_length(i);
+ if (trackPlaylist.is_blank(i)) kDebug()<<"++ BLANK ++ ";
+ kDebug()<<"-------------";
+ }
+ kDebug()<<"END-------------";*/
+
+
+ int clipIndex = trackPlaylist.get_clip_index_at(insertPos);
+ if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
+ else {
+ if (!trackPlaylist.is_blank(clipIndex)) clipIndex --;
+ if (!trackPlaylist.is_blank(clipIndex)) kDebug() << "//// ERROR TRYING TO DELETE SPACE FROM " << insertPos;
+ int position = trackPlaylist.clip_start(clipIndex);
+ trackPlaylist.remove_region(position, - diff - 1);
+ }
+ trackPlaylist.consolidate_blanks(0);
}
- trackPlaylist.consolidate_blanks(0);
trackNb--;
}
// now move transitions
mlt_transition tr = (mlt_transition) nextservice;
int currentIn = (int) mlt_transition_get_in(tr);
int currentOut = (int) mlt_transition_get_out(tr);
-
- if (currentOut > insertPos && resource != "mix") {
- mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ int currentTrack = mlt_transition_get_b_track(tr);
+ insertPos = trackTransitionStartList.value(currentTrack);
+ if (insertPos != -1) {
+ insertPos += offset;
+ if (currentOut > insertPos && resource != "mix") {
+ mlt_transition_set_in_and_out(tr, currentIn + diff, currentOut + diff);
+ }
}
nextservice = mlt_service_producer(nextservice);
if (nextservice == NULL) break;
}
mlt_service_unlock(service.get_service());
mltCheckLength();
+ m_mltConsumer->set("refresh", 1);
}
int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) {
if ((index == "-1" && filter->get("kdenlive_id") != "") || filter->get("kdenlive_ix") == index) {// && filter->get("kdenlive_id") == id) {
if (clipService.detach(*filter) == 0) success = true;
kDebug() << " / / / DLEETED EFFECT: " << ct;
- } else ct++;
+ } else {
+ if (QString(filter->get("kdenlive_ix")).toInt() > index.toInt()) filter->set("kdenlive_ix", QString(filter->get("kdenlive_ix")).toInt() - 1);
+ ct++;
+ }
filter = clipService.filter(ct);
}
m_isBlocked = false;
}
-bool Render::mltAddEffect(int track, GenTime position, QHash <QString, QString> args, bool doRefresh) {
+bool Render::mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh) {
Mlt::Service service(m_mltProducer->parent().get_service());
// temporarily remove all effects after insert point
QList <Mlt::Filter *> filtersList;
- const int filer_ix = QString(args.value("kdenlive_ix")).toInt();
+ const int filter_ix = params.paramValue("kdenlive_ix").toInt();
int ct = 0;
Mlt::Filter *filter = clipService.filter(ct);
while (filter) {
- if (QString(filter->get("kdenlive_ix")).toInt() > filer_ix) {
+ if (QString(filter->get("kdenlive_ix")).toInt() > filter_ix) {
filtersList.append(filter);
clipService.detach(*filter);
} else ct++;
}
// create filter
- QString tag = args.value("tag");
+ QString tag = params.paramValue("tag");
kDebug() << " / / INSERTING EFFECT: " << tag;
if (tag.startsWith("ladspa")) tag = "ladspa";
char *filterTag = decodedString(tag);
- char *filterId = decodedString(args.value("id"));
+ char *filterId = decodedString(params.paramValue("id"));
QHash<QString, QString>::Iterator it;
- QString kfr = args.value("keyframes");
+ QString kfr = params.paramValue("keyframes");
if (!kfr.isEmpty()) {
QStringList keyFrames = kfr.split(";", QString::SkipEmptyParts);
- kDebug() << "// ADDING KEYFRAME EFFECT: " << args.value("keyframes");
- char *starttag = decodedString(args.value("starttag", "start"));
- char *endtag = decodedString(args.value("endtag", "end"));
+ kDebug() << "// ADDING KEYFRAME EFFECT: " << params.paramValue("keyframes");
+ char *starttag = decodedString(params.paramValue("starttag", "start"));
+ char *endtag = decodedString(params.paramValue("endtag", "end"));
kDebug() << "// ADDING KEYFRAME TAGS: " << starttag << ", " << endtag;
int duration = clip->get_playtime();
- double max = args.value("max").toDouble();
- double min = args.value("min").toDouble();
- double factor = args.value("factor", "1").toDouble();
- args.remove("starttag");
- args.remove("endtag");
- args.remove("keyframes");
- args.remove("min");
- args.remove("max");
- args.remove("factor");
+ double max = params.paramValue("max").toDouble();
+ double min = params.paramValue("min").toDouble();
+ double factor = params.paramValue("factor", "1").toDouble();
+ params.removeParam("starttag");
+ params.removeParam("endtag");
+ params.removeParam("keyframes");
+ params.removeParam("min");
+ params.removeParam("max");
+ params.removeParam("factor");
int offset = 0;
for (int i = 0; i < keyFrames.size() - 1; ++i) {
Mlt::Filter *filter = new Mlt::Filter(*m_mltProfile, filterTag);
- filter->set("kdenlive_id", filterId);
- 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();
- double y2 = keyFrames.at(i + 1).section(":", 1, 1).toDouble();
- if (x2 == -1) x2 = duration;
- for (it = args.begin(); it != args.end(); ++it) {
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
- filter->set(name, value);
- delete[] name;
- delete[] value;
- }
+ if (filter && filter->is_valid()) {
+ filter->set("kdenlive_id", filterId);
+ 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();
+ double y2 = keyFrames.at(i + 1).section(":", 1, 1).toDouble();
+ if (x2 == -1) x2 = duration;
+
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
+ filter->set(name, value);
+ delete[] name;
+ delete[] value;
+ }
- filter->set("in", x1);
- filter->set("out", x2);
- //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);
- offset = 1;
+ filter->set("in", x1);
+ filter->set("out", x2);
+ //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);
+ offset = 1;
+ }
}
delete[] starttag;
delete[] endtag;
return false;
}
- for (it = args.begin(); it != args.end(); ++it) {
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+ params.removeParam("kdenlive_id");
+
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
}
+
+ if (tag == "sox") {
+ QString effectArgs = params.paramValue("id").section('_', 1);
+
+ params.removeParam("id");
+ params.removeParam("kdenlive_ix");
+ params.removeParam("tag");
+ params.removeParam("disabled");
+
+ for (int j = 0; j < params.count(); j++) {
+ effectArgs.append(' ' + params.at(j).value());
+ }
+ //kDebug() << "SOX EFFECTS: " << effectArgs.simplified();
+ char *value = decodedString(effectArgs.simplified());
+ filter->set("effect", value);
+ delete[] value;
+ }
+
+
// attach filter to the clip
clipService.attach(*filter);
}
return true;
}
-bool Render::mltEditEffect(int track, GenTime position, QHash <QString, QString> args) {
- QString index = args.value("kdenlive_ix");
- QString tag = args.value("tag");
- QHash<QString, QString>::Iterator it = args.begin();
- if (!args.value("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
+bool Render::mltEditEffect(int track, GenTime position, EffectsParameterList params) {
+ QString index = params.paramValue("kdenlive_ix");
+ QString tag = params.paramValue("tag");
+
+ if (!params.paramValue("keyframes").isEmpty() || /*it.key().startsWith("#") || */tag.startsWith("ladspa") || tag == "sox" || tag == "autotrack_rectangle") {
// This is a keyframe effect, to edit it, we remove it and re-add it.
mltRemoveEffect(track, position, index);
- bool success = mltAddEffect(track, position, args);
+ bool success = mltAddEffect(track, position, params);
return success;
}
} else ct++;
filter = clipService.filter(ct);
}
- bool success = mltAddEffect(track, position, args);
+ bool success = mltAddEffect(track, position, params);
for (int i = 0; i < filtersList.count(); i++) {
clipService.attach(*(filtersList.at(i)));
return success;
}
- for (it = args.begin(); it != args.end(); ++it) {
- kDebug() << " / / EDITING EFFECT ARGS: " << it.key() << ": " << it.value();
- char *name = decodedString(it.key());
- char *value = decodedString(it.value());
+ for (int j = 0; j < params.count(); j++) {
+ char *name = decodedString(params.at(j).name());
+ char *value = decodedString(params.at(j).value());
filter->set(name, value);
delete[] name;
delete[] value;
}
+
m_isBlocked = false;
refresh();
return true;
mltAddClipTransparency(transpinfo, info.track - 1, QString(clip->parent().get("id")).toInt());
}*/
m_isBlocked = false;
+ m_mltConsumer->set("refresh", 1);
return true;
}
m_isBlocked = false;
//m_mltConsumer->set("refresh", 1);
mlt_service_unlock(service.get_service());
+ m_mltConsumer->set("refresh", 1);
return true;
}
projects / kdenlive / blobdiff