demux: adaptative: split StreamOutput

modules/demux/Makefile.am

@@ -298,6 +298,8 @@ libadaptative_plugin_la_SOURCES = \
     demux/adaptative/http/HTTPConnectionManager.h \
     demux/adaptative/http/Sockets.hpp \
     demux/adaptative/http/Sockets.cpp \
+    demux/adaptative/plumbing/StreamOutput.cpp \
+    demux/adaptative/plumbing/StreamOutput.hpp \
     demux/adaptative/PlaylistManager.cpp \
     demux/adaptative/PlaylistManager.h \
     demux/adaptative/SegmentTracker.cpp \

modules/demux/adaptative/PlaylistManager.cpp

@@ -33,6 +33,7 @@
 #include "logic/AlwaysBestAdaptationLogic.h"
 #include "logic/RateBasedAdaptationLogic.h"
 #include "logic/AlwaysLowestAdaptationLogic.hpp"
+#include "plumbing/StreamOutput.hpp"
 #include <vlc_stream.h>
 #include <vlc_demux.h>
 

modules/demux/adaptative/Streams.hpp

@@ -102,101 +102,5 @@ namespace adaptative
         const AbstractStreamOutputFactory *streamOutputFactory;
     };
 
-    class AbstractStreamOutput
-    {
-    public:
-        AbstractStreamOutput(demux_t *, const StreamFormat &);
-        virtual ~AbstractStreamOutput();
-
-        void setLanguage(const std::string &);
-        void setDescription(const std::string &);
-        const StreamFormat & getStreamFormat() const;
-        virtual void pushBlock(block_t *, bool) = 0;
-        virtual mtime_t getPCR() const;
-        virtual mtime_t getFirstDTS() const = 0;
-        virtual int esCount() const = 0;
-        virtual bool seekAble() const = 0;
-        virtual void setPosition(mtime_t) = 0;
-        virtual void sendToDecoder(mtime_t) = 0;
-        virtual bool isEmpty() const = 0;
-        virtual bool reinitsOnSeek() const = 0;
-        virtual bool switchAllowed() const = 0;
-        virtual bool isSelected() const = 0;
-
-    protected:
-        demux_t  *realdemux;
-        mtime_t   pcr;
-        std::string language;
-        std::string description;
-
-    private:
-        StreamFormat format;
-    };
-
-    class AbstractStreamOutputFactory
-    {
-        public:
-            virtual ~AbstractStreamOutputFactory() {}
-            virtual AbstractStreamOutput *create(demux_t*, const StreamFormat &) const = 0;
-    };
-
-    class BaseStreamOutput : public AbstractStreamOutput
-    {
-    public:
-        BaseStreamOutput(demux_t *, const StreamFormat &, const std::string &);
-        virtual ~BaseStreamOutput();
-        virtual void pushBlock(block_t *, bool); /* reimpl */
-        virtual mtime_t getFirstDTS() const; /* reimpl */
-        virtual int esCount() const; /* reimpl */
-        virtual bool seekAble() const; /* reimpl */
-        virtual void setPosition(mtime_t); /* reimpl */
-        virtual void sendToDecoder(mtime_t); /* reimpl */
-        virtual bool isEmpty() const; /* reimpl */
-        virtual bool reinitsOnSeek() const; /* reimpl */
-        virtual bool switchAllowed() const; /* reimpl */
-        virtual bool isSelected() const; /* reimpl */
-        void setTimestampOffset(mtime_t);
-
-    protected:
-        es_out_t *fakeesout; /* to intercept/proxy what is sent from demuxstream */
-        stream_t *demuxstream;
-        bool      seekable;
-        std::string name;
-        bool      restarting;
-        mtime_t   timestamps_offset;
-
-        virtual es_out_id_t *esOutAdd(const es_format_t *);
-        virtual int esOutSend(es_out_id_t *, block_t *);
-        virtual void esOutDel(es_out_id_t *);
-        virtual int esOutControl(int, va_list);
-        virtual void esOutDestroy();
-
-    private:
-        /* static callbacks for demuxer */
-        static es_out_id_t *esOutAdd_Callback(es_out_t *, const es_format_t *);
-        static int esOutSend_Callback(es_out_t *, es_out_id_t *, block_t *);
-        static void esOutDel_Callback(es_out_t *, es_out_id_t *);
-        static int esOutControl_Callback(es_out_t *, int, va_list);
-        static void esOutDestroy_Callback(es_out_t *);
-
-        class Demuxed
-        {
-            friend class BaseStreamOutput;
-            Demuxed(es_out_id_t *, const es_format_t *);
-            ~Demuxed();
-            void drop();
-            es_out_id_t *es_id;
-            block_t  *p_queue;
-            block_t **pp_queue_last;
-            bool recycle;
-            es_format_t fmtcpy;
-        };
-        std::list<Demuxed *> queues;
-        bool b_drop;
-        vlc_mutex_t lock;
-        void sendToDecoderUnlocked(mtime_t);
-        bool restart();
-    };
-
 }
 #endif // STREAMS_HPP

modules/demux/adaptative/plumbing/StreamOutput.hpp

+/*
+ * StreamOutput.hpp
+ *****************************************************************************
+ * Copyright (C) 2014-2015 VideoLAN and VLC authors
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+#ifndef STREAMOUTPUT_HPP
+#define STREAMOUTPUT_HPP
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <string>
+#include <list>
+#include <vlc_common.h>
+#include <vlc_es.h>
+#include "../StreamFormat.hpp"
+
+namespace adaptative
+{
+    class AbstractStreamOutput
+    {
+    public:
+        AbstractStreamOutput(demux_t *, const StreamFormat &);
+        virtual ~AbstractStreamOutput();
+
+        void setLanguage(const std::string &);
+        void setDescription(const std::string &);
+        const StreamFormat & getStreamFormat() const;
+        virtual void pushBlock(block_t *, bool) = 0;
+        virtual mtime_t getPCR() const;
+        virtual mtime_t getFirstDTS() const = 0;
+        virtual int esCount() const = 0;
+        virtual bool seekAble() const = 0;
+        virtual void setPosition(mtime_t) = 0;
+        virtual void sendToDecoder(mtime_t) = 0;
+        virtual bool isEmpty() const = 0;
+        virtual bool reinitsOnSeek() const = 0;
+        virtual bool switchAllowed() const = 0;
+        virtual bool isSelected() const = 0;
+
+    protected:
+        demux_t  *realdemux;
+        mtime_t   pcr;
+        std::string language;
+        std::string description;
+
+    private:
+        StreamFormat format;
+    };
+
+    class AbstractStreamOutputFactory
+    {
+        public:
+            virtual ~AbstractStreamOutputFactory() {}
+            virtual AbstractStreamOutput *create(demux_t*, const StreamFormat &) const = 0;
+    };
+
+    class BaseStreamOutput : public AbstractStreamOutput
+    {
+    public:
+        BaseStreamOutput(demux_t *, const StreamFormat &, const std::string &);
+        virtual ~BaseStreamOutput();
+        virtual void pushBlock(block_t *, bool); /* reimpl */
+        virtual mtime_t getFirstDTS() const; /* reimpl */
+        virtual int esCount() const; /* reimpl */
+        virtual bool seekAble() const; /* reimpl */
+        virtual void setPosition(mtime_t); /* reimpl */
+        virtual void sendToDecoder(mtime_t); /* reimpl */
+        virtual bool isEmpty() const; /* reimpl */
+        virtual bool reinitsOnSeek() const; /* reimpl */
+        virtual bool switchAllowed() const; /* reimpl */
+        virtual bool isSelected() const; /* reimpl */
+        void setTimestampOffset(mtime_t);
+
+    protected:
+        es_out_t *fakeesout; /* to intercept/proxy what is sent from demuxstream */
+        stream_t *demuxstream;
+        bool      seekable;
+        std::string name;
+        bool      restarting;
+        mtime_t   timestamps_offset;
+
+        virtual es_out_id_t *esOutAdd(const es_format_t *);
+        virtual int esOutSend(es_out_id_t *, block_t *);
+        virtual void esOutDel(es_out_id_t *);
+        virtual int esOutControl(int, va_list);
+        virtual void esOutDestroy();
+
+    private:
+        /* static callbacks for demuxer */
+        static es_out_id_t *esOutAdd_Callback(es_out_t *, const es_format_t *);
+        static int esOutSend_Callback(es_out_t *, es_out_id_t *, block_t *);
+        static void esOutDel_Callback(es_out_t *, es_out_id_t *);
+        static int esOutControl_Callback(es_out_t *, int, va_list);
+        static void esOutDestroy_Callback(es_out_t *);
+
+        class Demuxed
+        {
+            friend class BaseStreamOutput;
+            Demuxed(es_out_id_t *, const es_format_t *);
+            ~Demuxed();
+            void drop();
+            es_out_id_t *es_id;
+            block_t  *p_queue;
+            block_t **pp_queue_last;
+            bool recycle;
+            es_format_t fmtcpy;
+        };
+        std::list<Demuxed *> queues;
+        bool b_drop;
+        vlc_mutex_t lock;
+        void sendToDecoderUnlocked(mtime_t);
+        bool restart();
+    };
+
+}
+#endif // STREAMOUTPUT_HPP

modules/demux/dash/DASHManager.h

@@ -27,6 +27,7 @@
 
 #include "../adaptative/PlaylistManager.h"
 #include "../adaptative/logic/AbstractAdaptationLogic.h"
+#include "../adaptative/plumbing/StreamOutput.hpp"
 #include "mpd/MPD.h"
 
 namespace dash

modules/demux/hls/HLSStreams.hpp

@@ -24,7 +24,7 @@
 # include "config.h"
 #endif
 
-#include "../adaptative/Streams.hpp"
+#include "../adaptative/plumbing/StreamOutput.hpp"
 
 namespace hls
 {