Mp4: fixed non-keyframe seeks in some cases (ticket #175).

Number of entries in stsc atom was wrong if we've added an entry to
split a chunk.

Additionally, there is no need to add an entry if we are going to split
last chunk in an entry, it's enough to update the entry we already have.
Previously new entry was added and old one was left as is, resulting in
incorrect entry with zero chunks which might confuse some software.
This commit is contained in:
Maxim Dounin 2012-06-18 14:01:18 +00:00
parent 0cf52376fb
commit e1e2e2eb3a

View File

@ -2488,7 +2488,13 @@ found:
ngx_mp4_set_32value(entry->chunk, 1);
if (trak->chunk_samples) {
if (trak->chunk_samples && next_chunk - trak->start_chunk == 2) {
/* last chunk in the entry */
ngx_mp4_set_32value(entry->samples, samples - trak->chunk_samples);
} else if (trak->chunk_samples) {
first = &trak->stsc_chunk_entry;
ngx_mp4_set_32value(first->chunk, 1);
@ -2504,6 +2510,7 @@ found:
ngx_mp4_set_32value(entry->chunk, 2);
entries++;
atom_size += sizeof(ngx_mp4_stsc_entry_t);
}