fHDHR/fHDHR_NextPVR
1
0
Fork 0
mirror of https://github.com/fHDHR/fHDHR_NextPVR.git synced 2025-12-06 04:26:57 -05:00
Code Issues Releases Wiki Activity

Merge pull request #113 from deathbybandaid/dev

Browse Source 
Dev
This commit is contained in:
Deathbybandaid 2021-01-07 08:49:58 -05:00 committed by GitHub
commit 038bd03b42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 62 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
data/internal_config/streaming.json
View File

@ -1,14 +1,21 @@
{
"streaming":{
"bytes_per_read": {
"value": 1152000,
"config_file": true,
"config_web": true
},
"quality": {
"value": "none",
"config_file": true,
"config_web": true
}
},
"ffmpeg":{
"path":{
"value": "ffmpeg",
"config_file": true,
"config_web": true
},
"bytes_per_read":{
"value": 1152000,
"config_file": true,
"config_web": true
}
},
"vlc":{
@ -16,18 +23,6 @@
"value": "cvlc",
"config_file": true,
"config_web": true
},
"bytes_per_read":{
"value": 1152000,
"config_file": true,
"config_web": true
}
},
"direct_stream":{
"chunksize":{
"value": 1048576,
"config_file": true,
"config_web": true
}
}
}

4
fHDHR/device/channels/__init__.py
View File

@ -111,8 +111,8 @@ class Channels():
return [self.list[x].dict for x in list(self.list.keys())]
def get_channel_stream(self, channel_number):
return self.origin.get_channel_stream(self.get_channel_dict("number", channel_number))
def get_channel_stream(self, stream_args):
return self.origin.get_channel_stream(self.get_channel_dict("number", stream_args["channel"]), stream_args)
def get_channel_dict(self, keyfind, valfind):
return self.get_channel_obj(keyfind, valfind).dict

7
fHDHR/device/epg/__init__.py
View File

@ -278,16 +278,21 @@ class EPG():
programguide[cnum]["listing"][prog_index]["thumbnail"] = programguide[cnum]["thumbnail"]
prog_index += 1
# Get Totals
total_channels = len(list(programguide.keys()))
total_programs = 0
# Sort the channels
sorted_channel_list = channel_sort(list(programguide.keys()))
sorted_chan_guide = {}
for channel in sorted_channel_list:
total_programs += len(programguide[cnum]["listing"])
sorted_chan_guide[channel] = programguide[channel]
self.epgdict[method] = sorted_chan_guide
self.fhdhr.db.set_fhdhr_value("epg_dict", method, programguide)
self.fhdhr.db.set_fhdhr_value("update_time", method, time.time())
self.fhdhr.logger.info("Wrote " + epgtypename + " EPG cache.")
self.fhdhr.logger.info("Wrote %s EPG cache. %s Programs for %s Channels" % (epgtypename, total_programs, total_channels))
def run(self):
time.sleep(1800)

14
fHDHR/device/tuners/__init__.py
View File

@ -91,17 +91,21 @@ class Tuners():
def get_stream_info(self, stream_args):
stream_args["channelUri"] = self.channels.get_channel_stream(str(stream_args["channel"]))
if not stream_args["channelUri"]:
stream_info = self.channels.get_channel_stream(stream_args)
if not stream_info:
raise TunerError("806 - Tune Failed")
if stream_args["channelUri"].startswith("udp://"):
if isinstance(stream_info, str):
stream_info = {"url": stream_info}
stream_args["stream_info"] = stream_info
if stream_args["stream_info"]["url"].startswith("udp://"):
stream_args["true_content_type"] = "video/mpeg"
stream_args["content_type"] = "video/mpeg"
else:
channelUri_headers = self.fhdhr.web.session.head(stream_args["channelUri"]).headers
stream_args["true_content_type"] = channelUri_headers['Content-Type']
channel_stream_url_headers = self.fhdhr.web.session.head(stream_args["stream_info"]["url"]).headers
stream_args["true_content_type"] = channel_stream_url_headers['Content-Type']
if stream_args["true_content_type"].startswith(tuple(["application/", "text/"])):
stream_args["content_type"] = "video/mpeg"

12
fHDHR/device/tuners/stream/direct_m3u8_stream.py
View File

@ -14,7 +14,7 @@ class Direct_M3U8_Stream():
self.stream_args = stream_args
self.tuner = tuner
self.chunksize = int(self.fhdhr.config.dict["direct_stream"]['chunksize'])
self.bytes_per_read = int(self.fhdhr.config.dict["streaming"]["bytes_per_read"])
def get(self):
@ -23,14 +23,14 @@ class Direct_M3U8_Stream():
self.fhdhr.logger.info("Detected stream URL is m3u8: %s" % self.stream_args["true_content_type"])
channelUri = self.stream_args["channelUri"]
channel_stream_url = self.stream_args["stream_info"]["url"]
while True:
self.fhdhr.logger.info("Opening m3u8 for reading %s" % channelUri)
videoUrlM3u = m3u8.load(channelUri)
self.fhdhr.logger.info("Opening m3u8 for reading %s" % channel_stream_url)
videoUrlM3u = m3u8.load(channel_stream_url)
if len(videoUrlM3u.playlists):
self.fhdhr.logger.info("%s m3u8 varients found" % len(videoUrlM3u.playlists))
channelUri = videoUrlM3u.playlists[0].absolute_uri
channel_stream_url = videoUrlM3u.playlists[0].absolute_uri
else:
break
@ -42,7 +42,7 @@ class Direct_M3U8_Stream():
while self.tuner.tuner_lock.locked():
playlist = m3u8.load(channelUri)
playlist = m3u8.load(channel_stream_url)
segments = playlist.segments
if len(played_chunk_urls):

8
fHDHR/device/tuners/stream/direct_stream.py
View File

@ -11,16 +11,16 @@ class Direct_Stream():
self.stream_args = stream_args
self.tuner = tuner
self.chunksize = int(self.fhdhr.config.dict["direct_stream"]['chunksize'])
self.bytes_per_read = int(self.fhdhr.config.dict["streaming"]["bytes_per_read"])
def get(self):
if not self.stream_args["duration"] == 0:
self.stream_args["time_end"] = self.stream_args["duration"] + time.time()
self.fhdhr.logger.info("Direct Stream of %s URL: %s" % (self.stream_args["true_content_type"], self.stream_args["channelUri"]))
self.fhdhr.logger.info("Direct Stream of %s URL: %s" % (self.stream_args["true_content_type"], self.stream_args["stream_info"]["url"]))
req = self.fhdhr.web.session.get(self.stream_args["channelUri"], stream=True)
req = self.fhdhr.web.session.get(self.stream_args["stream_info"]["url"], stream=True)
def generate():
@ -30,7 +30,7 @@ class Direct_Stream():
while self.tuner.tuner_lock.locked():
for chunk in req.iter_content(chunk_size=self.chunksize):
for chunk in req.iter_content(chunk_size=self.bytes_per_read):
if (not self.stream_args["duration"] == 0 and
not time.time() < self.stream_args["time_end"]):

4
fHDHR/device/tuners/stream/ffmpeg_stream.py
View File

@ -11,7 +11,7 @@ class FFMPEG_Stream():
self.stream_args = stream_args
self.tuner = tuner
self.bytes_per_read = int(self.fhdhr.config.dict["ffmpeg"]["bytes_per_read"])
self.bytes_per_read = int(self.fhdhr.config.dict["streaming"]["bytes_per_read"])
self.ffmpeg_command = self.ffmpeg_command_assemble(stream_args)
def get(self):
@ -48,7 +48,7 @@ class FFMPEG_Stream():
def ffmpeg_command_assemble(self, stream_args):
ffmpeg_command = [
self.fhdhr.config.dict["ffmpeg"]["path"],
"-i", stream_args["channelUri"],
"-i", stream_args["stream_info"]["url"],
]
ffmpeg_command.extend(self.ffmpeg_duration(stream_args))
ffmpeg_command.extend(self.transcode_profiles(stream_args))

4
fHDHR/device/tuners/stream/vlc_stream.py
View File

@ -11,7 +11,7 @@ class VLC_Stream():
self.stream_args = stream_args
self.tuner = tuner
self.bytes_per_read = int(self.fhdhr.config.dict["vlc"]["bytes_per_read"])
self.bytes_per_read = int(self.fhdhr.config.dict["streaming"]["bytes_per_read"])
self.vlc_command = self.vlc_command_assemble(stream_args)
def get(self):
@ -49,7 +49,7 @@ class VLC_Stream():
def vlc_command_assemble(self, stream_args):
vlc_command = [
self.fhdhr.config.dict["vlc"]["path"],
"-I", "dummy", stream_args["channelUri"],
"-I", "dummy", stream_args["stream_info"]["url"],
]
vlc_command.extend(self.vlc_duration(stream_args))
vlc_command.extend(self.vlc_loglevel())

2
fHDHR/device/tuners/tuner.py
View File

@ -88,7 +88,7 @@ class Tuner():
"method": stream_args["method"],
"accessed": [stream_args["accessed"]],
"channel": stream_args["channel"],
"proxied_url": stream_args["channelUri"],
"proxied_url": stream_args["stream_info"]["url"],
"time_start": datetime.datetime.utcnow(),
"downloaded": 0
}

4
fHDHR/originwrapper/__init__.py
View File

@ -36,8 +36,8 @@ class OriginServiceWrapper():
def get_channels(self):
return self.channels.get_channels()
def get_channel_stream(self, chandict):
return self.channels.get_channel_stream(chandict)
def get_channel_stream(self, chandict, stream_args):
return self.channels.get_channel_stream(chandict, stream_args)
def update_epg(self, channels):
return self.epg.update_epg(channels)

2
fHDHR/originwrapper/origin_channels_standin.py
View File

@ -7,5 +7,5 @@ class OriginChannels_StandIN():
def get_channels(self):
return []
def get_channel_stream(self, chandict):
def get_channel_stream(self, chandict, stream_args):
return None

16
fHDHR_web/api/tuners.py
View File

@ -14,6 +14,10 @@ class Tuners():
def __init__(self, fhdhr):
self.fhdhr = fhdhr
self.quality = self.fhdhr.config.dict["streaming"]["quality"]
if self.quality:
self.quality = str(self.quality).lower()
def __call__(self, *args):
return self.get(*args)
@ -50,8 +54,11 @@ class Tuners():
duration = request.args.get('duration', default=0, type=int)
transcode = request.args.get('transcode', default=None, type=str)
valid_transcode_types = [None, "heavy", "mobile", "internet720", "internet480", "internet360", "internet240"]
transcode = request.args.get('transcode', default=self.quality, type=str)
valid_transcode_types = [
None, "high", "medium", "low"
"heavy", "mobile", "internet720", "internet480", "internet360", "internet240"
]
if transcode not in valid_transcode_types:
response = Response("Service Unavailable", status=503)
response.headers["X-fHDHR-Error"] = "802 - Unknown Transcode Profile"
@ -98,10 +105,7 @@ class Tuners():
tuner.set_status(stream_args)
session["tuner_used"] = tunernum
if stream_args["method"] == "direct":
return Response(tuner.get_stream(stream_args, tuner), content_type=stream_args["content_type"], direct_passthrough=True)
elif stream_args["method"] in ["ffmpeg", "vlc"]:
return Response(stream_with_context(tuner.get_stream(stream_args, tuner)), mimetype=stream_args["content_type"])
return Response(stream_with_context(tuner.get_stream(stream_args, tuner)), mimetype=stream_args["content_type"])
elif method == "close":

7
origin/origin_channels.py
View File

@ -50,7 +50,7 @@ class OriginChannels():
channel_list.append(clean_station_item)
return channel_list
def get_channel_stream(self, chandict):
def get_channel_stream(self, chandict, stream_args):
streamurl = ('%s%s:%s/live?channel_id=%s&client=%s' %
("https://" if self.fhdhr.config.dict["origin"]["ssl"] else "http://",
self.fhdhr.config.dict["origin"]["address"],
@ -58,4 +58,7 @@ class OriginChannels():
str(chandict["origin_id"]),
"fhdhr_" + str(chandict["origin_number"]),
))
return streamurl
stream_info = {"url": streamurl}
return stream_info