Skip to content

Commit 28e83b2

Browse files
committed
probe:.video/audio_streams_basic: fixed errors caused by the transition
1 parent d88757b commit 28e83b2

1 file changed

Lines changed: 7 additions & 11 deletions

File tree

src/ffmpegio/probe.py

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ def video_streams_basic(
481481

482482
results = query(
483483
url,
484-
f"v:{index}" if index else "v",
484+
"v" if index is None else f"v:{index}",
485485
_resolve_entries("basic video", entries, default_entries, default_dep_entries),
486486
keep_optional_fields,
487487
keep_str_values,
@@ -490,20 +490,16 @@ def video_streams_basic(
490490
)
491491

492492
def adjust(res):
493-
tb = Fraction(res.pop("time_base", "1"))
493+
tb = res.pop("time_base", 1)
494494
if "start_pts" in res:
495-
res["start_time"] = float(res.pop("start_pts", 0) * tb)
495+
res["start_time"] = res.pop("start_pts", 0) * tb
496496

497-
duration = (
498-
float(res.pop("duration_ts", 0) * tb)
499-
if not entries or "duration" in entries or "nb_frames" in entries
500-
else None
501-
)
497+
duration = res.pop("duration_ts", 0) * tb
502498
if not entries or "duration" in entries:
503499
res["duration"] = duration
504500

505-
fsa = res.pop("avg_frame_rate", "")
506-
fsr = res.pop("r_frame_rate", "0")
501+
fsa = res.pop("avg_frame_rate", None)
502+
fsr = res.pop("r_frame_rate", 0)
507503
frame_rate = Fraction(fsa if fsa and fsa != "0/0" else fsr)
508504
if not entries or "frame_rate" in entries:
509505
res["frame_rate"] = frame_rate
@@ -583,7 +579,7 @@ def audio_streams_basic(
583579

584580
results = query(
585581
url,
586-
f"a:{index}" if index else "a",
582+
"a" if index is None else f"a:{index}",
587583
_resolve_entries("basic audio", entries, default_entries, default_dep_entries),
588584
keep_optional_fields,
589585
keep_str_values,

0 commit comments

Comments
 (0)