Skip to content

Add FilteredHLSStream #3187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 21, 2020
Merged

Add FilteredHLSStream #3187

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b22aca
stream.hls_filtered: implement FilteredHLSStream
bastimeyer Sep 19, 2020
61a95a2
plugins.twitch: use FilteredHLS{Writer,Reader}
bastimeyer Sep 19, 2020
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
Prev Previous commit
plugins.twitch: use FilteredHLS{Writer,Reader} 
and filter out advertisement sequences
  • Loading branch information
@bastimeyer
bastimeyer committed Sep 21, 2020
commit 61a95a2ab09f7dc631cd02e981ad03d50ce07287
12 changes: 6 additions & 6 deletions src/streamlink/plugins/twitch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
from streamlink.stream import (
HTTPStream, HLSStream, FLVPlaylist, extract_flv_header_tags
)
from streamlink.stream.hls import HLSStreamReader, HLSStreamWriter, HLSStreamWorker
from streamlink.stream.hls import HLSStreamWorker
from streamlink.stream.hls_filtered import FilteredHLSStreamWriter, FilteredHLSStreamReader
from streamlink.stream.hls_playlist import M3U8Parser, load as load_hls_playlist
from streamlink.utils.times import hours_minutes_seconds

Expand Down Expand Up @@ -199,13 +200,12 @@ def process_sequences(self, playlist, sequences):
return super(TwitchHLSStreamWorker, self).process_sequences(playlist, sequences)


class TwitchHLSStreamWriter(HLSStreamWriter):
def write(self, sequence, *args, **kwargs):
if not (self.stream.disable_ads and sequence.segment.ad):
return super(TwitchHLSStreamWriter, self).write(sequence, *args, **kwargs)
class TwitchHLSStreamWriter(FilteredHLSStreamWriter):
def should_filter_sequence(self, sequence):
return self.stream.disable_ads and sequence.segment.ad


class TwitchHLSStreamReader(HLSStreamReader):
class TwitchHLSStreamReader(FilteredHLSStreamReader):
__worker__ = TwitchHLSStreamWorker
__writer__ = TwitchHLSStreamWriter

Expand Down