m_blackClip(NULL),
m_winid(winid)
{
- /*if (rendererName == "project") m_monitorId = 10000;
- else m_monitorId = 10001;*/
- /*m_osdTimer = new QTimer(this);
- connect(m_osdTimer, SIGNAL(timeout()), this, SLOT(slotOsdTimeout()));*/
if (profile.isEmpty()) profile = KdenliveSettings::current_profile();
buildConsumer(profile);
//TODO: uncomment following line when everything is clean
//if (m_mltProfile) delete m_mltProfile;
m_mltProfile = new Mlt::Profile(tmp);
+ m_mltProfile->get_profile()->is_explicit = 1;
delete[] tmp;
QString videoDriver = KdenliveSettings::videodrivername();
if (!audioDriver.isEmpty())
m_mltConsumer->set("audio_driver", audioDriver.toUtf8().constData());
- int volume = KdenliveSettings::volume();
- m_mltConsumer->set("volume", (float)volume / 100);
-
m_mltConsumer->set("progressive", 1);
m_mltConsumer->set("audio_buffer", 1024);
m_mltConsumer->set("frequency", 48000);
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");
- 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) {
+ if (m_activeProfile == profileName && currentDriver == videoDriver && background == currentBackground) {
kDebug() << "reset to same profile, nothing to do";
return 1;
}
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);
int aindex = xml.attribute("audio_index").toInt();
if (aindex != 0) producer->set("audio_index", aindex);
}
+ if (xml.hasAttribute("force_colorspace")) {
+ int colorspace = xml.attribute("force_colorspace").toInt();
+ if (colorspace != 0) producer->set("force_colorspace", colorspace);
+ }
+ if (xml.hasAttribute("full_luma")) {
+ int full_luma = xml.attribute("full_luma").toInt();
+ if (full_luma != 0) producer->set("set.force_full_luma", full_luma);
+ }
// 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
}
}
-
- filePropertyMap["fps"] = producer->get("source_fps");
+ if (producer->get_double("meta.media.frame_rate_den") > 0) {
+ filePropertyMap["fps"] = QString::number(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den"));
+ } else filePropertyMap["fps"] = producer->get("source_fps");
if (frame && frame->is_valid()) {
filePropertyMap["frame_size"] = QString::number(frame->get_int("width")) + 'x' + QString::number(frame->get_int("height"));
if (producer->get(property))
filePropertyMap["videocodec"] = producer->get(property);
}
-
- 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");
- }
- }
+ QString query;
+ query = QString("meta.media.%1.codec.pix_fmt").arg(default_video);
+ filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData());
+ filePropertyMap["colorspace"] = producer->get("meta.media.colorspace");
} else kDebug() << " / / / / /WARNING, VIDEO CONTEXT IS NULL!!!!!!!!!!!!!!";
if (producer->get_int("audio_index") > -1) {
} else return -1;
m_mltConsumer->purge();
-
m_isBlocked = true;
if (m_mltProducer) {
m_mltProducer->set_speed(0);
if (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;
}
-
+ int volume = KdenliveSettings::volume();
+ m_mltProducer->set("meta.volume", (double)volume / 100);
m_fps = m_mltProducer->get_fps();
int error = connectPlaylist();
m_isBlocked = true;
int error = 0;
- kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
+ //kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
if (m_mltConsumer) {
if (!m_mltConsumer->is_stopped()) {
}
blockSignals(true);
+
+ // 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()) {
m_mltProducer = m_blackClip->cut(0, 50);
error = -1;
}
-
+ int volume = KdenliveSettings::volume();
+ m_mltProducer->set("meta.volume", (double)volume / 100);
m_mltProducer->optimise();
/*if (KdenliveSettings::osdtimecode()) {
const QString Render::sceneList()
{
QString playlist;
- Mlt::Consumer xmlConsumer(*m_mltProfile, "xml:kdenlive_playlist");
+ Mlt::Profile profile((mlt_profile) 0);
+ Mlt::Consumer xmlConsumer(profile, "xml:kdenlive_playlist");
m_mltProducer->optimise();
xmlConsumer.set("terminate_on_pause", 1);
Mlt::Producer prod(m_mltProducer->get_producer());
refresh();
}
-void Render::setVolume(double /*volume*/)
+int Render::volume() const
+{
+ if (!m_mltConsumer || !m_mltProducer) return -1;
+ return ((int) 100 * m_mltProducer->get_double("meta.volume"));
+}
+
+void Render::slotSetVolume(int volume)
{
if (!m_mltConsumer || !m_mltProducer) return;
+ m_mltProducer->set("meta.volume", (double)volume / 100.0);
+ return;
/*osdTimer->stop();
m_mltConsumer->set("refresh", 0);
// Attach filter for on screen display of timecode
if (m_isLoopMode) play(m_loopStart);
else if (m_isZoneMode) resetZoneMode();
emit rendererStopped((int) pos);
- //if (qApp->activeWindow()) QApplication::postEvent(qApp->activeWindow(), new PositionChangeEvent(GenTime((int) pos, m_fps), m_monitorId + 100));
- //new QCustomEvent(10002));
}
}
int16_t* data = (int16_t*)frame.get_audio(audio_format, freq, num_channels, samples);
if (!data)
return;
- int num_samples = samples>200?200:samples;
+ 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);
+ for (int s = 0; s < num_samples; s ++) {
+ val += abs(data[i+s*num_channels] / 128);
}
- channels.append(val/num_samples);
+ channels.append(val / num_samples);
}
if (samples > 0)
emit showAudioSignal(channels);
- else
+ else
emit showAudioSignal(QByteArray());
}
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 (colorspace != 0) slowprod->set("force_colorspace", colorspace);
+ int full_luma = original->parent().get_int("set.force_full_luma");
+ if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma);
m_slowmotionProducers.insert(url, slowprod);
}
Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
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");
if (ix != 0) slowprod->set("video_index", ix);
+ int colorspace = original->parent().get_int("force_colorspace");
+ if (colorspace != 0) slowprod->set("force_colorspace", colorspace);
+ int full_luma = original->parent().get_int("set.force_full_luma");
+ if (full_luma != 0) slowprod->set("set.force_full_luma", full_luma);
m_slowmotionProducers.insert(url, slowprod);
}
Mlt::Producer *clip = trackPlaylist.replace_with_blank(clipIndex);
int newDuration = (int) clipDuration.frames(m_fps) - 1;
int diff = newDuration - (trackPlaylist.clip_length(clipIndex) - 1);
- int currentOut;
- if (info.cropStart < GenTime())
- currentOut = newDuration - info.cropStart.frames(m_fps);
- else
- currentOut = newDuration + previousStart;
+ int currentOut = newDuration + previousStart;
if (currentOut > clip->get_length()) {
clip->parent().set("length", currentOut + 1);
clip->parent().set("out", currentOut);
m_isBlocked = true;
previousStart += moveFrame;
- if (previousStart < 0) {
- // special case, in point becoming negative (resizing images)
- previousOut -= previousStart;
- previousStart = 0;
- }
int length = previousOut + 1;
if (length > clip->get_length()) {
if (! trackPlaylist.is_blank(blankIndex)) {
kDebug() << "WARNING, CLIP TO RESIZE IS NOT BLANK";
}
- if (blankLength + moveFrame == 0) trackPlaylist.remove(blankIndex);
- else trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1);
+ if (blankLength + moveFrame == 0)
+ trackPlaylist.remove(blankIndex);
+ else
+ trackPlaylist.resize_clip(blankIndex, 0, blankLength + moveFrame - 1);
}
trackPlaylist.consolidate_blanks(0);
/*if (QString(clip->parent().get("transparency")).toInt() == 1) {
projects / kdenlive / blobdiff