commit 85e387a15a9e6fb8c44fad717742848f8a34b9ed
author Joe Drago <jdrago@netflix.com> Wed Jun 03 17:12:53 2020 -0700
committer Joe Drago <jdrago@netflix.com> Wed Jun 03 17:12:53 2020 -0700
tree 311a993a05d69eeb471fc4ae36f6a151cf5e3a6f
parent e90207183ea34b1ee3e9650c884e31fcca98fe40

Add stts sample count coalescing, fix track header "enabled" bit

src/write.c

diff --git a/src/write.c b/src/write.c
index fcdd7f1..824b422 100644
--- a/src/write.c
+++ b/src/write.c
@@ -645,7 +645,7 @@
 
             avifBoxMarker trak = avifRWStreamWriteBox(&s, "trak", AVIF_BOX_SIZE_TBD);
 
-            avifBoxMarker tkhd = avifRWStreamWriteFullBox(&s, "tkhd", AVIF_BOX_SIZE_TBD, 1, 0);
+            avifBoxMarker tkhd = avifRWStreamWriteFullBox(&s, "tkhd", AVIF_BOX_SIZE_TBD, 1, 1);
             avifRWStreamWriteU64(&s, now);                    // unsigned int(64) creation_time;
             avifRWStreamWriteU64(&s, now);                    // unsigned int(64) modification_time;
             avifRWStreamWriteU32(&s, itemIndex + 1);          // unsigned int(32) track_ID;
@@ -728,14 +728,28 @@
             }
             avifRWStreamFinishBox(&s, stss);
 
-            // TODO: coalesce these
             avifBoxMarker stts = avifRWStreamWriteFullBox(&s, "stts", AVIF_BOX_SIZE_TBD, 0, 0);
-            avifRWStreamWriteU32(&s, item->encodeOutput->samples.count); // unsigned int(32) entry_count;
-            for (uint32_t frameIndex = 0; frameIndex < encoder->data->frames.count; ++frameIndex) {
+            size_t sttsEntryCountOffset = avifRWStreamOffset(&s);
+            uint32_t sttsEntryCount = 0;
+            avifRWStreamWriteU32(&s, 0); // unsigned int(32) entry_count;
+            for (uint32_t sampleCount = 0, frameIndex = 0; frameIndex < encoder->data->frames.count; ++frameIndex) {
                 avifEncoderFrame * frame = &encoder->data->frames.frame[frameIndex];
-                avifRWStreamWriteU32(&s, 1);                                     // unsigned int(32) sample_count;
+                ++sampleCount;
+                if (frameIndex < (encoder->data->frames.count - 1)) {
+                    avifEncoderFrame * nextFrame = &encoder->data->frames.frame[frameIndex + 1];
+                    if (frame->durationInTimescales == nextFrame->durationInTimescales) {
+                        continue;
+                    }
+                }
+                avifRWStreamWriteU32(&s, sampleCount);                           // unsigned int(32) sample_count;
                 avifRWStreamWriteU32(&s, (uint32_t)frame->durationInTimescales); // unsigned int(32) sample_delta;
+                sampleCount = 0;
+                ++sttsEntryCount;
             }
+            size_t prevOffset = avifRWStreamOffset(&s);
+            avifRWStreamSetOffset(&s, sttsEntryCountOffset);
+            avifRWStreamWriteU32(&s, sttsEntryCount);
+            avifRWStreamSetOffset(&s, prevOffset);
             avifRWStreamFinishBox(&s, stts);
 
             avifBoxMarker stsd = avifRWStreamWriteFullBox(&s, "stsd", AVIF_BOX_SIZE_TBD, 0, 0);