Add support for specifying output file format and audio sync option #2774
Conversation
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
back-to
requested changes
Mar 8, 2020
beardypig
reviewed
Apr 7, 2020
beardypig
reviewed
Apr 7, 2020
beardypig
reviewed
Apr 7, 2020
beardypig
reviewed
Apr 7, 2020
beardypig
reviewed
Apr 7, 2020
beardypig
reviewed
Apr 7, 2020
Member
|
Thanks for the contribution @lcapriotti, this looks like a good idea. I recommend changing the option to |
Co-Authored-By: beardypig <beardypig@protonmail.com>
Co-Authored-By: beardypig <beardypig@protonmail.com>
Co-Authored-By: beardypig <beardypig@protonmail.com>
Co-Authored-By: beardypig <beardypig@protonmail.com>
Co-Authored-By: beardypig <beardypig@protonmail.com>
Contributor
Author
|
beardypig
requested changes
Apr 7, 2020
Co-Authored-By: beardypig <beardypig@protonmail.com>
Codecov Report
@@ Coverage Diff @@
## master #2774 +/- ##
==========================================
- Coverage 52.87% 52.69% -0.18%
==========================================
Files 246 251 +5
Lines 15428 15748 +320
==========================================
+ Hits 8157 8298 +141
- Misses 7271 7450 +179 |
Co-Authored-By: beardypig <beardypig@protonmail.com>
back-to
approved these changes
Apr 10, 2020
back-to
requested changes
Apr 13, 2020
| metadata = options.pop("metadata", {}) | ||
| maps = options.pop("maps", []) | ||
| copyts = options.pop("copyts", False) | ||
| start_at_zero = session.options.get("ffmpeg-start-at-zero", True) |
Collaborator
There was a problem hiding this comment.
TypeError: get() takes 2 positional arguments but 3 were given
there is no default
Member
There was a problem hiding this comment.
Perhaps we should extend Options to support a default, easy to do without making any breaking changes.
diff --git a/src/streamlink/options.py b/src/streamlink/options.py
index 5a208c16..0f442d48 100644
--- a/src/streamlink/options.py
+++ b/src/streamlink/options.py
@@ -33,10 +33,11 @@ class Options(object):
def set(self, key, value):
self.options[_normalise_option_name(key)] = value
- def get(self, key):
+ def get(self, key, default=None):
key = _normalise_option_name(key)
if key in self.options:
return self.options[key]
+ return default
def update(self, options):
for key, value in options.items():
Collaborator
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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 change is introducing two new optional cmdline options:
--ffmpeg-fout: The output file format when muxing with ffmpeg
--ffmpeg-start-at-zero: When used with ffmpeg and copyts, shift input timestamps so they start at zero
Both options defaults are keeping the predefined values, hence backwards compatibility is enforced.