virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

split chunks in the case of big compressed audio frames,

Browse Source 
might be tweaked, fix qt_dv_pal_test.mov.

Originally committed as revision 11909 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier
2008-02-11 22:32:35 +00:00
parent 77c7543702
commit 8cb66fd8f2
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mov.c
View File

@@ -1375,6 +1375,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
} }
} else { /* read whole chunk */ } else { /* read whole chunk */
unsigned int chunk_samples, chunk_size, chunk_duration; unsigned int chunk_samples, chunk_size, chunk_duration;
unsigned int frames = 1;
for (i = 0; i < sc->chunk_count; i++) { for (i = 0; i < sc->chunk_count; i++) {
current_offset = sc->chunk_offsets[i]; current_offset = sc->chunk_offsets[i];
if (stsc_index + 1 < sc->sample_to_chunk_sz && 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; chunk_size = chunk_samples * sc->sample_size;
else if (sc->samples_per_frame > 0 && else if (sc->samples_per_frame > 0 &&
(chunk_samples * sc->bytes_per_frame % 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; 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 */ else { /* workaround to find nearest next chunk offset */
chunk_size = INT_MAX; chunk_size = INT_MAX;
for (j = 0; j < mov->fc->nb_streams; j++) { 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; msc->next_chunk = 0;
} }
} }
for (j = 0; j < frames; j++) {
av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME); av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
/* get chunk duration */ /* get chunk duration */
chunk_duration = 0; chunk_duration = 0;
@@ -1432,12 +1442,14 @@ 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, " 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); "duration %d\n", st->index, i, current_offset, current_dts, chunk_size, chunk_duration);
assert(chunk_duration % sc->time_rate == 0); assert(chunk_duration % sc->time_rate == 0);
current_dts += chunk_duration / sc->time_rate; current_dts += chunk_duration / sc->time_rate;
} }
} }
}
out: out:
/* adjust sample count to avindex entries */ /* adjust sample count to avindex entries */
sc->sample_count = st->nb_index_entries; sc->sample_count = st->nb_index_entries;