mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-12-06 13:34:13 +03:00
only use ffprobe for duration to avoid blocking
fixes https://github.com/blakeblackshear/frigate/discussions/20737#discussioncomment-14999869
This commit is contained in:
parent
fd06c272d2
commit
8b15078005
@ -652,53 +652,36 @@ def auto_detect_hwaccel() -> str:
|
|||||||
async def get_video_properties(
|
async def get_video_properties(
|
||||||
ffmpeg, url: str, get_duration: bool = False
|
ffmpeg, url: str, get_duration: bool = False
|
||||||
) -> dict[str, Any]:
|
) -> dict[str, Any]:
|
||||||
async def probe_with_ffprobe(
|
async def probe_duration_with_ffprobe(url: str) -> float:
|
||||||
url: str,
|
"""Only extract duration from ffprobe if cv2 fails"""
|
||||||
) -> tuple[bool, int, int, Optional[str], float]:
|
|
||||||
"""Fallback using ffprobe: returns (valid, width, height, codec, duration)."""
|
|
||||||
cmd = [
|
|
||||||
ffmpeg.ffprobe_path,
|
|
||||||
"-v",
|
|
||||||
"quiet",
|
|
||||||
"-print_format",
|
|
||||||
"json",
|
|
||||||
"-show_format",
|
|
||||||
"-show_streams",
|
|
||||||
url,
|
|
||||||
]
|
|
||||||
try:
|
try:
|
||||||
proc = await asyncio.create_subprocess_exec(
|
proc = await asyncio.create_subprocess_exec(
|
||||||
*cmd, stdout=asyncio.subprocess.PIPE, stderr=asyncio.subprocess.PIPE
|
ffmpeg.ffprobe_path,
|
||||||
|
"-v",
|
||||||
|
"error",
|
||||||
|
"-show_entries",
|
||||||
|
"format=duration",
|
||||||
|
"-of",
|
||||||
|
"default=noprint_wrappers=1:nokey=1",
|
||||||
|
url,
|
||||||
|
stdout=asyncio.subprocess.PIPE,
|
||||||
|
stderr=asyncio.subprocess.PIPE,
|
||||||
)
|
)
|
||||||
stdout, _ = await proc.communicate()
|
out, _ = await proc.communicate()
|
||||||
if proc.returncode != 0:
|
if proc.returncode != 0:
|
||||||
return False, 0, 0, None, -1
|
return -1.0
|
||||||
|
|
||||||
data = json.loads(stdout.decode())
|
result = out.decode().strip()
|
||||||
video_streams = [
|
return float(result) if result else -1.0
|
||||||
s for s in data.get("streams", []) if s.get("codec_type") == "video"
|
except Exception:
|
||||||
]
|
return -1.0
|
||||||
if not video_streams:
|
|
||||||
return False, 0, 0, None, -1
|
|
||||||
|
|
||||||
v = video_streams[0]
|
|
||||||
width = int(v.get("width", 0))
|
|
||||||
height = int(v.get("height", 0))
|
|
||||||
codec = v.get("codec_name")
|
|
||||||
|
|
||||||
duration_str = data.get("format", {}).get("duration")
|
|
||||||
duration = float(duration_str) if duration_str else -1.0
|
|
||||||
|
|
||||||
return True, width, height, codec, duration
|
|
||||||
except (json.JSONDecodeError, ValueError, KeyError, asyncio.SubprocessError):
|
|
||||||
return False, 0, 0, None, -1
|
|
||||||
|
|
||||||
def probe_with_cv2(url: str) -> tuple[bool, int, int, Optional[str], float]:
|
def probe_with_cv2(url: str) -> tuple[bool, int, int, Optional[str], float]:
|
||||||
"""Primary attempt using cv2: returns (valid, width, height, fourcc, duration)."""
|
"""Get width, height, codec, and optionally duration via frames/FPS."""
|
||||||
cap = cv2.VideoCapture(url)
|
cap = cv2.VideoCapture(url)
|
||||||
if not cap.isOpened():
|
if not cap.isOpened():
|
||||||
cap.release()
|
cap.release()
|
||||||
return False, 0, 0, None, -1
|
return False, 0, 0, None, -1.0
|
||||||
|
|
||||||
width = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
|
width = int(cap.get(cv2.CAP_PROP_FRAME_WIDTH))
|
||||||
height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
|
height = int(cap.get(cv2.CAP_PROP_FRAME_HEIGHT))
|
||||||
@ -722,13 +705,14 @@ async def get_video_properties(
|
|||||||
# try cv2 first
|
# try cv2 first
|
||||||
has_video, width, height, fourcc, duration = probe_with_cv2(url)
|
has_video, width, height, fourcc, duration = probe_with_cv2(url)
|
||||||
|
|
||||||
# fallback to ffprobe if needed
|
# If we still need duration, use ffprobe
|
||||||
if not has_video or (get_duration and duration < 0):
|
if get_duration and duration < 0:
|
||||||
has_video, width, height, fourcc, duration = await probe_with_ffprobe(url)
|
duration = await probe_duration_with_ffprobe(url)
|
||||||
|
|
||||||
result: dict[str, Any] = {"has_valid_video": has_video}
|
result: dict[str, Any] = {"has_valid_video": has_video}
|
||||||
if has_video:
|
if has_video:
|
||||||
result.update({"width": width, "height": height})
|
result["width"] = width
|
||||||
|
result["height"] = height
|
||||||
if fourcc:
|
if fourcc:
|
||||||
result["fourcc"] = fourcc
|
result["fourcc"] = fourcc
|
||||||
if get_duration:
|
if get_duration:
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user