commit e3e3bfaf4f189d14d4799e78f3bb834e8701d305
author Joe Drago <jdrago@netflix.com> Tue Jun 02 16:33:53 2020 -0700
committer Joe Drago <jdrago@netflix.com> Tue Jun 02 16:33:53 2020 -0700
tree 56dbe93c6207e63b04129724f5a57b21a890d87a
parent 56f701f0b25d0cd696562d615f76a75b91b2469b

Rename avifSample to avifDecodeSample (in prep for avifEncodeSample)

include/avif/internal.h

diff --git a/include/avif/internal.h b/include/avif/internal.h
index 777f13f..02dd3ed 100644
--- a/include/avif/internal.h
+++ b/include/avif/internal.h
@@ -87,16 +87,16 @@
 // ---------------------------------------------------------------------------
 // avifCodecDecodeInput
 
-typedef struct avifSample
+typedef struct avifDecodeSample
 {
     avifROData data;
     avifBool sync; // is sync sample (keyframe)
-} avifSample;
-AVIF_ARRAY_DECLARE(avifSampleArray, avifSample, sample);
+} avifDecodeSample;
+AVIF_ARRAY_DECLARE(avifDecodeSampleArray, avifDecodeSample, sample);
 
 typedef struct avifCodecDecodeInput
 {
-    avifSampleArray samples;
+    avifDecodeSampleArray samples;
     avifBool alpha; // if true, this is decoding an alpha plane
 } avifCodecDecodeInput;
 

src/codec_aom.c

diff --git a/src/codec_aom.c b/src/codec_aom.c
index 3244b17..15080c6 100644
--- a/src/codec_aom.c
+++ b/src/codec_aom.c
@@ -80,7 +80,7 @@
             break;
         } else if (codec->internal->inputSampleIndex < codec->decodeInput->samples.count) {
             // Feed another sample
-            avifSample * sample = &codec->decodeInput->samples.sample[codec->internal->inputSampleIndex];
+            avifDecodeSample * sample = &codec->decodeInput->samples.sample[codec->internal->inputSampleIndex];
             ++codec->internal->inputSampleIndex;
             codec->internal->iter = NULL;
             if (aom_codec_decode(&codec->internal->decoder, sample->data.data, sample->data.size, NULL)) {

src/codec_dav1d.c

diff --git a/src/codec_dav1d.c b/src/codec_dav1d.c
index 37de4d2..e65aef3 100644
--- a/src/codec_dav1d.c
+++ b/src/codec_dav1d.c
@@ -52,7 +52,7 @@
 {
     if (!codec->internal->dav1dData.sz) {
         if (codec->internal->inputSampleIndex < codec->decodeInput->samples.count) {
-            avifSample * sample = &codec->decodeInput->samples.sample[codec->internal->inputSampleIndex];
+            avifDecodeSample * sample = &codec->decodeInput->samples.sample[codec->internal->inputSampleIndex];
             ++codec->internal->inputSampleIndex;
 
             if (dav1d_data_wrap(&codec->internal->dav1dData, sample->data.data, sample->data.size, avifDav1dFreeCallback, NULL) != 0) {

src/codec_libgav1.c

diff --git a/src/codec_libgav1.c b/src/codec_libgav1.c
index 2c1d031..cb020ca 100644
--- a/src/codec_libgav1.c
+++ b/src/codec_libgav1.c
@@ -42,7 +42,7 @@
     // Check if there are more samples to feed
     if (codec->internal->inputSampleIndex < codec->decodeInput->samples.count) {
         // Feed another sample
-        avifSample * sample = &codec->decodeInput->samples.sample[codec->internal->inputSampleIndex];
+        avifDecodeSample * sample = &codec->decodeInput->samples.sample[codec->internal->inputSampleIndex];
         ++codec->internal->inputSampleIndex;
         if (Libgav1DecoderEnqueueFrame(codec->internal->gav1Decoder,
                                        sample->data.data,

src/read.c

diff --git a/src/read.c b/src/read.c
index ee52c97..7798d31 100644
--- a/src/read.c
+++ b/src/read.c
@@ -302,7 +302,7 @@
 {
     avifCodecDecodeInput * decodeInput = (avifCodecDecodeInput *)avifAlloc(sizeof(avifCodecDecodeInput));
     memset(decodeInput, 0, sizeof(avifCodecDecodeInput));
-    avifArrayCreate(&decodeInput->samples, sizeof(avifSample), 1);
+    avifArrayCreate(&decodeInput->samples, sizeof(avifDecodeSample), 1);
     return decodeInput;
 }
 
@@ -344,7 +344,7 @@
                 sampleSize = sampleSizePtr->size;
             }
 
-            avifSample * sample = (avifSample *)avifArrayPushPtr(&decodeInput->samples);
+            avifDecodeSample * sample = (avifDecodeSample *)avifArrayPushPtr(&decodeInput->samples);
             sample->data.data = rawInput->data + sampleOffset;
             sample->data.size = sampleSize;
             sample->sync = AVIF_FALSE; // to potentially be set to true following the outer loop
@@ -569,7 +569,7 @@
             }
 
             avifTile * tile = avifDecoderDataCreateTile(data);
-            avifSample * sample = (avifSample *)avifArrayPushPtr(&tile->input->samples);
+            avifDecodeSample * sample = (avifDecodeSample *)avifArrayPushPtr(&tile->input->samples);
             sample->data.data = avifDecoderDataCalcItemPtr(data, item);
             sample->data.size = item->size;
             sample->sync = AVIF_TRUE;
@@ -2195,7 +2195,7 @@
             }
 
             avifTile * colorTile = avifDecoderDataCreateTile(decoder->data);
-            avifSample * colorSample = (avifSample *)avifArrayPushPtr(&colorTile->input->samples);
+            avifDecodeSample * colorSample = (avifDecodeSample *)avifArrayPushPtr(&colorTile->input->samples);
             memcpy(&colorSample->data, &colorOBU, sizeof(avifROData));
             colorSample->sync = AVIF_TRUE;
             decoder->data->colorTileCount = 1;
@@ -2211,7 +2211,7 @@
             if (alphaOBU.size > 0) {
                 alphaTile = avifDecoderDataCreateTile(decoder->data);
 
-                avifSample * alphaSample = (avifSample *)avifArrayPushPtr(&alphaTile->input->samples);
+                avifDecodeSample * alphaSample = (avifDecodeSample *)avifArrayPushPtr(&alphaTile->input->samples);
                 memcpy(&alphaSample->data, &alphaOBU, sizeof(avifROData));
                 alphaSample->sync = AVIF_TRUE;
                 alphaTile->input->alpha = AVIF_TRUE;