write actual number of channels to mp4a box

[fdkaac.git] / src / m4af.c

diff --git a/src/m4af.c b/src/m4af.c
index 11650f352525271d2f9f631e50283f55b3eae5fc..f3a48525ea2276df64f20b11176c663464dd1f94 100644 (file)
--- a/src/m4af.c
+++ b/src/m4af.c
@@ -42,6 +42,7 @@ typedef struct m4af_chunk_entry_t {
 typedef struct m4af_track_t {
     uint32_t codec;
     uint32_t timescale;
+    uint16_t num_channels;
     int64_t creation_time;
     int64_t modification_time;
     int64_t duration;
@@ -53,6 +54,7 @@ typedef struct m4af_track_t {
     uint32_t bufferSizeDB;
     uint32_t maxBitrate;
     uint32_t avgBitrate;
+    int is_vbr;
 
     m4af_sample_entry_t *sample_table;
     uint32_t num_samples;
@@ -210,6 +212,7 @@ m4af_ctx_t *m4af_create(uint32_t codec, uint32_t timescale,
     ctx->track[0].timescale = timescale;
     ctx->track[0].creation_time = timestamp;
     ctx->track[0].modification_time = timestamp;
+    ctx->track[0].num_channels = 2;
     return ctx;
 }
 
@@ -253,6 +256,12 @@ void m4af_teardown(m4af_ctx_t **ctxp)
     *ctxp = 0;
 }
 
+void m4af_set_num_channels(m4af_ctx_t *ctx, uint32_t track_idx,
+                           uint16_t channels)
+{
+    ctx->track[track_idx].num_channels = channels;
+}
+
 void m4af_set_fixed_frame_duration(m4af_ctx_t *ctx, uint32_t track_idx,
                                    uint32_t length)
 {
@@ -278,6 +287,12 @@ DONE:
     return ctx->last_error;
 }
 
+void m4af_set_vbr_mode(m4af_ctx_t *ctx, uint32_t track_idx, int is_vbr)
+{
+    m4af_track_t *track = &ctx->track[track_idx];
+    track->is_vbr = is_vbr;
+}
+
 void m4af_set_priming(m4af_ctx_t *ctx, uint32_t track_idx,
                       uint32_t encoder_delay, uint32_t padding)
 {
@@ -771,11 +786,7 @@ void m4af_write_esds_box(m4af_ctx_t *ctx, uint32_t track_idx)
                , 2);
     m4af_write24(ctx, track->bufferSizeDB);
     m4af_write32(ctx, track->maxBitrate);
-#if 0
-    m4af_write32(ctx, track->avgBitrate);
-#else
-    m4af_write32(ctx, 0);
-#endif
+    m4af_write32(ctx, track->is_vbr ? 0: track->avgBitrate);
     /* DecoderSpecificInfo */
     m4af_write_descriptor(ctx, 5, track->decSpecificInfoSize);
     m4af_write(ctx, track->decSpecificInfo, track->decSpecificInfoSize);
@@ -813,11 +824,13 @@ void m4af_write_mp4a_box(m4af_ctx_t *ctx, uint32_t track_idx)
                "\0\001"       /* data_reference_index: 1 */
                "\0\0\0\0"     /* reserved[0]             */
                "\0\0\0\0"     /* reserved[1]             */
-               "\0\002"       /* channelcount: 2         */
+               ,16);
+    m4af_write16(ctx, track->num_channels);
+    m4af_write(ctx,
                "\0\020"       /* samplesize: 16          */
                "\0\0"         /* pre_defined             */
                "\0\0"         /* reserved                */
-               ,24);
+               ,6);
     if (track->codec == M4AF_FOURCC('m','p','4','a')) {
         m4af_write32(ctx, track->timescale << 16);
         m4af_write_esds_box(ctx, track_idx);
@@ -861,17 +874,15 @@ void m4af_write_sbgp_box(m4af_ctx_t *ctx, uint32_t track_idx)
 static
 void m4af_write_sgpd_box(m4af_ctx_t *ctx, uint32_t track_idx)
 {
-    m4af_track_t *track = &ctx->track[track_idx];
     m4af_write(ctx,
-               "\0\0\0\032"  /* size               */
+               "\0\0\0\026"  /* size: 22           */
                "sgpd"        /* type               */
-               "\001"        /* version            */
+               "\0"          /* version            */
                "\0\0\0"      /* flags              */
                "roll"        /* grouping_type      */
-               "\0\0\0\002"  /* default_length: 2  */
                "\0\0\0\001"  /* entry_count: 1     */
                "\377\377"    /* payload_data: -1   */
-               , 26);
+               , 22);
 }
 
 static
@@ -1048,7 +1059,6 @@ void m4af_write_elst_box(m4af_ctx_t *ctx, uint32_t track_idx)
 static
 void m4af_write_edts_box(m4af_ctx_t *ctx, uint32_t track_idx)
 {
-    m4af_track_t *track = &ctx->track[track_idx];
     int64_t pos = m4af_tell(ctx);
     m4af_write(ctx, "\0\0\0\0edts", 8);
     m4af_write_elst_box(ctx, track_idx);