mirror of
https://github.com/home-assistant/core.git
synced 2025-07-25 22:27:07 +00:00
Refactor av.open calls to support type annotations (#129688)
This commit is contained in:
Marc Mueller
GitHub
parent
bf4922a7ef
commit
f7103da818
@ -105,17 +105,16 @@ class RecorderOutput(StreamOutput):
|
|||||||
|
|
||||||
# Create output on first segment
|
# Create output on first segment
|
||||||
if not output:
|
if not output:
|
||||||
|
container_options: dict[str, str] = {
|
||||||
|
"video_track_timescale": str(int(1 / source_v.time_base)),
|
||||||
|
"movflags": "frag_keyframe+empty_moov",
|
||||||
|
"min_frag_duration": str(self.stream_settings.min_segment_duration),
|
||||||
|
}
|
||||||
output = av.open(
|
output = av.open(
|
||||||
self.video_path + ".tmp",
|
self.video_path + ".tmp",
|
||||||
"w",
|
"w",
|
||||||
format=RECORDER_CONTAINER_FORMAT,
|
format=RECORDER_CONTAINER_FORMAT,
|
||||||
container_options={
|
container_options=container_options,
|
||||||
"video_track_timescale": str(int(1 / source_v.time_base)),
|
|
||||||
"movflags": "frag_keyframe+empty_moov",
|
|
||||||
"min_frag_duration": str(
|
|
||||||
self.stream_settings.min_segment_duration
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
|
|
||||||
# Add output streams if necessary
|
# Add output streams if necessary
|
||||||
|
|||||||
@ -164,63 +164,64 @@ class StreamMuxer:
|
|||||||
av.audio.stream.AudioStream | None,
|
av.audio.stream.AudioStream | None,
|
||||||
]:
|
]:
|
||||||
"""Make a new av OutputContainer and add output streams."""
|
"""Make a new av OutputContainer and add output streams."""
|
||||||
|
container_options: dict[str, str] = {
|
||||||
|
# Removed skip_sidx - see:
|
||||||
|
# https://github.com/home-assistant/core/pull/39970
|
||||||
|
# "cmaf" flag replaces several of the movflags used,
|
||||||
|
# but too recent to use for now
|
||||||
|
"movflags": "frag_custom+empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
|
||||||
|
# Sometimes the first segment begins with negative timestamps,
|
||||||
|
# and this setting just
|
||||||
|
# adjusts the timestamps in the output from that segment to start
|
||||||
|
# from 0. Helps from having to make some adjustments
|
||||||
|
# in test_durations
|
||||||
|
"avoid_negative_ts": "make_non_negative",
|
||||||
|
"fragment_index": str(sequence + 1),
|
||||||
|
"video_track_timescale": str(int(1 / input_vstream.time_base)),
|
||||||
|
# Only do extra fragmenting if we are using ll_hls
|
||||||
|
# Let ffmpeg do the work using frag_duration
|
||||||
|
# Fragment durations may exceed the 15% allowed variance but it seems ok
|
||||||
|
**(
|
||||||
|
{
|
||||||
|
"movflags": "empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
|
||||||
|
# Create a fragment every TARGET_PART_DURATION. The data from
|
||||||
|
# each fragment is stored in a "Part" that can be combined with
|
||||||
|
# the data from all the other "Part"s, plus an init section,
|
||||||
|
# to reconstitute the data in a "Segment".
|
||||||
|
#
|
||||||
|
# The LL-HLS spec allows for a fragment's duration to be within
|
||||||
|
# the range [0.85x,1.0x] of the part target duration. We use the
|
||||||
|
# frag_duration option to tell ffmpeg to try to cut the
|
||||||
|
# fragments when they reach frag_duration. However,
|
||||||
|
# the resulting fragments can have variability in their
|
||||||
|
# durations and can end up being too short or too long. With a
|
||||||
|
# video track with no audio, the discrete nature of frames means
|
||||||
|
# that the frame at the end of a fragment will sometimes extend
|
||||||
|
# slightly beyond the desired frag_duration.
|
||||||
|
#
|
||||||
|
# If there are two tracks, as in the case of a video feed with
|
||||||
|
# audio, there is an added wrinkle as the fragment cut seems to
|
||||||
|
# be done on the first track that crosses the desired threshold,
|
||||||
|
# and cutting on the audio track may also result in a shorter
|
||||||
|
# video fragment than desired.
|
||||||
|
#
|
||||||
|
# Given this, our approach is to give ffmpeg a frag_duration
|
||||||
|
# somewhere in the middle of the range, hoping that the parts
|
||||||
|
# stay pretty well bounded, and we adjust the part durations
|
||||||
|
# a bit in the hls metadata so that everything "looks" ok.
|
||||||
|
"frag_duration": str(
|
||||||
|
int(self._stream_settings.part_target_duration * 9e5)
|
||||||
|
),
|
||||||
|
}
|
||||||
|
if self._stream_settings.ll_hls
|
||||||
|
else {}
|
||||||
|
),
|
||||||
|
}
|
||||||
container = av.open(
|
container = av.open(
|
||||||
memory_file,
|
memory_file,
|
||||||
mode="w",
|
mode="w",
|
||||||
format=SEGMENT_CONTAINER_FORMAT,
|
format=SEGMENT_CONTAINER_FORMAT,
|
||||||
container_options={
|
container_options=container_options,
|
||||||
# Removed skip_sidx - see:
|
|
||||||
# https://github.com/home-assistant/core/pull/39970
|
|
||||||
# "cmaf" flag replaces several of the movflags used,
|
|
||||||
# but too recent to use for now
|
|
||||||
"movflags": "frag_custom+empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
|
|
||||||
# Sometimes the first segment begins with negative timestamps,
|
|
||||||
# and this setting just
|
|
||||||
# adjusts the timestamps in the output from that segment to start
|
|
||||||
# from 0. Helps from having to make some adjustments
|
|
||||||
# in test_durations
|
|
||||||
"avoid_negative_ts": "make_non_negative",
|
|
||||||
"fragment_index": str(sequence + 1),
|
|
||||||
"video_track_timescale": str(int(1 / input_vstream.time_base)),
|
|
||||||
# Only do extra fragmenting if we are using ll_hls
|
|
||||||
# Let ffmpeg do the work using frag_duration
|
|
||||||
# Fragment durations may exceed the 15% allowed variance but it seems ok
|
|
||||||
**(
|
|
||||||
{
|
|
||||||
"movflags": "empty_moov+default_base_moof+frag_discont+negative_cts_offsets+skip_trailer+delay_moov",
|
|
||||||
# Create a fragment every TARGET_PART_DURATION. The data from
|
|
||||||
# each fragment is stored in a "Part" that can be combined with
|
|
||||||
# the data from all the other "Part"s, plus an init section,
|
|
||||||
# to reconstitute the data in a "Segment".
|
|
||||||
#
|
|
||||||
# The LL-HLS spec allows for a fragment's duration to be within
|
|
||||||
# the range [0.85x,1.0x] of the part target duration. We use the
|
|
||||||
# frag_duration option to tell ffmpeg to try to cut the
|
|
||||||
# fragments when they reach frag_duration. However,
|
|
||||||
# the resulting fragments can have variability in their
|
|
||||||
# durations and can end up being too short or too long. With a
|
|
||||||
# video track with no audio, the discrete nature of frames means
|
|
||||||
# that the frame at the end of a fragment will sometimes extend
|
|
||||||
# slightly beyond the desired frag_duration.
|
|
||||||
#
|
|
||||||
# If there are two tracks, as in the case of a video feed with
|
|
||||||
# audio, there is an added wrinkle as the fragment cut seems to
|
|
||||||
# be done on the first track that crosses the desired threshold,
|
|
||||||
# and cutting on the audio track may also result in a shorter
|
|
||||||
# video fragment than desired.
|
|
||||||
#
|
|
||||||
# Given this, our approach is to give ffmpeg a frag_duration
|
|
||||||
# somewhere in the middle of the range, hoping that the parts
|
|
||||||
# stay pretty well bounded, and we adjust the part durations
|
|
||||||
# a bit in the hls metadata so that everything "looks" ok.
|
|
||||||
"frag_duration": str(
|
|
||||||
int(self._stream_settings.part_target_duration * 9e5)
|
|
||||||
),
|
|
||||||
}
|
|
||||||
if self._stream_settings.ll_hls
|
|
||||||
else {}
|
|
||||||
),
|
|
||||||
},
|
|
||||||
)
|
)
|
||||||
output_vstream = container.add_stream(template=input_vstream)
|
output_vstream = container.add_stream(template=input_vstream)
|
||||||
# Check if audio is requested
|
# Check if audio is requested
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user