// detect if the producer has finished playing. Is there a better way to do it?
if (self->m_isBlocked) return;
Mlt::Frame frame(frame_ptr);
-#ifdef Q_WS_MAC
- self->showFrame(frame);
-#endif
-
+ if (!frame.is_valid()) return;
self->emitFrameNumber(mlt_frame_get_position(frame_ptr));
if (self->sendFrameForAnalysis && frame_ptr->convert_image) {
self->emitFrameUpdated(frame);
}
+ 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) {
}
}
+static void consumer_gl_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 (self->m_isBlocked) return;
+ Mlt::Frame frame(frame_ptr);
+ self->showFrame(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) {
+ self->pause();
+ self->emitConsumerStopped();
+ }
+}
-Render::Render(const QString & rendererName, int winid, int /* extid */, QString profile, QWidget *parent) :
- QObject(parent),
- m_isBlocked(0),
- sendFrameForAnalysis(false),
- m_name(rendererName),
- m_mltConsumer(NULL),
- m_mltProducer(NULL),
- m_mltProfile(NULL),
- m_framePosition(0),
- m_isZoneMode(false),
- m_isLoopMode(false),
- m_isSplitView(false),
- m_blackClip(NULL),
- m_winid(winid)
-#ifdef Q_WS_MAC
- , m_glWidget(0)
-#endif
+Render::Render(const QString & rendererName, int winid, QString profile, QWidget *parent) :
+ QObject(parent),
+ m_isBlocked(0),
+ sendFrameForAnalysis(false),
+ m_name(rendererName),
+ m_mltConsumer(NULL),
+ m_mltProducer(NULL),
+ m_mltProfile(NULL),
+ m_framePosition(0),
+ m_isZoneMode(false),
+ m_isLoopMode(false),
+ m_isSplitView(false),
+ 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();
setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 1);
//m_mltConsumer->set("fullscreen", 1);
-#ifdef Q_WS_MAC
- m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio");
- m_mltConsumer->set("preview_off", 1);
- m_mltConsumer->set("preview_format", mlt_image_rgb24a);
-#else
- m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview");
-#endif
+ if (m_winid == 0) {
+ // OpenGL monitor
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_audio");
+ m_mltConsumer->set("preview_off", 1);
+ m_mltConsumer->set("preview_format", mlt_image_rgb24a);
+ m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_gl_frame_show);
+ } else {
+ m_mltConsumer = new Mlt::Consumer(*m_mltProfile, "sdl_preview");
+ // FIXME: the event object returned by the listen gets leaked...
+ m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
+ m_mltConsumer->set("window_id", m_winid);
+ }
m_mltConsumer->set("resize", 1);
- m_mltConsumer->set("window_id", m_winid);
m_mltConsumer->set("terminate_on_pause", 1);
m_mltConsumer->set("window_background", KdenliveSettings::window_background().name().toUtf8().constData());
-
- // FIXME: the event object returned by the listen gets leaked...
- m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show);
m_mltConsumer->set("rescale", "nearest");
mlt_log_set_callback(kdenlive_callback);
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);
m_blackClip = new Mlt::Producer(*m_mltProfile, "colour", "black");
m_blackClip->set("id", "black");
m_blackClip->set("mlt_type", "producer");
-
}
Mlt::Producer *Render::invalidProducer(const QString &id)
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;
}
delete m_mltProducer;
}
m_mltProducer = NULL;
-
buildConsumer(profileName);
double new_fps = m_mltProfile->fps();
if (current_fps != new_fps) {
//pixmap = im.scaled(width, height);
return pixmap;
}
-/*
-//static
-QPixmap Render::getVideoThumbnail(char *profile, QString file, int frame_position, int width, int height) {
- QPixmap pix(width, height);
- Mlt::Profile *prof = new Mlt::Profile(profile);
- Mlt::Producer m_producer(*prof, file.toUtf8().constData());
- if (m_producer.is_blank()) {
- pix.fill(Qt::black);
- return pix;
- }
-
- Mlt::Filter m_convert(*prof, "avcolour_space");
- m_convert.set("forced", mlt_image_rgb24a);
- m_producer.attach(m_convert);
- m_producer.seek(frame_position);
- Mlt::Frame * frame = m_producer.get_frame();
- if (frame) {
- pix = frameThumbnail(frame, width, height, true);
- delete frame;
- }
- if (prof) delete prof;
- return pix;
-}
-*/
-/*
-void Render::getImage(KUrl url, int frame_position, QPoint size)
-{
- Mlt::Producer m_producer(url.path().toUtf8().constData());
- if (m_producer.is_blank()) {
- return;
- }
- Mlt::Filter m_convert("avcolour_space");
- m_convert.set("forced", mlt_image_rgb24a);
- m_producer.attach(m_convert);
- m_producer.seek(frame_position);
-
- Mlt::Frame * frame = m_producer.get_frame();
-
- if (frame) {
- QPixmap pix = frameThumbnail(frame, size.x(), size.y(), true);
- delete frame;
- emit replyGetImage(url, frame_position, pix, size.x(), size.y());
- }
-}*/
-
-/* Create thumbnail for color */
-/*void Render::getImage(int id, QString color, QPoint size)
-{
- QPixmap pixmap(size.x() - 2, size.y() - 2);
- color = color.replace(0, 2, "#");
- color = color.left(7);
- pixmap.fill(QColor(color));
- QPixmap result(size.x(), size.y());
- result.fill(Qt::black);
- //copyBlt(&result, 1, 1, &pixmap, 0, 0, size.x() - 2, size.y() - 2);
- emit replyGetImage(id, result, size.x(), size.y());
-
-}*/
-
-/* Create thumbnail for image */
-/*void Render::getImage(KUrl url, QPoint size)
-{
- QImage im;
- QPixmap pixmap;
- if (url.fileName().startsWith(".all.")) { // check for slideshow
- QString fileType = url.fileName().right(3);
- QStringList more;
- QStringList::Iterator it;
-
- QDir dir( url.directory() );
- more = dir.entryList( QDir::Files );
- for ( it = more.begin() ; it != more.end() ; ++it ) {
- if ((*it).endsWith("."+fileType, Qt::CaseInsensitive)) {
- if (!im.load(url.directory() + '/' + *it))
- kDebug()<<"++ ERROR LOADIN IMAGE: "<<url.directory() + '/' + *it;
- break;
- }
- }
- }
- else im.load(url.path());
-
- //pixmap = im.smoothScale(size.x() - 2, size.y() - 2);
- QPixmap result(size.x(), size.y());
- result.fill(Qt::black);
- //copyBlt(&result, 1, 1, &pixmap, 0, 0, size.x() - 2, size.y() - 2);
- emit replyGetImage(url, 1, result, size.x(), size.y());
-}*/
-
double Render::consumerRatio() const
{
return m_mltProfile->dar();
}
+
void Render::slotSplitView(bool doit)
{
m_isSplitView = doit;
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
int dropFrames = 1;
if (show == false) dropFrames = 0;
m_mltConsumer->stop();
-#ifdef Q_WS_MAC
- m_mltConsumer->set("real_time", dropFrames);
-#else
- m_mltConsumer->set("play.real_time", dropFrames);
-#endif
+ if (m_winid == 0)
+ m_mltConsumer->set("real_time", dropFrames);
+ else
+ m_mltConsumer->set("play.real_time", dropFrames);
+
if (m_mltConsumer->start() == -1) {
kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
}
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));
}
}
//if (notify) QApplication::postEvent(qApp->activeWindow(), new UrlEvent(url, 10003));
}
-#ifdef Q_WS_MAC
+
void Render::showFrame(Mlt::Frame& frame)
{
+ m_framePosition = qMax(frame.get_int("_position"), 0);
+ emit rendererPosition((int) m_framePosition);
mlt_image_format format = mlt_image_rgb24a;
int width = 0;
int height = 0;
QImage qimage(width, height, QImage::Format_ARGB32_Premultiplied);
memcpy(qimage.scanLine(0), image, width * height * 4);
emit showImageSignal(qimage);
+ showAudio(frame);
+ if (sendFrameForAnalysis && frame.get_frame()->convert_image) {
+ emit frameUpdated(qimage.rgbSwapped());
+ }
}
-#endif
+
+void Render::showAudio(Mlt::Frame& frame)
+{
+ 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)
+ 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);
+ }
+ if (samples > 0)
+ emit showAudioSignal(channels);
+ else
+ emit showAudioSignal(QByteArray());
+}
+
/*
* MLT playlist direct manipulation.
*/
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) {