X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.cpp;h=c98ee4fbbee6440cbeaf0b5f0d089279050a8a9c;hb=8def756a0a2a6ddb22e48d917ff59d78606a9557;hp=88666e0fab08c0f80456d676900af20ec5416a00;hpb=f660d73b6c4bd5936b20276d26c547a894bc8984;p=kdenlive diff --git a/src/renderer.cpp b/src/renderer.cpp index 88666e0f..c98ee4fb 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -107,6 +107,8 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget m_mltConsumer(NULL), m_mltProducer(NULL), m_mltProfile(NULL), + m_showFrameEvent(NULL), + m_pauseEvent(NULL), m_externalConsumer(false), m_isZoneMode(false), m_isLoopMode(false), @@ -119,6 +121,9 @@ Render::Render(const QString & rendererName, int winid, QString profile, QWidget m_mltProducer = m_blackClip->cut(0, 1); m_mltConsumer->connect(*m_mltProducer); m_mltProducer->set_speed(0.0); + m_refreshTimer.setSingleShot(true); + m_refreshTimer.setInterval(50); + connect(&m_refreshTimer, SIGNAL(timeout()), this, SLOT(refresh())); } Render::~Render() @@ -133,6 +138,8 @@ void Render::closeMlt() //delete m_osdTimer; m_requestList.clear(); m_infoThread.waitForFinished(); + if (m_showFrameEvent) delete m_showFrameEvent; + if (m_pauseEvent) delete m_pauseEvent; if (m_mltConsumer) delete m_mltConsumer; if (m_mltProducer) delete m_mltProducer; /*if (m_mltProducer) { @@ -205,7 +212,7 @@ void Render::buildConsumer(const QString &profileName) delete[] tmp; if (m_mltConsumer->is_valid()) { m_externalConsumer = true; - m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); m_mltConsumer->set("terminate_on_pause", 0); m_mltConsumer->set("deinterlace_method", "onefield"); m_mltConsumer->set("real_time", KdenliveSettings::mltthreads()); @@ -233,12 +240,11 @@ void Render::buildConsumer(const QString &profileName) 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); + m_showFrameEvent = 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->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); + m_showFrameEvent = m_mltConsumer->listen("consumer-frame-show", this, (mlt_listener) consumer_frame_show); + m_pauseEvent = m_mltConsumer->listen("consumer-sdl-paused", this, (mlt_listener) consumer_paused); m_mltConsumer->set("window_id", m_winid); } m_mltConsumer->set("resize", 1); @@ -288,10 +294,14 @@ Mlt::Producer *Render::invalidProducer(const QString &id) return clip; } +bool Render::hasProfile(const QString &profileName) const +{ + return m_activeProfile == profileName; +} + int Render::resetProfile(const QString &profileName, bool dropSceneList) { - QString scene; - if (!dropSceneList) scene = sceneList(); + m_refreshTimer.stop(); if (m_mltConsumer) { if (m_externalConsumer == KdenliveSettings::external_display()) { if (KdenliveSettings::external_display() && m_activeProfile == profileName) return 1; @@ -309,9 +319,15 @@ int Render::resetProfile(const QString &profileName, bool dropSceneList) if (m_isSplitView) slotSplitView(false); if (!m_mltConsumer->is_stopped()) m_mltConsumer->stop(); m_mltConsumer->purge(); + if (m_showFrameEvent) delete m_showFrameEvent; + m_showFrameEvent = NULL; + if (m_pauseEvent) delete m_pauseEvent; + m_pauseEvent = NULL; delete m_mltConsumer; m_mltConsumer = NULL; } + QString scene; + if (!dropSceneList) scene = sceneList(); int pos = 0; double current_fps = m_mltProfile->fps(); double current_dar = m_mltProfile->dar(); @@ -568,13 +584,15 @@ void Render::getFileProperties(const QDomElement &xml, const QString &clipId, in m_requestList.removeAll(info); m_requestList.append(info); m_infoMutex.unlock(); - if (!m_infoThread.isRunning()) + if (!m_infoThread.isRunning()) { m_infoThread = QtConcurrent::run(this, &Render::processFileProperties); + } } void Render::forceProcessing(const QString &id) { - m_infoMutex.lock(); + if (m_processingClipId == id) return; + QMutexLocker lock(&m_infoMutex); for (int i = 0; i < m_requestList.count(); i++) { requestClipInfo info = m_requestList.at(i); if (info.clipId == id) { @@ -586,28 +604,29 @@ void Render::forceProcessing(const QString &id) } } } - m_infoMutex.unlock(); } -int Render::processingItems() const +int Render::processingItems() { + QMutexLocker lock(&m_infoMutex); int count = m_requestList.count(); - if (m_infoThread.isRunning()) count++; + if (!m_processingClipId.isEmpty()) { + // one clip is currently processed + count++; + } return count; } bool Render::isProcessing(const QString &id) { if (m_processingClipId == id) return true; - m_infoMutex.lock(); + QMutexLocker lock(&m_infoMutex); for (int i = 0; i < m_requestList.count(); i++) { requestClipInfo info = m_requestList.at(i); if (info.clipId == id) { - m_infoMutex.unlock(); return true; } } - m_infoMutex.unlock(); return false; } @@ -618,8 +637,9 @@ void Render::processFileProperties() while (!m_requestList.isEmpty()) { m_infoMutex.lock(); info = m_requestList.takeFirst(); - m_infoMutex.unlock(); m_processingClipId = info.clipId; + m_infoMutex.unlock(); + QString path; bool proxyProducer; if (info.xml.hasAttribute("proxy") && info.xml.attribute("proxy") != "-") { @@ -654,13 +674,13 @@ void Render::processFileProperties() if (producer == NULL || producer->is_blank() || !producer->is_valid()) { kDebug() << " / / / / / / / / ERROR / / / / // CANNOT LOAD PRODUCER: "<set("out", info.xml.attribute("proxy_out").toInt()); if (producer->get_out() != info.xml.attribute("proxy_out").toInt()) { // Proxy file length is different than original clip length, this will corrupt project so disable this proxy clip + m_processingClipId.clear(); emit removeInvalidProxy(info.clipId, true); delete producer; - m_processingClipId.clear(); continue; } } @@ -761,17 +781,19 @@ void Render::processFileProperties() Mlt::Frame *frame = producer->get_frame(); if (frame && frame->is_valid()) { QImage img = KThumb::getFrame(frame, imageWidth, fullWidth, info.imageHeight); - delete frame; emit replyGetImage(info.clipId, img); } + if (frame) delete frame; } - emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer); m_processingClipId.clear(); + emit replyGetFileProperties(info.clipId, producer, stringMap(), stringMap(), info.replaceProducer); continue; } stringMap filePropertyMap; stringMap metadataPropertyMap; + char property[200]; + if (frameNumber > 0) producer->seek(frameNumber); duration = duration > 0 ? duration : producer->get_playtime(); @@ -823,10 +845,20 @@ void Render::processFileProperties() } } } + + // Get frame rate + int vindex = producer->get_int("video_index"); + if (vindex > -1) { + snprintf(property, sizeof(property), "meta.media.%d.stream.frame_rate", vindex); + if (producer->get(property)) + filePropertyMap["fps"] = producer->get(property); + } - if (producer->get_double("meta.media.frame_rate_den") > 0) { - filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); - } else filePropertyMap["fps"] = producer->get("source_fps"); + if (!filePropertyMap.contains("fps")) { + if (producer->get_double("meta.media.frame_rate_den") > 0) { + filePropertyMap["fps"] = locale.toString(producer->get_double("meta.media.frame_rate_num") / producer->get_double("meta.media.frame_rate_den")); + } else filePropertyMap["fps"] = producer->get("source_fps"); + } Mlt::Frame *frame = producer->get_frame(); if (frame && frame->is_valid()) { @@ -860,7 +892,7 @@ void Render::processFileProperties() } } while (variance == -1); delete frame; - if (frameNumber > -1) filePropertyMap["thumbnail"] = frameNumber; + if (frameNumber > -1) filePropertyMap["thumbnail"] = QString::number(frameNumber); emit replyGetImage(info.clipId, img); } else if (frame->get_int("test_audio") == 0) { emit replyGetImage(info.clipId, "audio-x-generic", fullWidth, info.imageHeight); @@ -868,10 +900,9 @@ void Render::processFileProperties() } } // Retrieve audio / video codec name - // If there is a - char property[200]; - if (producer->get_int("video_index") > -1) { + + if (vindex > -1) { /*if (context->duration == AV_NOPTS_VALUE) { kDebug() << " / / / / / / / /ERROR / / / CLIP HAS UNKNOWN DURATION"; emit removeInvalidClip(clipId); @@ -879,10 +910,12 @@ void Render::processFileProperties() return; }*/ // Get the video_index - int default_video = producer->get_int("video_index"); int video_max = 0; int default_audio = producer->get_int("audio_index"); int audio_max = 0; + + int scan = producer->get_int("meta.media.progressive"); + filePropertyMap["progressive"] = QString::number(scan); // Find maximum stream index values for (int ix = 0; ix < producer->get_int("meta.media.nb_streams"); ix++) { @@ -893,21 +926,21 @@ void Render::processFileProperties() else if (type == "audio") audio_max = ix; } - filePropertyMap["default_video"] = QString::number(default_video); + filePropertyMap["default_video"] = QString::number(vindex); filePropertyMap["video_max"] = QString::number(video_max); filePropertyMap["default_audio"] = QString::number(default_audio); filePropertyMap["audio_max"] = QString::number(audio_max); - snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", default_video); + snprintf(property, sizeof(property), "meta.media.%d.codec.long_name", vindex); if (producer->get(property)) { filePropertyMap["videocodec"] = producer->get(property); } else { - snprintf(property, sizeof(property), "meta.media.%d.codec.name", default_video); + snprintf(property, sizeof(property), "meta.media.%d.codec.name", vindex); if (producer->get(property)) filePropertyMap["videocodec"] = producer->get(property); } QString query; - query = QString("meta.media.%1.codec.pix_fmt").arg(default_video); + query = QString("meta.media.%1.codec.pix_fmt").arg(vindex); filePropertyMap["pix_fmt"] = producer->get(query.toUtf8().constData()); filePropertyMap["colorspace"] = producer->get("meta.media.colorspace"); @@ -936,6 +969,7 @@ void Render::processFileProperties() metadataPropertyMap[ name.section('.', 0, -2)] = value; } producer->seek(0); + m_processingClipId.clear(); emit replyGetFileProperties(info.clipId, producer, filePropertyMap, metadataPropertyMap, info.replaceProducer); } m_processingClipId.clear(); @@ -982,10 +1016,15 @@ void Render::initSceneList() int Render::setProducer(Mlt::Producer *producer, int position) { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); QString currentId; int consumerPosition = 0; - if (m_winid == -1 || !m_mltConsumer) return -1; + if (m_winid == -1 || !m_mltConsumer) { + kDebug()<<" / / / / WARNING, MONITOR NOT READY"; + if (producer) delete producer; + return -1; + } m_mltConsumer->set("refresh", 0); if (!m_mltConsumer->is_stopped()) { m_mltConsumer->stop(); @@ -993,30 +1032,46 @@ int Render::setProducer(Mlt::Producer *producer, int position) m_mltConsumer->purge(); consumerPosition = m_mltConsumer->position(); - if (m_mltProducer) { - m_mltProducer->set_speed(0); - currentId = m_mltProducer->get("id"); - delete m_mltProducer; - m_mltProducer = NULL; - emit stopped(); - } blockSignals(true); - if (producer && producer->is_valid()) { - m_mltProducer = producer; - } else m_mltProducer = m_blackClip->cut(0, 1); + if (!producer || !producer->is_valid()) { + if (producer) delete producer; + producer = m_blackClip->cut(0, 1); + } - if (!m_mltProducer || !m_mltProducer->is_valid()) { + if (!producer || !producer->is_valid()) { kDebug() << " WARNING - - - - -INVALID PLAYLIST: "; return -1; } - if (position == -1 && m_mltProducer->get("id") == currentId) position = consumerPosition; - if (position != -1) m_mltProducer->seek(position); + if (m_mltProducer) currentId = m_mltProducer->get("id"); + emit stopped(); + if (position == -1 && producer->get("id") == currentId) position = consumerPosition; + if (position != -1) producer->seek(position); int volume = KdenliveSettings::volume(); - m_mltProducer->set("meta.volume", (double)volume / 100); - m_fps = m_mltProducer->get_fps(); + producer->set("meta.volume", (double)volume / 100); + m_fps = producer->get_fps(); blockSignals(false); - int error = connectPlaylist(); + m_mltConsumer->connect(*producer); + + if (m_mltProducer) { + m_mltProducer->set_speed(0); + delete m_mltProducer; + m_mltProducer = NULL; + } + m_mltProducer = producer; + m_mltProducer->set_speed(0); + emit durationChanged(m_mltProducer->get_playtime()); + if (m_mltConsumer->start() == -1) { + // ARGH CONSUMER BROKEN!!!! + KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); + if (m_showFrameEvent) delete m_showFrameEvent; + m_showFrameEvent = NULL; + if (m_pauseEvent) delete m_pauseEvent; + m_pauseEvent = NULL; + delete m_mltConsumer; + m_mltConsumer = NULL; + return -1; + } position = m_mltProducer->position(); m_mltConsumer->set("refresh", 1); @@ -1026,7 +1081,7 @@ int Render::setProducer(Mlt::Producer *producer, int position) m_mltConsumer->wait_for(ev); delete ev; emit rendererPosition(position); - return error; + return 0; } int Render::setSceneList(QDomDocument list, int position) @@ -1036,6 +1091,7 @@ int Render::setSceneList(QDomDocument list, int position) int Render::setSceneList(QString playlist, int position) { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (m_winid == -1) return -1; int error = 0; @@ -1147,10 +1203,11 @@ int Render::setSceneList(QString playlist, int position) } kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime(); - if (error == 0) error = connectPlaylist(); - else connectPlaylist(); + m_mltConsumer->connect(*m_mltProducer); + m_mltProducer->set_speed(0); fillSlowMotionProducers(); blockSignals(false); + emit durationChanged(m_mltProducer->get_playtime()); return error; //kDebug()<<"// SETSCN LST, POS: "<connect(*m_mltProducer); - m_mltProducer->set_speed(0); - if (m_mltConsumer->start() == -1) { - // ARGH CONSUMER BROKEN!!!! - KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); - delete m_mltConsumer; - m_mltConsumer = NULL; - return -1; - } - emit durationChanged(m_mltProducer->get_playtime()); - return 0; -} - - int Render::volume() const { if (!m_mltConsumer || !m_mltProducer) return -1; @@ -1307,13 +1347,14 @@ void Render::slotOsdTimeout() void Render::start() { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (m_winid == -1) { kDebug() << "----- BROKEN MONITOR: " << m_name << ", RESTART"; return; } - - if (m_mltConsumer && m_mltConsumer->is_stopped()) { + if (!m_mltConsumer) return; + if (m_mltConsumer->is_stopped()) { if (m_mltConsumer->start() == -1) { //KMessageBox::error(qApp->activeWindow(), i18n("Could not create the video preview window.\nThere is something wrong with your Kdenlive install or your driver settings, please fix it.")); kDebug(QtWarningMsg) << "/ / / / CANNOT START MONITOR"; @@ -1326,6 +1367,7 @@ void Render::start() void Render::stop() { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (m_mltProducer == NULL) return; if (m_mltConsumer && !m_mltConsumer->is_stopped()) { @@ -1341,6 +1383,7 @@ void Render::stop() void Render::stop(const GenTime & startTime) { + m_refreshTimer.stop(); QMutexLocker locker(&m_mutex); if (m_mltProducer) { if (m_isZoneMode) resetZoneMode(); @@ -1372,8 +1415,8 @@ void Render::switchPlay(bool play) if (m_mltConsumer->is_stopped()) { m_mltConsumer->start(); } - m_mltConsumer->set("refresh", "1"); m_mltProducer->set_speed(1.0); + m_mltConsumer->set("refresh", "1"); } else if (!play) { m_mltProducer->set_speed(0.0); m_mltConsumer->set("refresh", 0); @@ -1468,12 +1511,7 @@ void Render::seekToFrameDiff(int diff) void Render::doRefresh() { - // Use a Timer so that we don't refresh too much - QMutexLocker locker(&m_mutex); - if (m_mltConsumer) { - if (m_mltConsumer->is_stopped()) m_mltConsumer->start(); - m_mltConsumer->set("refresh", 1); - } + if (m_mltProducer && m_mltProducer->get_speed() == 0) m_refreshTimer.start(); } void Render::refresh() @@ -1507,7 +1545,7 @@ void Render::setDropFrames(bool show) } } -double Render::playSpeed() +double Render::playSpeed() const { if (m_mltProducer) return m_mltProducer->get_speed(); return 0.0; @@ -4150,6 +4188,11 @@ Mlt::Producer* Render::getProducer() return m_mltProducer; } +const QString Render::activeClipId() +{ + if (m_mltProducer) return m_mltProducer->get("id"); + return QString(); +} #include "renderer.moc"