Merge the 3 threading models into a single one

Merges the 3 threading parameters into a single `--threads=` argument.
Frame threading can still be controlled via the `--framedelay=` argument.
Internally, the threading model is now a global thread/task pool design.

Co-authored-by: Ronald S. Bultje <rsbultje@gmail.com>

1 files changed, 5 insertions, 7 deletions

diff --git a/include/dav1d/dav1d.h b/include/dav1d/dav1d.h
index 97df383..6828e2b 100644
--- a/include/dav1d/dav1d.h
+++ b/include/dav1d/dav1d.h
@@ -43,9 +43,8 @@ extern "C" {
 typedef struct Dav1dContext Dav1dContext;
 typedef struct Dav1dRef Dav1dRef;
 
-#define DAV1D_MAX_FRAME_THREADS 256
-#define DAV1D_MAX_TILE_THREADS 64
-#define DAV1D_MAX_POSTFILTER_THREADS 256
+#define DAV1D_MAX_THREADS 256
+#define DAV1D_MAX_FRAME_DELAY 256
 
 typedef struct Dav1dLogger {
     void *cookie; ///< Custom data to pass to the callback.
@@ -60,16 +59,15 @@ typedef struct Dav1dLogger {
 } Dav1dLogger;
 
 typedef struct Dav1dSettings {
-    int n_frame_threads;
-    int n_tile_threads;
+    int n_threads;
+    int max_frame_delay; ///< internally clipped to $n_threads. Set to 1 for low-latency decoding.
     int apply_grain;
     int operating_point; ///< select an operating point for scalable AV1 bitstreams (0 - 31)
     int all_layers; ///< output all spatial layers of a scalable AV1 biststream
     unsigned frame_size_limit; ///< maximum frame size, in pixels (0 = unlimited)
     Dav1dPicAllocator allocator; ///< Picture allocator callback.
     Dav1dLogger logger; ///< Logger callback.
-    int n_postfilter_threads;
-    uint8_t reserved[28]; ///< reserved for future use
+    uint8_t reserved[32]; ///< reserved for future use
 } Dav1dSettings;
 
 /**