X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=src%2Fm4af.c;h=f3a48525ea2276df64f20b11176c663464dd1f94;hb=fcfed4cd0c1a53898af6fb4ef43bf16cd74c2c1b;hp=7a53df87ad6dcbd4ee78fa5f7cfe860d4f3c1501;hpb=d317e29d467e1e3290a9a2e8c2bbb21b56c854cf;p=fdkaac.git diff --git a/src/m4af.c b/src/m4af.c index 7a53df8..f3a4852 100644 --- a/src/m4af.c +++ b/src/m4af.c @@ -23,6 +23,7 @@ #define m4af_realloc(memory,size) realloc(memory, size) #define m4af_free(memory) free(memory) +#define m4af_max(a,b) ((a)<(b)?(b):(a)) #define M4AF_ATOM_WILD 0xffffffff @@ -41,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; @@ -52,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; @@ -209,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; } @@ -252,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) { @@ -277,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) { @@ -596,12 +612,13 @@ int m4af_set_iTunSMPB(m4af_ctx_t *ctx) } static -void m4af_update_box_size(m4af_ctx_t *ctx, int64_t pos) +uint32_t m4af_update_box_size(m4af_ctx_t *ctx, int64_t pos) { int64_t current_pos = m4af_tell(ctx); m4af_set_pos(ctx, pos); m4af_write32(ctx, current_pos - pos); m4af_set_pos(ctx, current_pos); + return current_pos - pos; } static @@ -769,7 +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); - m4af_write32(ctx, track->avgBitrate); + m4af_write32(ctx, track->is_vbr ? 0: track->avgBitrate); /* DecoderSpecificInfo */ m4af_write_descriptor(ctx, 5, track->decSpecificInfoSize); m4af_write(ctx, track->decSpecificInfo, track->decSpecificInfoSize); @@ -807,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); @@ -855,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 @@ -1042,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); @@ -1273,7 +1289,7 @@ void m4af_write_udta_box(m4af_ctx_t *ctx) } static -void m4af_write_moov_box(m4af_ctx_t *ctx) +uint32_t m4af_write_moov_box(m4af_ctx_t *ctx) { unsigned i; int64_t pos = m4af_tell(ctx); @@ -1283,7 +1299,7 @@ void m4af_write_moov_box(m4af_ctx_t *ctx) m4af_write_trak_box(ctx, i); if (ctx->num_tags) m4af_write_udta_box(ctx); - m4af_update_box_size(ctx, pos); + return m4af_update_box_size(ctx, pos); } static @@ -1301,10 +1317,35 @@ void m4af_finalize_mdat(m4af_ctx_t *ctx) m4af_set_pos(ctx, ctx->mdat_pos + ctx->mdat_size); } -int m4af_finalize(m4af_ctx_t *ctx) +static +void m4af_shift_mdat_pos(m4af_ctx_t *ctx, uint32_t offset) +{ + unsigned i, j; + int64_t begin, end; + char buf[8192]; + + end = ctx->mdat_pos + ctx->mdat_size; + for (; (begin = m4af_max(ctx->mdat_pos, end - 8192)) < end; end = begin) { + m4af_set_pos(ctx, begin); + ctx->io.read(ctx->io_cookie, buf, end - begin); + m4af_set_pos(ctx, begin + offset); + m4af_write(ctx, buf, end - begin); + } + for (i = 0; i < ctx->num_tracks; ++i) + for (j = 0; j < ctx->track[i].num_chunks; ++j) + ctx->track[i].chunk_table[j].offset += offset; + ctx->mdat_pos += offset; + m4af_set_pos(ctx, ctx->mdat_pos - 16); + m4af_write_free_box(ctx, 0); + m4af_write(ctx, "\0\0\0\0mdat", 8); + m4af_finalize_mdat(ctx); +} + +int m4af_finalize(m4af_ctx_t *ctx, int optimize) { unsigned i; m4af_track_t *track; + uint32_t moov_size; for (i = 0; i < ctx->num_tracks; ++i) { track = ctx->track + i; @@ -1323,6 +1364,14 @@ int m4af_finalize(m4af_ctx_t *ctx) (track->encoder_delay || track->padding)) m4af_set_iTunSMPB(ctx); m4af_finalize_mdat(ctx); - m4af_write_moov_box(ctx); + moov_size = m4af_write_moov_box(ctx); + if (optimize) { + int64_t pos; + m4af_shift_mdat_pos(ctx, moov_size + 1024); + m4af_set_pos(ctx, 32); + m4af_write_moov_box(ctx); + pos = m4af_tell(ctx); + m4af_write_free_box(ctx, ctx->mdat_pos - pos - 24); + } return ctx->last_error; }