fix hls playback

pili-engineering · Jul 16, 2015 · 46032dd · 46032dd
1 parent 0c097e4
commit 46032dd
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 14 deletions.
diff --git a/pili/client.py b/pili/client.py
@@ -20,15 +20,4 @@ def list_streams(self, marker=None, limit=None):
         for data in res["items"]:
             items.append(Stream(self.__auth__, stream_id=data["id"]))
         res["items"] = items
-        return res
-
-#def streams(hub=conf.HUB, limit=None):
-#    marker = None
-#    while True:
-#        res = api.get_stream_list(hub=hub, marker=marker, limit=None)
-#        if res["items"] is not None:
-#            for data in res["items"]:
-#                yield Stream(data=data)
-#        else:
-#            break
-#        marker = res["marker"]#
+        return res
diff --git a/pili/stream.py b/pili/stream.py
@@ -75,7 +75,9 @@ def hls_live_urls(self):
 
     def hls_playback_urls(self, start_second, end_second):
         res = dict()
-        res["ORIGIN"] = self.__base__("http", self.hosts["play"]["hls"], "")
+        url = self.__base__("http", self.hosts["play"]["hls"], "")
+        url += "?start=%d&end=%d" % (start_second, end_second)
+        res["ORIGIN"] = url
         if self.profiles!=None:
             for profile in self.profiles:
                 url = self.__base__("http", self.hosts["play"]["hls"], profile)

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
     name = 'pili',
-    version = '1.2.0',
+    version = '1.2.1',
     keywords = ('pili'),
     description = 'SDK for pili',
     license = 'MIT License',