X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=96e23dce9f03ef61c5927832d5d4c585cdbf24c4;hb=a3eee7be24126f5a3458d488f44cd61c66135e17;hp=45b889d98ca69d778ec3cff340b3d0c70a14ead8;hpb=54271b47a8c38afa53ce3baf048f238d36b8bc3a;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index 45b889d9..96e23dce 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -31,21 +31,23 @@ #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 -class QTimer; +class QGLWidget; class QPixmap; class KComboBox; @@ -54,6 +56,7 @@ namespace Mlt { class Consumer; class Playlist; +class Properties; class Tractor; class Transition; class Frame; @@ -63,7 +66,7 @@ class Filter; class Profile; class Service; class Event; -}; +} struct requestClipInfo { QDomElement xml; @@ -71,16 +74,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; } @@ -92,7 +101,7 @@ private: class Render: public AbstractRender { -Q_OBJECT public: + Q_OBJECT public: enum FailStates { OK = 0, APP_NOEXIST @@ -101,22 +110,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 @@ -146,7 +155,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 */ @@ -157,7 +166,10 @@ 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; /** @brief Returns the speed at which the renderer is currently playing. * @@ -170,13 +182,13 @@ Q_OBJECT public: void emitFrameUpdated(Mlt::Frame&); void emitFrameNumber(); - void emitConsumerStopped(); + void emitConsumerStopped(bool forcePause = false); /** @brief Returns the aspect ratio of the consumer. */ 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 @@ -199,6 +211,10 @@ Q_OBJECT public: double dar() const; /** @brief Returns sample aspect ratio. */ double sar() const; + /** @brief If monitor is active, refresh it. */ + void refreshIfActive(); + /** @brief Start the MLT monitor consumer. */ + void startConsumer(); /* * Playlist manipulation. @@ -206,16 +222,16 @@ 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); - void 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); /** @brief Returns the duration/length of @param track as reported by the track producer. */ int mltTrackDuration(int track); - bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration); + bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration, bool refresh = true); bool mltResizeClipStart(ItemInfo info, GenTime diff); - bool mltResizeClipCrop(ItemInfo info, GenTime diff); + bool mltResizeClipCrop(ItemInfo info, GenTime newCropStart); bool mltMoveClip(int startTrack, int endTrack, GenTime pos, GenTime moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false); bool mltMoveClip(int startTrack, int endTrack, int pos, int moveStart, Mlt::Producer *prod, bool overwrite = false, bool insert = false); bool mltRemoveClip(int track, GenTime position); @@ -230,30 +246,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. */ @@ -286,8 +302,9 @@ Q_OBJECT public: const QList producersList(); void updatePreviewSettings(); void setDropFrames(bool show); - QString updateSceneListFps(double current_fps, double new_fps, QString scene); - void showFrame(Mlt::Frame&); + /** @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&); @@ -298,6 +315,8 @@ Q_OBJECT public: Mlt::Producer *getProducer(); /** @brief Returns the number of clips to process (When requesting clip info). */ int processingItems(); + /** @brief Processing of this clip is over, producer was set on clip, remove from list. */ + void processingDone(const QString &id); /** @brief Force processing of clip with selected id. */ void forceProcessing(const QString &id); /** @brief Are we currently processing clip with selected id. */ @@ -316,25 +335,42 @@ Q_OBJECT public: void unlockService(Mlt::Tractor *tractor); const QString activeClipId(); /** @brief Fill a combobox with the found blackmagic devices */ - static bool getBlackMagicDeviceList(KComboBox *devicelist); - static bool getBlackMagicOutputDeviceList(KComboBox *devicelist); + static bool getBlackMagicDeviceList(KComboBox *devicelist, bool force = false); + static bool getBlackMagicOutputDeviceList(KComboBox *devicelist, bool force = false); /** @brief Frame rendering is handeled by Kdenlive, don't show video through SDL display */ void disablePreview(bool disable); + /** @brief Get current seek pos requested of SEEK_INACTIVE if we are not currently seeking */ + int requestedSeekPosition; + /** @brief Get current seek pos requested of current producer pos if not seeking */ + 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; +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); + private: /** @brief The name of this renderer. * * 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_pauseEvent; double m_fps; - bool m_externalConsumer; /** @brief True if we are playing a zone. * @@ -343,7 +379,6 @@ private: bool m_isZoneMode; bool m_isLoopMode; GenTime m_loopStart; - int m_originalOut; /** @brief True when the monitor is in split view. */ bool m_isSplitView; @@ -362,14 +397,20 @@ private: QLocale m_locale; 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; + 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 id of the clip that is currently being loaded for info query */ - QString m_processingClipId; + /** @brief The ids of the clips that are currently being loaded for info query */ + QStringList m_processingClipId; /** @brief Build the MLT Consumer object with initial settings. * @param profileName The MLT profile to use for the consumer */ @@ -384,6 +425,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: @@ -392,6 +435,10 @@ private slots: void slotOsdTimeout(); /** @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 showFrame(Mlt::Frame *); + void slotCheckSeeking(); signals: @@ -426,13 +473,21 @@ signals: void refreshDocumentProducers(bool displayRatioChanged, bool fpsChanged); /** @brief A proxy clip is missing, ask for creation. */ void requestProxy(QString); + /** @brief A multiple stream clip was found. */ + void multiStreamFound(const QString &,QList,QList,stringMap data); /** @brief A frame's image has to be shown. * * Used in Mac OS X. */ void showImageSignal(QImage); - void showAudioSignal(const QByteArray &); + void showImageSignal(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: @@ -444,7 +499,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();