commit e4ca51eb241e6cf6af34b8aaf8e17f2fce8927cc
author Wan-Teh Chang <wtc@google.com> Sat Feb 20 12:03:19 2021 -0800
committer Joe Drago <joedrago@gmail.com> Mon Feb 22 17:13:24 2021 -0800
tree 5a3791895bb77bd41aa9609124ad214917404461
parent b40f7c20a36c66388d588d6da7e7bffdde4d1905

Remove avifPrepareReformatState() from public API

Remove the avifReformatMode enum, the avifReformatState struct, and the
avifPrepareReformatState() function from the public API. They are only
used in src/reformat.c.

Define avifReformatMode and avifReformatState in include/avif/internal.h
so that these two types can be used by src/reformat_libyuv.c in the
future. Mark the avifPrepareReformatState() function as static in
src/reformat.c.

Fix https://github.com/AOMediaCodec/libavif/issues/514.

include/avif/avif.h

diff --git a/include/avif/avif.h b/include/avif/avif.h
index d267791..a2f0d30 100644
--- a/include/avif/avif.h
+++ b/include/avif/avif.h
@@ -510,49 +510,6 @@
 AVIF_API int avifLimitedToFullY(int depth, int v);
 AVIF_API int avifLimitedToFullUV(int depth, int v);
 
-typedef enum avifReformatMode
-{
-    AVIF_REFORMAT_MODE_YUV_COEFFICIENTS = 0, // Normal YUV conversion using coefficients
-    AVIF_REFORMAT_MODE_IDENTITY,             // Pack GBR directly into YUV planes (AVIF_MATRIX_COEFFICIENTS_IDENTITY)
-    AVIF_REFORMAT_MODE_YCGCO                 // YUV conversion using AVIF_MATRIX_COEFFICIENTS_YCGCO
-} avifReformatMode;
-
-typedef struct avifReformatState
-{
-    // YUV coefficients
-    float kr;
-    float kg;
-    float kb;
-
-    uint32_t yuvChannelBytes;
-    uint32_t rgbChannelBytes;
-    uint32_t rgbChannelCount;
-    uint32_t rgbPixelBytes;
-    uint32_t rgbOffsetBytesR;
-    uint32_t rgbOffsetBytesG;
-    uint32_t rgbOffsetBytesB;
-    uint32_t rgbOffsetBytesA;
-
-    uint32_t yuvDepth;
-    avifRange yuvRange;
-    int yuvMaxChannel;
-    int rgbMaxChannel;
-    float rgbMaxChannelF;
-    float biasY;   // minimum Y value
-    float biasUV;  // the value of 0.5 for the appropriate bit depth [128, 512, 2048]
-    float rangeY;  // difference between max and min Y
-    float rangeUV; // difference between max and min UV
-
-    avifPixelFormatInfo formatInfo;
-
-    // LUTs for going from YUV limited/full unorm -> full range RGB FP32
-    float unormFloatTableY[1 << 12];
-    float unormFloatTableUV[1 << 12];
-
-    avifReformatMode mode;
-} avifReformatState;
-AVIF_API avifBool avifPrepareReformatState(const avifImage * image, const avifRGBImage * rgb, avifReformatState * state);
-
 // ---------------------------------------------------------------------------
 // Codec selection
 

include/avif/internal.h

diff --git a/include/avif/internal.h b/include/avif/internal.h
index a45a2dd..380081a 100644
--- a/include/avif/internal.h
+++ b/include/avif/internal.h
@@ -92,6 +92,48 @@
 avifBool avifFillAlpha(const avifAlphaParams * const params);
 avifBool avifReformatAlpha(const avifAlphaParams * const params);
 
+typedef enum avifReformatMode
+{
+    AVIF_REFORMAT_MODE_YUV_COEFFICIENTS = 0, // Normal YUV conversion using coefficients
+    AVIF_REFORMAT_MODE_IDENTITY,             // Pack GBR directly into YUV planes (AVIF_MATRIX_COEFFICIENTS_IDENTITY)
+    AVIF_REFORMAT_MODE_YCGCO                 // YUV conversion using AVIF_MATRIX_COEFFICIENTS_YCGCO
+} avifReformatMode;
+
+typedef struct avifReformatState
+{
+    // YUV coefficients
+    float kr;
+    float kg;
+    float kb;
+
+    uint32_t yuvChannelBytes;
+    uint32_t rgbChannelBytes;
+    uint32_t rgbChannelCount;
+    uint32_t rgbPixelBytes;
+    uint32_t rgbOffsetBytesR;
+    uint32_t rgbOffsetBytesG;
+    uint32_t rgbOffsetBytesB;
+    uint32_t rgbOffsetBytesA;
+
+    uint32_t yuvDepth;
+    avifRange yuvRange;
+    int yuvMaxChannel;
+    int rgbMaxChannel;
+    float rgbMaxChannelF;
+    float biasY;   // minimum Y value
+    float biasUV;  // the value of 0.5 for the appropriate bit depth [128, 512, 2048]
+    float rangeY;  // difference between max and min Y
+    float rangeUV; // difference between max and min UV
+
+    avifPixelFormatInfo formatInfo;
+
+    // LUTs for going from YUV limited/full unorm -> full range RGB FP32
+    float unormFloatTableY[1 << 12];
+    float unormFloatTableUV[1 << 12];
+
+    avifReformatMode mode;
+} avifReformatState;
+
 // Returns:
 // * AVIF_RESULT_OK              - Converted successfully with libyuv
 // * AVIF_RESULT_NOT_IMPLEMENTED - The fast path for this combination is not implemented with libyuv, use built-in YUV conversion

src/reformat.c

diff --git a/src/reformat.c b/src/reformat.c
index 002a07e..be035c4 100644
--- a/src/reformat.c
+++ b/src/reformat.c
@@ -14,7 +14,7 @@
     float v;
 };
 
-avifBool avifPrepareReformatState(const avifImage * image, const avifRGBImage * rgb, avifReformatState * state)
+static avifBool avifPrepareReformatState(const avifImage * image, const avifRGBImage * rgb, avifReformatState * state)
 {
     if ((image->depth != 8) && (image->depth != 10) && (image->depth != 12)) {
         return AVIF_FALSE;