fix #103, codec_name is not required since data stream won't have cod… (#104)

lucemia · web-flow · commit 57c3c091d6ed · 2024-05-23T10:09:21.000+08:00
* fix #103, codec_name is not required since data stream won't have codec name * update snapshot * update snapshot
diff --git a/src/ffmpeg_media_type/info.py b/src/ffmpeg_media_type/info.py
@@ -63,6 +63,7 @@ def detect(uri: str | Path) -> MediaInfo:
 
     # NOTE: handle ffmpeg's image compatibility
     if format_name == "image2":
+        assert info.streams[0].codec_name
         format_name = info.streams[0].codec_name
 
     # NOTE: detect file extension
diff --git a/src/ffmpeg_media_type/schema.py b/src/ffmpeg_media_type/schema.py
@@ -151,9 +151,9 @@ class FFProbeStream:
     """
     The stream codec type.
     """
-    codec_name: str
+    codec_name: str | None = None
     """
-    The stream codec name.
+    The stream codec name. If the stream is a data stream, this field will be set to None
     """
     codec_long_name: str | None = None
     """
diff --git a/src/ffmpeg_media_type/test_data/3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4 b/src/ffmpeg_media_type/test_data/3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[188794898-eeb81e4b-b33a-4bdf-85a8-3b4b8460b88a.png].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[188794898-eeb81e4b-b33a-4bdf-85a8-3b4b8460b88a.png].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "png_pipe",
   "height": 259,
   "size": 47210,
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4].json
@@ -0,0 +1,9 @@
+{
+  "duration": 89.6,
+  "format": "mov,mp4,m4a,3gp,3g2,mj2",
+  "height": 1080,
+  "size": 15080282,
+  "suggest_ext": "mp4",
+  "type": "video",
+  "width": 1920
+}
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[9c7ee468-24a3-4930-9832-73f0f6001ab1.webp].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[9c7ee468-24a3-4930-9832-73f0f6001ab1.webp].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "webp_pipe",
   "height": 787,
   "size": 55242,
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[animated-webp.webp].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[animated-webp.webp].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "webp_pipe",
   "height": 225,
   "size": 4242,
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[cd89b1bf161582d55161f5ba94d03cc7728825c2.jpe].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[cd89b1bf161582d55161f5ba94d03cc7728825c2.jpe].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "jpeg_pipe",
   "height": 3144,
   "size": 12642182,
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[lionic_vp8x_1109.webp].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[lionic_vp8x_1109.webp].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "webp_pipe",
   "height": 520,
   "size": 344360,
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[maxresdefault.jpg-sdafdeagwdsadf].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[maxresdefault.jpg-sdafdeagwdsadf].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "jpeg_pipe",
   "height": 720,
   "size": 99802,
diff --git a/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[overlay.png].json b/src/ffmpeg_media_type/tests/__snapshots__/test_info/test_detect[overlay.png].json
@@ -1,5 +1,5 @@
 {
-  "duration": null,
+  "duration": 0,
   "format": "png_pipe",
   "height": 117,
   "size": 2212,
diff --git a/src/ffmpeg_media_type/utils/tests/__snapshots__/test_ffprobe/test_ffprobe_file[3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4].json b/src/ffmpeg_media_type/utils/tests/__snapshots__/test_ffprobe/test_ffprobe_file[3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4].json
@@ -0,0 +1,54 @@
+{
+  "format": {
+    "duration": "89.600000",
+    "format_long_name": "QuickTime / MOV",
+    "format_name": "mov,mp4,m4a,3gp,3g2,mj2",
+    "probe_score": 100,
+    "size": "15080282",
+    "start_time": "0.000000"
+  },
+  "streams": [
+    {
+      "codec_long_name": "H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10",
+      "codec_name": "h264",
+      "codec_type": "video",
+      "height": 1080,
+      "index": 0,
+      "pix_fmt": "yuv420p",
+      "profile": "High",
+      "r_frame_rate": "30/1",
+      "tags": {
+        "rotate": 0
+      },
+      "width": 1920
+    },
+    {
+      "codec_long_name": "AAC (Advanced Audio Coding)",
+      "codec_name": "aac",
+      "codec_type": "audio",
+      "height": null,
+      "index": 1,
+      "pix_fmt": null,
+      "profile": "LC",
+      "r_frame_rate": "0/0",
+      "tags": {
+        "rotate": 0
+      },
+      "width": null
+    },
+    {
+      "codec_long_name": null,
+      "codec_name": null,
+      "codec_type": "data",
+      "height": null,
+      "index": 2,
+      "pix_fmt": null,
+      "profile": null,
+      "r_frame_rate": "0/0",
+      "tags": {
+        "rotate": 0
+      },
+      "width": null
+    }
+  ]
+}
diff --git a/src/ffmpeg_media_type/utils/tests/__snapshots__/test_thumbnail.ambr b/src/ffmpeg_media_type/utils/tests/__snapshots__/test_thumbnail.ambr
@@ -8,6 +8,9 @@
 # name: test_thumbnail[201432913186_fish.gif]
   True
 # ---
+# name: test_thumbnail[3c289a15d14d8b6775ec0a2cd233da70b963de5a.mp4]
+  True
+# ---
 # name: test_thumbnail[4ox1IBJxK3cVd0uJA6gOtceSP3g.jpg]
   True
 # ---

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "duration": null,`
	`2`	`+ "duration": 0,`
`3`	`3`	`"format": "png_pipe",`
`4`	`4`	`"height": 259,`
`5`	`5`	`"size": 47210,`