From 54ef9aaaed38995d4a8744ba4d4acdd193201511 Mon Sep 17 00:00:00 2001
From: Pierre Neidhardt <mail@ambrevar.xyz>
Date: Fri, 15 Jan 2021 19:41:50 +0100
Subject: [PATCH] ambrevar/ffprobe: Add some missing stream fields.

---
 .../common-lisp/source/ambrevar/ffprobe.lisp  | 73 ++++++++++++++-----
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/.local/share/common-lisp/source/ambrevar/ffprobe.lisp b/.local/share/common-lisp/source/ambrevar/ffprobe.lisp
index 04d0b8f8..c16a448c 100644
--- a/.local/share/common-lisp/source/ambrevar/ffprobe.lisp
+++ b/.local/share/common-lisp/source/ambrevar/ffprobe.lisp
@@ -14,6 +14,8 @@
     (declare (ignore definition))
     name))
 
+;; TODO: Should leave unspecified fields unbound?
+
 (defclass* disposition ()
     ((default 0)
      (dub 0)
@@ -27,7 +29,9 @@
      (clean-effects 0)
      (attached-pic 0)
      (timed-thumbnails 0))
-    (:accessor-name-transformer #'name-identity))
+    (:accessor-name-transformer #'name-identity)
+    (:export-slot-names-p t)
+    (:export-class-name-p t))
 
 (defclass* media-stream ()              ; REVIEW: `stream' is reserved by CL.
     ((index 0)
@@ -45,7 +49,16 @@
      (level 0)
      (color-range "")
      (color-space "")
+     (color-transfer "")
+     (color-primaries "")
+     (chroma-location "")
+     (field-order "")
      (refs 0)
+     (id "")
+     (quarter-sample nil
+                     :type boolean)
+     (divx-packed nil
+                  :type boolean)
      (sample-aspect-ratio "")
      (display-aspect-ratio "")
      (codec-time-base "")               ; TODO: Ratio?
@@ -56,6 +69,14 @@
      (channels 2)
      (channel-layout "")
      (bits-per-sample 0)
+     (dmix-mode 0)
+     (ltrt-cmixlev 0.0)
+     (ltrt-surmixlev 0.0)
+     (loro-cmixlev 0.0)
+     (loro-surmixlev 0.0)
+     (is-avc nil
+             :type boolean)
+     (nal-length-size 0)
      (r-frame-rate "")                  ; TODO: Ratio?
      (avg-frame-rate "")                ; TODO: Ratio?
      (time-base "")
@@ -64,10 +85,16 @@
      (duration-ts 0.0)
      (duration 0.0)
      (bit-rate 0)
+     (bits-per-raw-sample 0)
+     (nb-frames 0)
+     (max-bit-rate 0)
      (disposition nil
                   :type (or null disposition))
+     (side-data-list '())
      (tags '()))
-    (:accessor-name-transformer #'name-identity))
+    (:accessor-name-transformer #'name-identity)
+    (:export-slot-names-p t)
+    (:export-class-name-p t))
 
 (defclass* media-format ()              ; REVIEW: `format' is reserved by CL.
     ((filename "")
@@ -81,7 +108,9 @@
      (bit-rate 0)
      (probe-score 0)
      (tags '()))
-    (:accessor-name-transformer #'name-identity))
+    (:accessor-name-transformer #'name-identity)
+    (:export-slot-names-p t)
+    (:export-class-name-p t))
 
 (defun normalize-cl-json-keywords (sym)
   "Turn '--' to '-' and remove '+' from keywords."
@@ -95,11 +124,14 @@
 (defun normalize-cl-json-scalar (value)
   "Turn non-ratio number string to numbers."
   (if (stringp value)
-      (let ((result (ignore-errors (parse-number:parse-number value))))
-        (if (and result
-                 (not (typep result 'ratio)))
-            result
-            value))
+      (match value
+        ("true" t)
+        ("false" nil)
+        (_ (let ((result (ignore-errors (parse-number:parse-number value))))
+             (if (and result
+                      (not (typep result 'ratio)))
+                 result
+                 value))))
       value))
 
 (defun json->media-args (json)
@@ -107,20 +139,23 @@
                   ((cons key value)
                    (list (normalize-cl-json-keywords key)
                          (if (listp value)
-                             (format-ffprobe-json value)
+                             (json->media-args value)
                              (normalize-cl-json-scalar value)))))
                 json))
 
+(export-always 'ffprobe)
 (defun ffprobe (path)
   "Return a list of (MEDIA-FORMAT MEDIA-STREAMS...)."
   (let* ((json-string
-           (cmd:$cmd "ffprobe -v quiet -print_format json -show_format -show_streams -- "
-                     (write-to-string path)))
-         (json (cl-json:decode-json-from-string json-string)))
-    (let* ((format-args (json->media-args (alex:assoc-value json :format)))
-           (format (apply #'make-instance 'media-format format-args)))
-      (cons format
-            (mapcar (lambda (s)
-                      (let ((stream-args (json->media-args s)))
-                        (apply #'make-instance 'media-stream stream-args)))
-                    (alex:assoc-value json :streams))))))
+           (ignore-errors
+            (cmd:$cmd "ffprobe -v quiet -print_format json -show_format -show_streams -- "
+                      (write-to-string path)))))
+    (when json-string
+      (let* ((json (cl-json:decode-json-from-string json-string))
+             (format-args (json->media-args (alex:assoc-value json :format)))
+             (format (apply #'make-instance 'media-format format-args)))
+        (cons format
+              (mapcar (lambda (s)
+                        (let ((stream-args (json->media-args s)))
+                          (apply #'make-instance 'media-stream stream-args)))
+                      (alex:assoc-value json :streams)))))))