demux: dash: add basic seeking using next segment

Still doesn't control streamDemux

diff --git a/modules/demux/dash/DASHManager.cpp b/modules/demux/dash/DASHManager.cpp
index b3085fb58397753b9c0b19d27f75b2d4bb341f07..f60e6479a51a18149365dce055be75eb4649e25c 100644 (file)
--- a/modules/demux/dash/DASHManager.cpp
+++ b/modules/demux/dash/DASHManager.cpp
@@ -156,3 +156,33 @@ mtime_t DASHManager::getDuration() const
     else
         return CLOCK_FREQ * mpd->getDuration();
 }
+
+bool DASHManager::setPosition(mtime_t time)
+{
+    bool ret = true;
+    for(int real = 0; real < 2; real++)
+    {
+        /* Always probe if we can seek first */
+        for(int type=0; type<Streams::count; type++)
+        {
+            if(!streams[type])
+                continue;
+            ret &= streams[type]->setPosition(time, !real);
+        }
+        if(!ret)
+            break;
+    }
+    return ret;
+}
+
+bool DASHManager::seekAble() const
+{
+    for(int type=0; type<Streams::count; type++)
+    {
+        if(!streams[type])
+            continue;
+        if(!streams[type]->seekAble())
+            return false;
+    }
+    return true;
+}

diff --git a/modules/demux/dash/DASHManager.h b/modules/demux/dash/DASHManager.h
index f0f4ed350de9b3de79b71c7bfc909f311462afc9..b2fc7e3c57104ce17b63ecf6887997d99159497e 100644 (file)
--- a/modules/demux/dash/DASHManager.h
+++ b/modules/demux/dash/DASHManager.h
@@ -44,6 +44,8 @@ namespace dash
             mtime_t getPCR() const;
             int     getGroup() const;
             int     esCount() const;
+            bool    setPosition(mtime_t);
+            bool    seekAble() const;
 
         private:
             http::HTTPConnectionManager         *conManager;

diff --git a/modules/demux/dash/SegmentTracker.cpp b/modules/demux/dash/SegmentTracker.cpp
index 347083da3e6fd0b3372af7986d2877d246764d72..8559dc418f4c184d36665ff52a10aaaa06395260 100644 (file)
--- a/modules/demux/dash/SegmentTracker.cpp
+++ b/modules/demux/dash/SegmentTracker.cpp
@@ -95,3 +95,16 @@ Chunk * SegmentTracker::getNextChunk(Streams::Type type)
 
     return chunk;
 }
+
+bool SegmentTracker::setPosition(mtime_t time, bool tryonly)
+{
+    uint64_t segcount;
+    if(prevRepresentation &&
+       prevRepresentation->getSegmentNumberByTime(time, &segcount))
+    {
+        if(!tryonly)
+            count = segcount;
+        return true;
+    }
+    return false;
+}

diff --git a/modules/demux/dash/SegmentTracker.hpp b/modules/demux/dash/SegmentTracker.hpp
index c545362462ea51c7093671904e5306b49f521243..d76d5251a0c2f853ff014f5e12e570dfd4fd9a5f 100644 (file)
--- a/modules/demux/dash/SegmentTracker.hpp
+++ b/modules/demux/dash/SegmentTracker.hpp
@@ -56,6 +56,7 @@ namespace dash
             void setAdaptationLogic(logic::AbstractAdaptationLogic *);
             void resetCounter();
             http::Chunk* getNextChunk(Streams::Type);
+            bool setPosition(mtime_t, bool);
 
         private:
             bool initializing;

diff --git a/modules/demux/dash/Streams.cpp b/modules/demux/dash/Streams.cpp
index fcabd6324913fcef4464d07709cf8662964984f0..9e2ac478b9de7d976c4dcefddb5f0cf1b721c19e 100644 (file)
--- a/modules/demux/dash/Streams.cpp
+++ b/modules/demux/dash/Streams.cpp
@@ -141,6 +141,11 @@ Chunk * Stream::getChunk()
     return currentChunk;
 }
 
+bool Stream::seekAble() const
+{
+    return (output && output->seekAble());
+}
+
 size_t Stream::read(HTTPConnectionManager *connManager)
 {
     Chunk *chunk = getChunk();
@@ -210,6 +215,14 @@ size_t Stream::read(HTTPConnectionManager *connManager)
     return readsize;
 }
 
+bool Stream::setPosition(mtime_t time, bool tryonly)
+{
+    bool ret = segmentTracker->setPosition(time, tryonly);
+    if(!tryonly && ret)
+        output->setPosition(time);
+    return ret;
+}
+
 AbstractStreamOutput::AbstractStreamOutput(demux_t *demux)
 {
     realdemux = demux;
@@ -217,6 +230,7 @@ AbstractStreamOutput::AbstractStreamOutput(demux_t *demux)
     pcr = VLC_TS_0;
     group = -1;
     escount = 0;
+    seekable = true;
 
     fakeesout = new es_out_t;
     if (!fakeesout)
@@ -257,6 +271,17 @@ void AbstractStreamOutput::pushBlock(block_t *block)
     stream_DemuxSend(demuxstream, block);
 }
 
+bool AbstractStreamOutput::seekAble() const
+{
+    return (demuxstream && seekable);
+}
+
+void AbstractStreamOutput::setPosition(mtime_t nztime)
+{
+    es_out_Control(realdemux->out, ES_OUT_SET_NEXT_DISPLAY_TIME,
+                   VLC_TS_0 + nztime);
+}
+
 /* Static callbacks */
 es_out_id_t * AbstractStreamOutput::esOutAdd(es_out_t *fakees, const es_format_t *p_fmt)
 {

diff --git a/modules/demux/dash/Streams.hpp b/modules/demux/dash/Streams.hpp
index 445640ad04c034b1d96bd7482f4f93fe4685c606..10404f43580704060f8d5a9751f6d62ba0c61dd4 100644 (file)
--- a/modules/demux/dash/Streams.hpp
+++ b/modules/demux/dash/Streams.hpp
@@ -53,7 +53,9 @@ namespace dash
                 mtime_t getPCR() const;
                 int getGroup() const;
                 int esCount() const;
+                bool seekAble() const;
                 size_t read(http::HTTPConnectionManager *);
+                bool setPosition(mtime_t, bool);
 
             private:
                 http::Chunk *getChunk();
@@ -77,6 +79,8 @@ namespace dash
                 mtime_t getPCR() const;
                 int getGroup() const;
                 int esCount() const;
+                bool seekAble() const;
+                void setPosition(mtime_t);
 
             protected:
                 mtime_t   pcr;
@@ -84,6 +88,7 @@ namespace dash
                 int       escount;
                 es_out_t *fakeesout; /* to intercept/proxy what is sent from demuxstream */
                 stream_t *demuxstream;
+                bool      seekable;
 
             private:
                 demux_t  *realdemux;

diff --git a/modules/demux/dash/dash.cpp b/modules/demux/dash/dash.cpp
index 23431ddd82928e1c6a3bd4e2e29988500518017d..924e1f8bb3b59544e4e54981f88774734107559e 100644 (file)
--- a/modules/demux/dash/dash.cpp
+++ b/modules/demux/dash/dash.cpp
@@ -195,7 +195,7 @@ static int  Control         (demux_t *p_demux, int i_query, va_list args)
     switch (i_query)
     {
         case DEMUX_CAN_SEEK:
-            *(va_arg (args, bool *)) = false;
+            *(va_arg (args, bool *)) = p_sys->p_dashManager->seekAble();
             break;
 
         case DEMUX_CAN_CONTROL_PACE:
@@ -222,6 +222,17 @@ static int  Control         (demux_t *p_demux, int i_query, va_list args)
                                          / p_sys->p_dashManager->getDuration();
             break;
 
+        case DEMUX_SET_POSITION:
+            if(!p_sys->p_dashManager->getDuration() ||
+               !p_sys->p_dashManager->setPosition( p_sys->p_dashManager->getDuration() * va_arg(args, double)))
+                return VLC_EGENERIC;
+            break;
+
+        case DEMUX_SET_TIME:
+            if(!p_sys->p_dashManager->setPosition(va_arg(args, int64_t)))
+                return VLC_EGENERIC;
+            break;
+
         case DEMUX_GET_PTS_DELAY:
             *va_arg (args, int64_t *) = INT64_C(1000) *
                 var_InheritInteger(p_demux, "network-caching");

diff --git a/modules/demux/dash/mpd/IsoffMainParser.cpp b/modules/demux/dash/mpd/IsoffMainParser.cpp
index 9271e415f48f0c9bc98c9548263878a5511d0fe4..ed5aea84640d86214415df69c5218fafc8bb0699 100644 (file)
--- a/modules/demux/dash/mpd/IsoffMainParser.cpp
+++ b/modules/demux/dash/mpd/IsoffMainParser.cpp
@@ -280,6 +280,9 @@ size_t IsoffMainParser::parseSegmentList(Node * segListNode, SegmentInformation
             if(segListNode->hasAttribute("duration"))
                 list->setDuration(Integer<mtime_t>(segListNode->getAttributeValue("duration")));
 
+            if(segListNode->hasAttribute("timescale"))
+                list->timescale.Set(Integer<uint64_t>(segListNode->getAttributeValue("timescale")));
+
             std::vector<Node *>::const_iterator it;
             for(it = segments.begin(); it != segments.end(); it++)
             {

diff --git a/modules/demux/dash/mpd/SegmentInformation.cpp b/modules/demux/dash/mpd/SegmentInformation.cpp
index 7d26f69edc3a1cce78b33646bb4faeadce4d7275..53ff8c70e41e25a9736ec37c7546e746d7f25a88 100644 (file)
--- a/modules/demux/dash/mpd/SegmentInformation.cpp
+++ b/modules/demux/dash/mpd/SegmentInformation.cpp
@@ -59,35 +59,58 @@ SegmentInformation::~SegmentInformation()
         delete segmentTemplate[i];
 }
 
-vector<ISegment *> SegmentInformation::getSegments() const
+vector<ISegment *> SegmentInformation::getSegments(SegmentInfoType type) const
 {
     vector<ISegment *> retSegments;
 
-    SegmentList *segList = inheritSegmentList();
-
-    /* init segments are always single segment */
-    ISegment *segment = getSegment( INFOTYPE_INIT );
-    if( segment )
-        retSegments.push_back( segment );
-
-    if( inheritSegmentTemplate(INFOTYPE_MEDIA) )
+    switch (type)
     {
-        retSegments.push_back( inheritSegmentTemplate(INFOTYPE_MEDIA) );
-    }
-    else if ( segList && !segList->getSegments().empty() )
-    {
-        std::vector<Segment *>::const_iterator it;
-        for(it=segList->getSegments().begin();
-            it!=segList->getSegments().end(); it++)
+        case INFOTYPE_INIT:
         {
-            std::vector<ISegment *> list = (*it)->subSegments();
-            retSegments.insert( retSegments.end(), list.begin(), list.end() );
+            /* init segments are always single segment */
+            ISegment *segment = getSegment( INFOTYPE_INIT );
+            if( segment )
+                retSegments.push_back( segment );
+        }
+        break;
+
+        case INFOTYPE_MEDIA:
+        {
+            SegmentList *segList = inheritSegmentList();
+            if( inheritSegmentTemplate(INFOTYPE_MEDIA) )
+            {
+                retSegments.push_back( inheritSegmentTemplate(INFOTYPE_MEDIA) );
+            }
+            else if ( segList && !segList->getSegments().empty() )
+            {
+                std::vector<Segment *>::const_iterator it;
+                for(it=segList->getSegments().begin();
+                    it!=segList->getSegments().end(); it++)
+                {
+                    std::vector<ISegment *> list = (*it)->subSegments();
+                    retSegments.insert( retSegments.end(), list.begin(), list.end() );
+                }
+            }
         }
+
+        default:
+        break;
     }
 
     return retSegments;
 }
 
+vector<ISegment *> SegmentInformation::getSegments() const
+{
+    vector<ISegment *> retSegments;
+    for(int i=0; i<InfoTypeCount; i++)
+    {
+        vector<ISegment *> segs = getSegments(static_cast<SegmentInfoType>(i));
+        retSegments.insert( retSegments.end(), segs.begin(), segs.end() );
+    }
+    return retSegments;
+}
+
 ISegment * SegmentInformation::getSegment(SegmentInfoType type, uint64_t pos) const
 {
     SegmentBase *segBase = inheritSegmentBase();
@@ -134,6 +157,20 @@ ISegment * SegmentInformation::getSegment(SegmentInfoType type, uint64_t pos) co
     return segment;
 }
 
+bool SegmentInformation::getSegmentNumberByTime(mtime_t time, uint64_t *ret) const
+{
+    SegmentList *segList = inheritSegmentList();
+    if ( segList->getDuration() )
+    {
+        uint64_t timescale = segList->timescale.Get();
+        if(!timescale)
+            timescale = getTimescale();
+        *ret = time / (CLOCK_FREQ * segList->getDuration() / timescale);
+        return true;
+    }
+    return false;
+}
+
 bool SegmentInformation::canBitswitch() const
 {
     if(bitswitch_policy == BITSWITCH_INHERIT)

diff --git a/modules/demux/dash/mpd/SegmentInformation.hpp b/modules/demux/dash/mpd/SegmentInformation.hpp
index 4240068d07c07e395421cdf3d1119f4cedd8b274..c72ee6af06c6ec7366ddb3c59dfe80bf866c1b82 100644 (file)
--- a/modules/demux/dash/mpd/SegmentInformation.hpp
+++ b/modules/demux/dash/mpd/SegmentInformation.hpp
@@ -48,7 +48,6 @@ namespace dash
                 SegmentInformation( SegmentInformation * = 0 );
                 explicit SegmentInformation( ICanonicalUrl * );
                 virtual ~SegmentInformation();
-                std::vector<ISegment *> getSegments() const;
                 bool canBitswitch() const;
                 uint64_t getTimescale() const;
                 virtual mtime_t getPeriodStart() const;
@@ -70,6 +69,11 @@ namespace dash
                 static const int InfoTypeCount = INFOTYPE_INDEX + 1;
 
                 ISegment * getSegment(SegmentInfoType, uint64_t = 0) const;
+                bool getSegmentNumberByTime(mtime_t, uint64_t *) const;
+
+            protected:
+                std::vector<ISegment *> getSegments() const;
+                std::vector<ISegment *> getSegments(SegmentInfoType) const;
 
             private:
                 void setSegmentList(SegmentList *);

diff --git a/modules/demux/dash/mpd/SegmentList.cpp b/modules/demux/dash/mpd/SegmentList.cpp
index 9af77d70add8db3c0730797067bad045f6b2955c..87c7bcd72149a6eace1bd3f043818d54eea39a03 100644 (file)
--- a/modules/demux/dash/mpd/SegmentList.cpp
+++ b/modules/demux/dash/mpd/SegmentList.cpp
@@ -34,7 +34,7 @@ using namespace dash::mpd;
 SegmentList::SegmentList( ICanonicalUrl *parent ):
     SegmentInfoCommon( parent )
 {
-
+    timescale.Set(0);
 }
 SegmentList::~SegmentList()
 {

diff --git a/modules/demux/dash/mpd/SegmentList.h b/modules/demux/dash/mpd/SegmentList.h
index b081bbc010917dbd6ae1c989d0637ee5aefb299d..8e685e0c1dfa6106b1b9e702a8ae63862026d2e3 100644 (file)
--- a/modules/demux/dash/mpd/SegmentList.h
+++ b/modules/demux/dash/mpd/SegmentList.h
@@ -25,8 +25,15 @@
 #ifndef SEGMENTLIST_H_
 #define SEGMENTLIST_H_
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "mpd/SegmentInfoCommon.h"
 #include "mpd/ICanonicalUrl.hpp"
+#include "Properties.hpp"
+
+#include <vlc_common.h>
 
 namespace dash
 {
@@ -41,6 +48,8 @@ namespace dash
                 const std::vector<Segment *>&   getSegments() const;
                 void                    addSegment(Segment *seg);
 
+                Property<uint64_t> timescale;
+
             private:
                 std::vector<Segment *>  segments;
         };