Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-1665: Scheduled stream rebroadcasting and recording

Browse source 
-info about current pre-buffering webstream should be persistent...
This commit is contained in:
Martin Konecny 2012-08-17 17:10:42 -04:00
parent 284b028521
commit b3ef67e617
2 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python_apps/pypo/pypofetch.py
View file

@ -436,9 +436,6 @@ class PypoFetch(Thread):
media_item['dst'] = dst media_item['dst'] = dst
media_item['file_ready'] = False media_item['file_ready'] = False
media_filtered[key] = media_item media_filtered[key] = media_item
elif media_item['type'] == 'stream':
#flag to indicate whether the stream started prebuffering
media_item['prebuffer_started'] = False
self.media_prepare_queue.put(copy.copy(media_filtered)) self.media_prepare_queue.put(copy.copy(media_filtered))
except Exception, e: self.logger.error("%s", e) except Exception, e: self.logger.error("%s", e)

6
python_apps/pypo/pypopush.py
View file

@ -50,6 +50,7 @@ class PypoPush(Thread):
self.pushed_objects = {} self.pushed_objects = {}
self.logger = logging.getLogger('push') self.logger = logging.getLogger('push')
self.current_stream_info = None self.current_stream_info = None
self.current_prebuffering_stream_id = None
def main(self): def main(self):
loops = 0 loops = 0
@ -389,7 +390,7 @@ class PypoPush(Thread):
elif media_item['type'] == 'stream_buffer_start': elif media_item['type'] == 'stream_buffer_start':
self.start_web_stream_buffer(media_item) self.start_web_stream_buffer(media_item)
elif media_item['type'] == "stream": elif media_item['type'] == "stream":
if not media_item['prebuffer_started']: if media_item['row_id'] != self.current_prebuffering_stream_id
#this is called if the stream wasn't scheduled sufficiently ahead of time #this is called if the stream wasn't scheduled sufficiently ahead of time
#so that the prebuffering stage could take effect. Let's do the prebuffering now. #so that the prebuffering stage could take effect. Let's do the prebuffering now.
self.start_web_stream_buffer(media_item) self.start_web_stream_buffer(media_item)
@ -416,7 +417,7 @@ class PypoPush(Thread):
tn.write("exit\n") tn.write("exit\n")
self.logger.debug(tn.read_all()) self.logger.debug(tn.read_all())
media_item['prebuffer_started'] = True self.current_prebuffering_stream_id = media_item['row_id']
except Exception, e: except Exception, e:
self.logger.error(str(e)) self.logger.error(str(e))
finally: finally:
@ -441,6 +442,7 @@ class PypoPush(Thread):
tn.write("exit\n") tn.write("exit\n")
self.logger.debug(tn.read_all()) self.logger.debug(tn.read_all())
self.current_prebuffering_stream_id = None
self.current_stream_info = media_item self.current_stream_info = media_item
except Exception, e: except Exception, e:
self.logger.error(str(e)) self.logger.error(str(e))