stream.hls: simplify discard logic in writer#4526
Merged
back-to merged 1 commit intoMay 13, 2022
Merged
Conversation
Billy2011
added a commit
to Billy2011/streamlink-27
that referenced
this pull request
May 14, 2022
based on streamlink streamlink#4526
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The write-discard logic added in #4229 can be simplified by just calling
urllib3.HTTPResponse.drain_conn()instead of consuming the stream iterator fromrequests.Response.iter_content()in an empty for-loop. urllib3 calls this method itself when performing HTTP redirections.This PR also makes the signature of
HLSStreamWriter.writeconsistent withSegmentedStreamWriter.write.Here's a quick verification that it doesn't create any new TCP connections and properly releases the connection to the connection pool when HLS segments get filtered out, eg. by making
TwitchHLSStreamWriter.should_filter_sequencealways returnTrue:With
drain_conn()or the old implementationWithout
drain_conn()and without the old implementation