X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=6910f42706e0dd036e9e4d4a8bf25a9e02608a53;hb=234d7fe2828b8e82253548e32081576fc56cbb80;hp=28e317c6981dad5382b76b115c1601814ec64fa0;hpb=1f5c19bcf720efb573fd7320a149fe6c17cf4fd7;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 28e317c6..6910f427 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -31,22 +31,24 @@ #include "gentime.h" #include "definitions.h" -#include "abstractmonitor.h" +#include "widgets/abstractmonitor.h" +#include #include #include -#include -#include -#include +#include +#include +#include #include #include #include #include #include +#include -class QTimer; +class QGLWidget; class QPixmap; class KComboBox; @@ -55,6 +57,7 @@ namespace Mlt { class Consumer; class Playlist; +class Properties; class Tractor; class Transition; class Frame; @@ -64,7 +67,7 @@ class Filter; class Profile; class Service; class Event; -}; +} struct requestClipInfo { QDomElement xml; @@ -72,16 +75,22 @@ struct requestClipInfo { int imageHeight; bool replaceProducer; -bool operator==(const requestClipInfo &a) -{ - return clipId == a.clipId; -} + bool operator==(const requestClipInfo &a) + { + return clipId == a.clipId; + } }; class MltErrorEvent : public QEvent { public: - MltErrorEvent(QString message) : QEvent(QEvent::User), m_message(message) {} + MltErrorEvent(const QString &message) + : QEvent(QEvent::User), + m_message(message) + { + + } + QString message() const { return m_message; } @@ -93,7 +102,7 @@ private: class Render: public AbstractRender { -Q_OBJECT public: + Q_OBJECT public: enum FailStates { OK = 0, APP_NOEXIST @@ -102,22 +111,22 @@ Q_OBJECT public: * @param rendererName A unique identifier for this renderer * @param winid The parent widget identifier (required for SDL display). Set to 0 for OpenGL rendering * @param profile The MLT profile used for the renderer (default one will be used if empty). */ - Render(Kdenlive::MONITORID rendererName, int winid, QString profile = QString(), QWidget *parent = 0); + Render(Kdenlive::MonitorId rendererName, int winid, QString profile = QString(), QWidget *parent = 0, QGLWidget *mainGLContext = 0); /** @brief Destroy the MLT Renderer. */ virtual ~Render(); /** @brief Seeks the renderer clip to the given time. */ - void seek(GenTime time); + void seek(const GenTime &time); void seek(int time); void seekToFrameDiff(int diff); - QPixmap getImageThumbnail(KUrl url, int width, int height); + QPixmap getImageThumbnail(const KUrl &url, int width, int height); /** @brief Sets the current MLT producer playlist. * @param list The xml describing the playlist * @param position (optional) time to seek to */ - int setSceneList(QDomDocument list, int position = 0); + int setSceneList(const QDomDocument &list, int position = 0); /** @brief Sets the current MLT producer playlist. * @param list new playlist @@ -147,7 +156,7 @@ Q_OBJECT public: void stop(const GenTime &startTime); int volume() const; - QImage extractFrame(int frame_position, QString path = QString(), int width = -1, int height = -1); + QImage extractFrame(int frame_position, const QString &path = QString(), int width = -1, int height = -1); /** @brief Plays the scene starting from a specific time. * @param startTime time to start playing the scene from */ @@ -158,7 +167,7 @@ Q_OBJECT public: void saveZone(KUrl url, QString desc, QPoint zone); /** @brief Save a clip in timeline to an xml playlist. */ - bool saveClip(int track, GenTime position, KUrl url, QString desc = QString()); + bool saveClip(int track, const GenTime &position, const KUrl &url, const QString &desc = QString()); /** @brief Return true if we are currently playing */ bool isPlaying() const; @@ -180,7 +189,7 @@ Q_OBJECT public: double consumerRatio() const; /** @brief Saves current producer frame as an image. */ - void exportCurrentFrame(KUrl url, bool notify); + void exportCurrentFrame(const KUrl &url, bool notify); /** @brief Change the Mlt PROFILE * @param profileName The MLT profile name @@ -214,7 +223,7 @@ Q_OBJECT public: Mlt::Producer *checkSlowMotionProducer(Mlt::Producer *prod, QDomElement element); int mltInsertClip(ItemInfo info, QDomElement element, Mlt::Producer *prod, bool overwrite = false, bool push = false); bool mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod); - bool mltCutClip(int track, GenTime position); + bool mltCutClip(int track, const GenTime &position); void mltInsertSpace(QMap trackClipStartList, QMap trackTransitionStartList, int track, const GenTime &duration, const GenTime &timeOffset); int mltGetSpaceLength(const GenTime &pos, int track, bool fromBlankStart); @@ -238,30 +247,30 @@ Q_OBJECT public: bool mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh); bool mltAddTrackEffect(int track, EffectsParameterList params); - /** @brief Enable / disable clip effects. + /** @brief Enable / disable clip effects. * @param track The track where the clip is * @param position The start position of the clip * @param effectIndexes The list of effect indexes to enable / disable * @param disable True if effects should be disabled, false otherwise */ - bool mltEnableEffects(int track, GenTime position, QList effectIndexes, bool disable); + bool mltEnableEffects(int track, const GenTime &position, const QList &effectIndexes, bool disable); /** @brief Enable / disable track effects. * @param track The track where the effect is * @param effectIndexes The list of effect indexes to enable / disable * @param disable True if effects should be disabled, false otherwise */ - bool mltEnableTrackEffects(int track, QList effectIndexes, bool disable); + bool mltEnableTrackEffects(int track, const QList &effectIndexes, bool disable); /** @brief Edits an effect parameters in MLT's playlist. */ - bool mltEditEffect(int track, GenTime position, EffectsParameterList params); + bool mltEditEffect(int track, const GenTime &position, EffectsParameterList params); bool mltEditTrackEffect(int track, EffectsParameterList params); /** @brief Updates the "kdenlive_ix" (index) value of an effect. */ - void mltUpdateEffectPosition(int track, GenTime position, int oldPos, int newPos); + void mltUpdateEffectPosition(int track, const GenTime &position, int oldPos, int newPos); /** @brief Changes the order of effects in MLT's playlist. * * It switches effects from oldPos and newPos, updating the "kdenlive_ix" * (index) value. */ - void mltMoveEffect(int track, GenTime position, int oldPos, int newPos); + void mltMoveEffect(int track, const GenTime &position, int oldPos, int newPos); void mltMoveTrackEffect(int track, int oldPos, int newPos); /** @brief Enables/disables audio/video in a track. */ @@ -294,7 +303,9 @@ Q_OBJECT public: const QList producersList(); void updatePreviewSettings(); void setDropFrames(bool show); - QString updateSceneListFps(double current_fps, double new_fps, QString scene); + /** @brief Sets an MLT consumer property. */ + void setConsumerProperty(const QString &name, const QString &value); + QString updateSceneListFps(double current_fps, double new_fps, const QString &scene); void showAudio(Mlt::Frame&); @@ -335,6 +346,11 @@ Q_OBJECT public: int getCurrentSeekPosition() const; /** @brief Create a producer from url and load it in the monitor */ void loadUrl(const QString &url); + /** @brief Check if the installed FFmpeg / Libav supports x11grab */ + static bool checkX11Grab(); + + /** @brief Ask to set this monitor as active */ + void setActiveMonitor(); QSemaphore showFrameSemaphore; bool externalConsumer; @@ -342,6 +358,8 @@ Q_OBJECT public: protected: static void consumer_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr); static void consumer_gl_frame_show(mlt_consumer, Render * self, mlt_frame frame_ptr); + static void consumer_thread_started(mlt_consumer, Render * self, mlt_frame frame_ptr); + static void consumer_thread_stopped(mlt_consumer, Render * self, mlt_frame frame_ptr); private: @@ -349,11 +367,13 @@ private: * * Useful to identify the renderers by what they do - e.g. background * rendering, workspace monitor, etc. */ - Kdenlive::MONITORID m_name; + Kdenlive::MonitorId m_name; Mlt::Consumer * m_mltConsumer; Mlt::Producer * m_mltProducer; Mlt::Profile *m_mltProfile; Mlt::Event *m_showFrameEvent; + Mlt::Event *m_consumerThreadStartedEvent; + Mlt::Event *m_consumerThreadStoppedEvent; Mlt::Event *m_pauseEvent; double m_fps; @@ -383,11 +403,17 @@ private: QFuture m_infoThread; QList m_requestList; bool m_paused; + /** @brief True if this monitor is active. */ + bool m_isActive; + QGLWidget *m_mainGLContext; + QGLWidget *m_GLContext; + QMap m_renderThreadGLContexts; + Mlt::Filter* m_glslManager; void closeMlt(); void mltCheckLength(Mlt::Tractor *tractor); void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest); - QMap mltGetTransitionParamsFromXml(QDomElement xml); + QMap mltGetTransitionParamsFromXml(const QDomElement &xml); QMap m_slowmotionProducers; /** @brief The ids of the clips that are currently being loaded for info query */ QStringList m_processingClipId; @@ -405,6 +431,8 @@ private: void fixAudioMixing(Mlt::Tractor tractor); /** @brief Make sure we inform MLT if we need a lot of threads for avformat producer */ void checkMaxThreads(); + /** @brief Clone serialisable properties only */ + void cloneProperties(Mlt::Properties &dest, Mlt::Properties &source); private slots: @@ -414,7 +442,7 @@ private slots: /** @brief Process the clip info requests (in a separate thread). */ void processFileProperties(); /** @brief A clip with multiple video streams was found, ask what to do. */ - void slotMultiStreamProducerFound(const QString path, QList audio_list, QList video_list, stringMap data); + void slotMultiStreamProducerFound(const QString &path, QList audio_list, QList video_list, stringMap data); void showFrame(Mlt::Frame *); void slotCheckSeeking(); @@ -459,9 +487,12 @@ signals: * * Used in Mac OS X. */ void showImageSignal(QImage); + void showImageSignal(Mlt::Frame*, GLuint); void showAudioSignal(const QVector &); void addClip(const KUrl &, stringMap); void checkSeeking(); + /** @brief Activate current monitor. */ + void activateMonitor(Kdenlive::MonitorId); void mltFrameReceived(Mlt::Frame *); public slots: @@ -474,7 +505,7 @@ public slots: int getLength(); /** @brief Checks if the file is readable by MLT. */ - bool isValid(KUrl url); + bool isValid(const KUrl &url); void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime); void mltSavePlaylist();