Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/dispatchwrapparr/dashdrm.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

log = logging.getLogger(__name__)

__version__ = "1.7.5"
__version__ = "1.7.6"

'''
DASHDRM plugin for Dispatchwrapparr & Streamlink
Expand Down
16 changes: 6 additions & 10 deletions plugins/dispatchwrapparr/dispatchwrapparr.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
from streamlink.stream.stream import Stream
from streamlink.options import Options

__version__ = "1.7.5"
__version__ = "1.7.6"

def parse_args():
# Initial wrapper arguments
Expand Down Expand Up @@ -116,7 +116,7 @@ class PlayRadio:
the case of available metadata, displays song information for use on TV's.
"""

def __init__(self, url, ffmpeg, ffmpeg_loglevel, headers, cookies, stream_type=None, resolution="854x480", fps=25, acodec="aac", vcodec="libx264", fontsize=22, update_interval=5):
def __init__(self, url, ffmpeg, ffmpeg_loglevel, headers, cookies, stream_type=None, resolution="854x480", fps=25, acodec="eac3", vcodec="libx264", fontsize=22, update_interval=5):
self.url = url
self.stream_type = stream_type
self.ffmpeg = ffmpeg
Expand Down Expand Up @@ -158,13 +158,8 @@ def open(self):
cmd.extend(["-cookies", cookie_str])

cmd.extend([
"-re", # read at native rate
"-readrate_initial_burst", "20", # initial burst of 20 seconds for fast startup
"-i", self.url,
"-f", "lavfi",
"-re", # read at native rate
"-readrate_initial_burst", "20", # initial burst of 20 seconds for fast startup
"-copyts", "-start_at_zero", # copy timestamps but start them at zero so it syncs with audio stream
"-i", f"color=size={self.resolution}:rate={self.fps}:color=black"
])

Expand All @@ -178,11 +173,13 @@ def open(self):
cmd.extend([
"-c:v", self.vcodec,
"-c:a", self.acodec,
"-af", "loudnorm=I=-18:LRA=11:TP=-2:linear=true",
"-af", "loudnorm=I=-16",
"-copyts", "-start_at_zero", # copy timestamps but start them at zero so it syncs with audio stream - move to output option
"-f", "mpegts",
"pipe:1",
])


self.process = subprocess.Popen(
cmd,
stdout=subprocess.PIPE,
Expand Down Expand Up @@ -629,7 +626,7 @@ def check_stream_variant(stream, session=None):
codecs = selected_playlist.stream_info.codecs or []
log.debug(f"Stream Codecs: {codecs}")
# Check for audio/video presence
has_video = any(c.startswith(("avc", "hev", "vp")) for c in codecs)
has_video = any(c.startswith(("avc", "hev", "hvc", "vp")) for c in codecs)
has_audio = any(c.startswith(("mp4a", "aac")) for c in codecs)

if has_audio and not has_video:
Expand Down Expand Up @@ -739,7 +736,6 @@ def check_stream_variant(stream, session=None):

return stream


def main():
# Set log as global var
global log
Expand Down
2 changes: 1 addition & 1 deletion plugins/dispatchwrapparr/hlsdrm.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

log = logging.getLogger(__name__)

__version__ = "1.7.5"
__version__ = "1.7.6"

'''
HLSDRM plugin for Dispatchwrapparr & Streamlink
Expand Down
2 changes: 1 addition & 1 deletion plugins/dispatchwrapparr/plugin.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Dispatchwrapparr",
"version": "1.7.5",
"version": "1.7.6",
"description": "An intelligent DRM/Clearkey capable stream profile for Dispatcharr",
"author": "jordandalley",
"maintainers": ["michaelmurfy"],
Expand Down
2 changes: 1 addition & 1 deletion plugins/dispatchwrapparr/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

class Plugin:
name = "Dispatchwrapparr"
version = "1.7.5"
version = "1.7.6"
description = "An intelligent DRM/Clearkey capable stream profile for Dispatcharr"
profile_name = "Dispatchwrapparr"
# Directory where dispatchwrapparr will be copied to
Expand Down
Loading