Support for Progressive AVIF encoding

AOMediaCodec · Jun 7, 2022 · 757271e · 757271e
1 parent e82b5af
commit 757271e
Show file tree

Hide file tree

Showing 9 changed files with 845 additions and 135 deletions.
diff --git a/apps/avifenc.c b/apps/avifenc.c
diff --git a/include/avif/avif.h b/include/avif/avif.h
@@ -85,6 +85,8 @@ typedef int avifBool;
 #define AVIF_SPEED_SLOWEST 0
 #define AVIF_SPEED_FASTEST 10
 
+#define MAX_AV1_LAYER_COUNT 4
+
 typedef enum avifPlanesFlag
 {
     AVIF_PLANES_YUV = (1 << 0),
@@ -151,6 +153,7 @@ typedef enum avifResult
     AVIF_RESULT_WAITING_ON_IO, // similar to EAGAIN/EWOULDBLOCK, this means the avifIO doesn't have necessary data available yet
     AVIF_RESULT_INVALID_ARGUMENT, // an argument passed into this function is invalid
     AVIF_RESULT_NOT_IMPLEMENTED,  // a requested code path is not (yet) implemented
+    AVIF_RESULT_INVALID_LAYERS,
     AVIF_RESULT_OUT_OF_MEMORY
 } avifResult;
 
@@ -787,9 +790,11 @@ typedef enum avifProgressiveState
     // for an image sequence.
     AVIF_PROGRESSIVE_STATE_UNAVAILABLE = 0,
 
-    // The current AVIF/Source offers a progressive image, but avifDecoder.allowProgressive is not
-    // enabled, so it will behave as if the image was not progressive and will simply decode the
-    // best version of this item.
+    // For decoder, this means the current AVIF/Source offers a progressive image, but
+    // avifDecoder.allowProgressive is not enabled, so it will behave as if the image was not
+    // progressive and will simply decode the best version of this item.
+    // For encoder, this means at least one of color and alpha image has multiple layers and
+    // indicates this is a progressive image.
     AVIF_PROGRESSIVE_STATE_AVAILABLE,
 
     // The current AVIF/Source offers a progressive image, and avifDecoder.allowProgressive is true.
@@ -997,6 +1002,18 @@ AVIF_API avifResult avifDecoderNthImageMaxExtent(const avifDecoder * decoder, ui
 struct avifEncoderData;
 struct avifCodecSpecificOptions;
 
+typedef struct avifScalingMode {
+    uint64_t numerator;
+    uint64_t denominator;
+} avifScalingMode;
+
+typedef struct avifLayerConfig {
+    int minQuantizer;
+    int maxQuantizer;
+    avifScalingMode horizontalMode;
+    avifScalingMode verticalMode;
+} avifLayerConfig;
+
 // Notes:
 // * If avifEncoderWrite() returns AVIF_RESULT_OK, output must be freed with avifRWDataFree()
 // * If (maxThreads < 2), multithreading is disabled
@@ -1025,6 +1042,11 @@ typedef struct avifEncoder
     int keyframeInterval; // How many frames between automatic forced keyframes; 0 to disable (default).
     uint64_t timescale;   // timescale of the media (Hz)
 
+    int extraLayerCount; // Extra layers for color sub image; 0 to disable layer image (default).
+    int extraLayerCountAlpha; // Extra layers for alpha sub image; 0 to disable layer image (default).
+    avifLayerConfig layers[MAX_AV1_LAYER_COUNT];
+    avifLayerConfig layersAlpha[MAX_AV1_LAYER_COUNT];
+
     // stats from the most recent write
     avifIOStats ioStats;
 
@@ -1073,6 +1095,16 @@ AVIF_API avifResult avifEncoderAddImageGrid(avifEncoder * encoder,
                                             uint32_t gridRows,
                                             const avifImage * const * cellImages,
                                             avifAddImageFlags addImageFlags);
+avifResult avifEncoderAddImageProgressive(avifEncoder * encoder,
+                                          uint32_t layerCount,
+                                          const avifImage * const * layerImages,
+                                          avifAddImageFlags addImageFlags);
+avifResult avifEncoderAddImageProgressiveGrid(avifEncoder * encoder,
+                                              uint32_t gridCols,
+                                              uint32_t gridRows,
+                                              uint32_t layerCount,
+                                              const avifImage * const * layerImages,
+                                              avifAddImageFlags addImageFlags);
 AVIF_API avifResult avifEncoderFinish(avifEncoder * encoder, avifRWData * output);
 
 // Codec-specific, optional "advanced" tuning settings, in the form of string key/value pairs. These

diff --git a/include/avif/internal.h b/include/avif/internal.h
@@ -259,6 +259,7 @@ typedef avifResult (*avifCodecEncodeImageFunc)(struct avifCodec * codec,
                                                avifEncoder * encoder,
                                                const avifImage * image,
                                                avifBool alpha,
+                                               uint32_t layerIndex,
                                                avifAddImageFlags addImageFlags,
                                                avifCodecEncodeOutput * output);
 typedef avifBool (*avifCodecEncodeFinishFunc)(struct avifCodec * codec, avifCodecEncodeOutput * output);

diff --git a/src/avif.c b/src/avif.c
@@ -93,6 +93,7 @@ const char * avifResultToString(avifResult result)
         case AVIF_RESULT_WAITING_ON_IO:                 return "Waiting on IO";
         case AVIF_RESULT_INVALID_ARGUMENT:              return "Invalid argument";
         case AVIF_RESULT_NOT_IMPLEMENTED:               return "Not implemented";
+        case AVIF_RESULT_INVALID_LAYERS:                return "Invalid layer image";
         case AVIF_RESULT_OUT_OF_MEMORY:                 return "Out of memory";
         case AVIF_RESULT_UNKNOWN_ERROR:
         default: