diff options
| author | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-02-11 22:32:35 +0000 |
|---|---|---|
| committer | Baptiste Coudurier <baptiste.coudurier@gmail.com> | 2008-02-11 22:32:35 +0000 |
| commit | 8cb66fd8f20ab9650eadf77f612d2ea6f44183da (patch) | |
| tree | d8b75a6433cf09634e70252f04bbfbee9e1dda84 /libavformat | |
| parent | 77c7543702309ff7530ab7b4ba5adac8db103ca6 (diff) | |
| download | ffmpeg-streaming-8cb66fd8f20ab9650eadf77f612d2ea6f44183da.zip ffmpeg-streaming-8cb66fd8f20ab9650eadf77f612d2ea6f44183da.tar.gz | |
split chunks in the case of big compressed audio frames,
might be tweaked, fix qt_dv_pal_test.mov.
Originally committed as revision 11909 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mov.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c index e2272b1..27f171a 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1375,6 +1375,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st) } } else { /* read whole chunk */ unsigned int chunk_samples, chunk_size, chunk_duration; + unsigned int frames = 1; for (i = 0; i < sc->chunk_count; i++) { current_offset = sc->chunk_offsets[i]; if (stsc_index + 1 < sc->sample_to_chunk_sz && @@ -1387,7 +1388,15 @@ static void mov_build_index(MOVContext *mov, AVStream *st) chunk_size = chunk_samples * sc->sample_size; else if (sc->samples_per_frame > 0 && (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0)) + { + if (sc->samples_per_frame < 1024) chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame; + else { + chunk_size = sc->bytes_per_frame; + frames = chunk_samples / sc->samples_per_frame; + chunk_samples = sc->samples_per_frame; + } + } else { /* workaround to find nearest next chunk offset */ chunk_size = INT_MAX; for (j = 0; j < mov->fc->nb_streams; j++) { @@ -1416,6 +1425,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st) msc->next_chunk = 0; } } + for (j = 0; j < frames; j++) { av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME); /* get chunk duration */ chunk_duration = 0; @@ -1432,10 +1442,12 @@ static void mov_build_index(MOVContext *mov, AVStream *st) } } } + current_offset += sc->bytes_per_frame; dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, " "duration %d\n", st->index, i, current_offset, current_dts, chunk_size, chunk_duration); assert(chunk_duration % sc->time_rate == 0); current_dts += chunk_duration / sc->time_rate; + } } } out: |
