X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Frenderer.h;h=1534a4c542162b27ef7405f9b0eda78cfda1ecef;hb=7e5766e97e9b0db202d7d85a64b7d2567f35f282;hp=afbf50eb78164ea860f0bdc7fec0e201efc02ad1;hpb=efb2133c58a7d4b2f53ca31b362c591a93c59290;p=kdenlive diff --git a/src/renderer.h b/src/renderer.h index afbf50eb..1534a4c5 100644 --- a/src/renderer.h +++ b/src/renderer.h @@ -32,7 +32,8 @@ #include "gentime.h" #include "definitions.h" #include "abstractmonitor.h" -#include "mlt/framework/mlt_types.h" + +#include #include @@ -47,6 +48,8 @@ class QTimer; class QPixmap; +class KComboBox; + namespace Mlt { class Consumer; @@ -59,6 +62,7 @@ class Producer; class Filter; class Profile; class Service; +class Event; }; struct requestClipInfo { @@ -66,6 +70,11 @@ struct requestClipInfo { QString clipId; int imageHeight; bool replaceProducer; + +bool operator==(const requestClipInfo &a) +{ + return clipId == a.clipId; +} }; class MltErrorEvent : public QEvent @@ -92,7 +101,7 @@ 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(const QString &rendererName, int winid, QString profile = QString(), QWidget *parent = 0); + Render(Kdenlive::MONITORID rendererName, int winid, QString profile = QString(), QWidget *parent = 0); /** @brief Destroy the MLT Renderer. */ virtual ~Render(); @@ -101,7 +110,6 @@ Q_OBJECT public: void seek(GenTime time); void seek(int time); void seekToFrameDiff(int diff); - int m_isBlocked; QPixmap getImageThumbnail(KUrl url, int width, int height); @@ -147,38 +155,40 @@ Q_OBJECT public: void loopZone(const GenTime & startTime, const GenTime & stopTime); 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()); - /** @brief Returns the name of the renderer. */ - const QString & rendererName() const; + /** @brief Return true if we are currently playing */ + bool isPlaying() const; /** @brief Returns the speed at which the renderer is currently playing. * * It returns 0.0 when the renderer is not playing anything. */ - double playSpeed(); + double playSpeed() const; /** @brief Returns the current seek position of the renderer. */ GenTime seekPosition() const; int seekFramePosition() const; void emitFrameUpdated(Mlt::Frame&); - void emitFrameNumber(double position); + void emitFrameNumber(); void emitConsumerStopped(); /** @brief Returns the aspect ratio of the consumer. */ double consumerRatio() const; - void doRefresh(); - /** @brief Saves current producer frame as an image. */ void exportCurrentFrame(KUrl url, bool notify); - /** @brief Turns on or off on screen display. */ - void refreshDisplay(); /** @brief Change the Mlt PROFILE * @param profileName The MLT profile name * @param dropSceneList If true, the current playlist will be deleted + * @return true if the profile was changed * . */ int resetProfile(const QString& profileName, bool dropSceneList = false); + /** @brief Returns true if the render uses profileName as current profile. */ + bool hasProfile(const QString& profileName) const; double fps() const; /** @brief Returns the width of a frame for this profile. */ @@ -192,14 +202,18 @@ 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. */ 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(ItemInfo info, QDomElement element, Mlt::Producer *prod); - void mltCutClip(int track, GenTime position); + bool mltUpdateClip(Mlt::Tractor *tractor, ItemInfo info, QDomElement element, Mlt::Producer *prod); + bool mltCutClip(int track, 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); @@ -208,7 +222,7 @@ Q_OBJECT public: bool mltResizeClipEnd(ItemInfo info, GenTime clipDuration); 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); @@ -219,8 +233,21 @@ Q_OBJECT public: /** @brief Adds an effect to a clip in MLT's playlist. */ bool mltAddEffect(int track, GenTime position, EffectsParameterList params, bool doRefresh = true); + bool addFilterToService(Mlt::Service service, EffectsParameterList params, int duration); bool mltAddEffect(Mlt::Service service, EffectsParameterList params, int duration, bool doRefresh); bool mltAddTrackEffect(int track, EffectsParameterList params); + + /** @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); + /** @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); /** @brief Edits an effect parameters in MLT's playlist. */ bool mltEditEffect(int track, GenTime position, EffectsParameterList params); @@ -247,9 +274,9 @@ Q_OBJECT public: void mltMoveTransparency(int startTime, int endTime, int startTrack, int endTrack, int id); void mltDeleteTransparency(int pos, int track, int id); void mltResizeTransparency(int oldStart, int newStart, int newEnd, int track, int id); - void mltInsertTrack(int ix, bool videoTrack); + QList mltInsertTrack(int ix, bool videoTrack); void mltDeleteTrack(int ix); - bool mltUpdateClipProducer(int track, int pos, Mlt::Producer *prod); + bool mltUpdateClipProducer(Mlt::Tractor *tractor, int track, int pos, Mlt::Producer *prod); void mltPlantTransition(Mlt::Field *field, Mlt::Transition &tr, int a_track, int b_track); Mlt::Producer *invalidProducer(const QString &id); @@ -270,8 +297,6 @@ Q_OBJECT public: void showFrame(Mlt::Frame&); void showAudio(Mlt::Frame&); - /** @brief This property is used to decide if the renderer should send audio data for monitoring. */ - bool analyseAudio; QList checkTrackSequence(int); void sendFrameUpdate(); @@ -279,9 +304,30 @@ Q_OBJECT public: /** @brief Returns a pointer to the main producer. */ Mlt::Producer *getProducer(); /** @brief Returns the number of clips to process (When requesting clip info). */ - int processingItems() const; + int processingItems(); /** @brief Force processing of clip with selected id. */ void forceProcessing(const QString &id); + /** @brief Are we currently processing clip with selected id. */ + bool isProcessing(const QString &id); + + /** @brief Requests the file properties for the specified URL (will be put in a queue list) + @param xml The xml parameters for the clip + @param clipId The clip Id string + @param imageHeight The height (in pixels) of the returned thumbnail (height of a treewidgetitem in projectlist) + @param replaceProducer If true, the MLT producer will be recreated */ + void getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer = true); + + /** @brief Lock the MLT service */ + Mlt::Tractor *lockService(); + /** @brief Unlock the MLT service */ + 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); + /** @brief Frame rendering is handeled by Kdenlive, don't show video through SDL display */ + void disablePreview(bool disable); + int requestedSeekPosition; private: @@ -289,11 +335,12 @@ private: * * Useful to identify the renderers by what they do - e.g. background * rendering, workspace monitor, etc. */ - QString m_name; + Kdenlive::MONITORID m_name; Mlt::Consumer * m_mltConsumer; Mlt::Producer * m_mltProducer; Mlt::Profile *m_mltProfile; - double m_framePosition; + Mlt::Event *m_showFrameEvent; + Mlt::Event *m_pauseEvent; double m_fps; bool m_externalConsumer; @@ -304,7 +351,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; @@ -313,6 +359,7 @@ private: QString m_activeProfile; QTimer *m_osdTimer; + QTimer m_refreshTimer; QMutex m_mutex; QMutex m_infoMutex; @@ -322,12 +369,15 @@ private: QLocale m_locale; QFuture m_infoThread; QList m_requestList; + bool m_paused; void closeMlt(); void mltCheckLength(Mlt::Tractor *tractor); void mltPasteEffects(Mlt::Producer *source, Mlt::Producer *dest); QMap mltGetTransitionParamsFromXml(QDomElement xml); QMap m_slowmotionProducers; + /** @brief The id of the clip that is currently being loaded for info query */ + QString m_processingClipId; /** @brief Build the MLT Consumer object with initial settings. * @param profileName The MLT profile to use for the consumer */ @@ -340,19 +390,25 @@ private: /** @brief Make sure our audio mixing transitions are applied to the lowest track */ void fixAudioMixing(Mlt::Tractor tractor); + /** @brief Make sure we inform MLT if we need a lot of threads for avformat producer */ + void checkMaxThreads(); private slots: /** @brief Refreshes the monitor display. */ void refresh(); void slotOsdTimeout(); - int connectPlaylist(); - //void initSceneList(); + /** @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 slotCheckSeeking(); signals: /** @brief The renderer received a reply to a getFileProperties request. */ - void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const stringMap &, const stringMap &, bool replaceProducer, bool refreshThumbnail = false); + void replyGetFileProperties(const QString &clipId, Mlt::Producer*, const stringMap &, const stringMap &, bool replaceProducer); /** @brief The renderer received a reply to a getImage request. */ void replyGetImage(const QString &, const QString &, int, int); @@ -380,15 +436,19 @@ signals: */ void removeInvalidProxy(const QString &id, bool durationError); void refreshDocumentProducers(bool displayRatioChanged, bool fpsChanged); - - /** @brief If we will delete the producer, make sure to pause the monitor */ - void blockClipMonitor(const QString &); + /** @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 addClip(const KUrl &, stringMap); + void checkSeeking(); public slots: @@ -402,24 +462,14 @@ public slots: /** @brief Checks if the file is readable by MLT. */ bool isValid(KUrl url); - /** @brief Requests the file properties for the specified URL. - @param xml The xml parameters for the clip - @param clipId The clip Id string - @param imageHeight The height (in pixels) of the returned thumbnail (height of a treewidgetitem in projectlist) - @param replaceProducer If true, the MLT producer will be recreated - @param selectClip If true, clip item will be selected in project view - * Upon return, the result will be emitted via replyGetFileProperties(). - * Wraps the VEML command of the same name. */ - void getFileProperties(const QDomElement &xml, const QString &clipId, int imageHeight, bool replaceProducer = true); - - void getFileProperties2(); - void exportFileToFirewire(QString srcFileName, int port, GenTime startTime, GenTime endTime); void mltSavePlaylist(); void slotSplitView(bool doit); void slotSwitchFullscreen(); void slotSetVolume(int volume); void seekToFrame(int pos); + /** @brief Starts a timer to query for a refresh. */ + void doRefresh(); }; #endif