From 80c8a81bb10b4306e743a9a7b960d7ba02e4ac4f Mon Sep 17 00:00:00 2001 From: deathbybandaid Date: Thu, 21 Jan 2021 09:45:03 -0500 Subject: [PATCH] test --- fHDHR/device/tuners/stream/direct_m3u8_stream.py | 3 +++ fHDHR/device/tuners/stream/direct_stream.py | 3 +++ fHDHR_web/api/tuners.py | 11 ++++------- fHDHR_web/hdhr/auto.py | 6 +++--- fHDHR_web/hdhr/tuner.py | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/fHDHR/device/tuners/stream/direct_m3u8_stream.py b/fHDHR/device/tuners/stream/direct_m3u8_stream.py index 4e6bd32..c438061 100644 --- a/fHDHR/device/tuners/stream/direct_m3u8_stream.py +++ b/fHDHR/device/tuners/stream/direct_m3u8_stream.py @@ -23,6 +23,9 @@ class Direct_M3U8_Stream(): self.fhdhr.logger.info("Detected stream of m3u8 URL: %s" % self.stream_args["stream_info"]["url"]) + if self.stream_args["transcode_quality"]: + self.fhdhr.logger.info("Client requested a %s transcode for stream. Direct Method cannot transcode." % self.stream_args["transcode_quality"]) + def generate(): try: diff --git a/fHDHR/device/tuners/stream/direct_stream.py b/fHDHR/device/tuners/stream/direct_stream.py index fdc78e9..7547aaf 100644 --- a/fHDHR/device/tuners/stream/direct_stream.py +++ b/fHDHR/device/tuners/stream/direct_stream.py @@ -20,6 +20,9 @@ class Direct_Stream(): self.fhdhr.logger.info("Direct Stream of %s URL: %s" % (self.stream_args["true_content_type"], self.stream_args["stream_info"]["url"])) + if self.stream_args["transcode_quality"]: + self.fhdhr.logger.info("Client requested a %s transcode for stream. Direct Method cannot transcode." % self.stream_args["transcode_quality"]) + if self.stream_args["stream_info"]["headers"]: req = self.fhdhr.web.session.get(self.stream_args["stream_info"]["url"], stream=True, headers=self.stream_args["stream_info"]["headers"]) else: diff --git a/fHDHR_web/api/tuners.py b/fHDHR_web/api/tuners.py index 1dfdcb5..f5b3084 100644 --- a/fHDHR_web/api/tuners.py +++ b/fHDHR_web/api/tuners.py @@ -16,10 +16,6 @@ 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) @@ -56,12 +52,12 @@ class Tuners(): duration = request.args.get('duration', default=0, type=int) - transcode = request.args.get('transcode', default=self.quality, type=str) + transcode_quality = request.args.get('transcode', default=None, type=str) valid_transcode_types = [ None, "high", "medium", "low" "heavy", "mobile", "internet720", "internet480", "internet360", "internet240" ] - if transcode not in valid_transcode_types: + if transcode_quality not in valid_transcode_types: response = Response("Service Unavailable", status=503) response.headers["X-fHDHR-Error"] = "802 - Unknown Transcode Profile" self.fhdhr.logger.error(response.headers["X-fHDHR-Error"]) @@ -71,7 +67,8 @@ class Tuners(): "channel": channel_number, "method": method, "duration": duration, - "transcode": transcode, + "origin_quality": self.fhdhr.config.dict["streaming"]["origin_quality"], + "transcode_quality": transcode_quality, "accessed": accessed_url, "client": client_address, "client_id": session["session_id"] diff --git a/fHDHR_web/hdhr/auto.py b/fHDHR_web/hdhr/auto.py index 26062aa..196d31e 100644 --- a/fHDHR_web/hdhr/auto.py +++ b/fHDHR_web/hdhr/auto.py @@ -36,9 +36,9 @@ class Auto(): if duration: redirect_url += "&duration=%s" % str(duration) - transcode = request.args.get('transcode', default=None, type=str) - if transcode: - redirect_url += "&transcode=%s" % str(transcode) + transcode_quality = request.args.get('transcode', default=None, type=str) + if transcode_quality: + redirect_url += "&transcode=%s" % str(transcode_quality) redirect_url += "&accessed=%s" % urllib.parse.quote(request.url) diff --git a/fHDHR_web/hdhr/tuner.py b/fHDHR_web/hdhr/tuner.py index a4812ff..6a6245a 100644 --- a/fHDHR_web/hdhr/tuner.py +++ b/fHDHR_web/hdhr/tuner.py @@ -38,9 +38,9 @@ class Tuner(): if duration: redirect_url += "&duration=%s" % str(duration) - transcode = request.args.get('transcode', default=None, type=str) - if transcode: - redirect_url += "&transcode=%s" % str(transcode) + transcode_quality = request.args.get('transcode', default=None, type=str) + if transcode_quality: + redirect_url += "&transcode=%s" % str(transcode_quality) redirect_url += "&accessed=%s" % urllib.parse.quote(request.url)