fenix/fdkaac
1
0
Fork 0
mirror of https://github.com/nu774/fdkaac.git synced 2025-04-03 18:41:07 +02:00
Code Issues Projects Releases Wiki Activity

fix mp4 duration & version calcuration

Browse Source
This commit is contained in:
nu774 2013-01-13 00:56:41 +09:00
parent e476728e77
commit f67cfe227e
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/m4af.c
View File

@ -515,15 +515,6 @@ void m4af_update_size(m4af_writer_t *ctx, int64_t pos)
m4af_set_pos(ctx, current_pos); m4af_set_pos(ctx, current_pos);
} }
static
int m4af_head_version(m4af_writer_t *ctx, int track_idx)
{
m4af_track_t *track = &ctx->track[track_idx];
return track->duration > UINT32_MAX
|| track->creation_time > UINT32_MAX
|| track->modification_time > UINT32_MAX;
}
static static
void m4af_descriptor(m4af_writer_t *ctx, uint32_t tag, uint32_t size) void m4af_descriptor(m4af_writer_t *ctx, uint32_t tag, uint32_t size)
{ {
@ -835,7 +826,9 @@ void m4af_mdhd_box(m4af_writer_t *ctx, int track_idx)
{ {
m4af_track_t *track = &ctx->track[track_idx]; m4af_track_t *track = &ctx->track[track_idx];
int64_t pos = m4af_tell(ctx); int64_t pos = m4af_tell(ctx);
uint8_t version = m4af_head_version(ctx, track_idx); uint8_t version = (track->creation_time > UINT32_MAX ||
track->modification_time > UINT32_MAX ||
track->duration > UINT32_MAX);
m4af_write(ctx, "\0\0\0\0mdhd", 8); m4af_write(ctx, "\0\0\0\0mdhd", 8);
m4af_write(ctx, &version, 1); m4af_write(ctx, &version, 1);
@ -898,7 +891,11 @@ void m4af_tkhd_box(m4af_writer_t *ctx, int track_idx)
{ {
m4af_track_t *track = &ctx->track[track_idx]; m4af_track_t *track = &ctx->track[track_idx];
int64_t pos = m4af_tell(ctx); int64_t pos = m4af_tell(ctx);
uint8_t version = m4af_head_version(ctx, track_idx); int64_t duration =
(double)track->duration / track->timescale * ctx->timescale + .5;
uint8_t version = (track->creation_time > UINT32_MAX ||
track->modification_time > UINT32_MAX ||
duration > UINT32_MAX);
m4af_write(ctx, "\0\0\0\0tkhd", 8); m4af_write(ctx, "\0\0\0\0tkhd", 8);
m4af_write(ctx, &version, 1); m4af_write(ctx, &version, 1);
m4af_write(ctx, "\0\0\007", 3); /* flags */ m4af_write(ctx, "\0\0\007", 3); /* flags */
@ -908,14 +905,14 @@ void m4af_tkhd_box(m4af_writer_t *ctx, int track_idx)
m4af_write32(ctx, track_idx + 1); m4af_write32(ctx, track_idx + 1);
m4af_write(ctx, "\0\0\0\0" /* reserved */ m4af_write(ctx, "\0\0\0\0" /* reserved */
, 4); , 4);
m4af_write64(ctx, track->duration); m4af_write64(ctx, duration);
} else { } else {
m4af_write32(ctx, track->creation_time); m4af_write32(ctx, track->creation_time);
m4af_write32(ctx, track->modification_time); m4af_write32(ctx, track->modification_time);
m4af_write32(ctx, track_idx + 1); m4af_write32(ctx, track_idx + 1);
m4af_write(ctx, "\0\0\0\0" /* reserved */ m4af_write(ctx, "\0\0\0\0" /* reserved */
, 4); , 4);
m4af_write32(ctx, track->duration); m4af_write32(ctx, duration);
} }
m4af_write(ctx, m4af_write(ctx,
"\0\0\0\0" /* reserved[0] */ "\0\0\0\0" /* reserved[0] */
@ -956,7 +953,7 @@ int64_t m4af_movie_duration(m4af_writer_t *ctx)
unsigned i; unsigned i;
for (i = 0; i < ctx->num_tracks; ++i) { for (i = 0; i < ctx->num_tracks; ++i) {
double x = ctx->track[i].duration; double x = ctx->track[i].duration;
int64_t duration = x * ctx->track[i].timescale / ctx->timescale + .5; int64_t duration = x / ctx->track[i].timescale * ctx->timescale + .5;
if (duration > movie_duration) if (duration > movie_duration)
movie_duration = duration; movie_duration = duration;
} }
@ -967,8 +964,10 @@ static
void m4af_mvhd_box(m4af_writer_t *ctx) void m4af_mvhd_box(m4af_writer_t *ctx)
{ {
int64_t pos = m4af_tell(ctx); int64_t pos = m4af_tell(ctx);
uint8_t version = m4af_head_version(ctx, 0);
int64_t movie_duration = m4af_movie_duration(ctx); int64_t movie_duration = m4af_movie_duration(ctx);
uint8_t version = (ctx->creation_time > UINT32_MAX ||
ctx->modification_time > UINT32_MAX ||
movie_duration > UINT32_MAX);
m4af_write(ctx, "\0\0\0\0mvhd", 8); m4af_write(ctx, "\0\0\0\0mvhd", 8);
m4af_write(ctx, &version, 1); m4af_write(ctx, &version, 1);

2
version.h
View File

@ -1,4 +1,4 @@
#ifndef VERSION_H #ifndef VERSION_H
#define VERSION_H #define VERSION_H
const char *fdkaac_version = "0.0.9"; const char *fdkaac_version = "0.1.0";
#endif #endif