This commit is contained in:
parent
4df27a931a
commit
cc31f63247
@ -901,11 +901,11 @@ class UnifiCamBase(metaclass=ABCMeta):
|
|||||||
|
|
||||||
def get_base_ffmpeg_args(self, stream_index: str = "") -> str:
|
def get_base_ffmpeg_args(self, stream_index: str = "") -> str:
|
||||||
base_args = [
|
base_args = [
|
||||||
# "-avoid_negative_ts",
|
"-avoid_negative_ts",
|
||||||
# "make_zero",
|
"make_zero",
|
||||||
"-fflags",
|
"-fflags",
|
||||||
"discardcorrupt",
|
"+genpts+discardcorrupt",
|
||||||
# "-use_wallclock_as_timestamps 1",
|
"-use_wallclock_as_timestamps 1",
|
||||||
]
|
]
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@ -927,12 +927,23 @@ class UnifiCamBase(metaclass=ABCMeta):
|
|||||||
|
|
||||||
if not has_spawned or is_dead:
|
if not has_spawned or is_dead:
|
||||||
source = await self.get_stream_source(stream_index)
|
source = await self.get_stream_source(stream_index)
|
||||||
|
# cmd = (
|
||||||
|
# "ffmpeg -nostdin -loglevel error -y"
|
||||||
|
# f" {self.get_base_ffmpeg_args(stream_index)} -rtsp_transport"
|
||||||
|
# f' {self.args.rtsp_transport} -i "{source}"'
|
||||||
|
# f" {self.get_extra_ffmpeg_args(stream_index)} -metadata"
|
||||||
|
# f" streamName={stream_name} -f flv - | {sys.executable} -m"
|
||||||
|
# " unifi.clock_sync"
|
||||||
|
# f" {'--write-timestamps' if self._needs_flv_timestamps else ''} | nc"
|
||||||
|
# f" {destination[0]} {destination[1]}"
|
||||||
|
# )
|
||||||
cmd = (
|
cmd = (
|
||||||
"ffmpeg -nostdin -loglevel debug -y"
|
"ffmpeg -nostdin -loglevel debug -y"
|
||||||
# f" {self.get_base_ffmpeg_args(stream_index)}"
|
# f" {self.get_base_ffmpeg_args(stream_index)}"
|
||||||
f' -i "{source}"'
|
f' -i "{source}"'
|
||||||
f" {self.get_extra_ffmpeg_args(stream_index)} -f flv -"
|
f" {self.get_extra_ffmpeg_args(stream_index)} -metadata streamName={stream_name} -f flv -"
|
||||||
f" | nc {destination[0]} {destination[1]}"
|
f" | {sys.executable} -m unifi.clock_sync"
|
||||||
|
f" {'--write-timestamps' if self._needs_flv_timestamps else ''} | nc"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user