forked from FFmpeg/FFmpeg
update current_sample number for non split mode
fix chunk split decission Originally committed as revision 4296 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
45139adf30
commit
e2b9cf4e2e
1 changed files with 7 additions and 6 deletions
|
@ -1942,14 +1942,13 @@ again:
|
|||
}
|
||||
#endif //MOV_MINOLTA_FIX
|
||||
|
||||
idx = sc->sample_to_chunk_index;
|
||||
if (idx + 1 < sc->sample_to_chunk_sz && sc->next_chunk >= sc->sample_to_chunk[idx + 1].first)
|
||||
idx++;
|
||||
sc->sample_to_chunk_index = idx;
|
||||
#ifdef MOV_SPLIT_CHUNKS
|
||||
/* split chunks into samples */
|
||||
if (sc->sample_size == 0) {
|
||||
idx = sc->sample_to_chunk_index;
|
||||
if ((idx + 1 < sc->sample_to_chunk_sz)
|
||||
&& (sc->next_chunk >= sc->sample_to_chunk[idx + 1].first))
|
||||
idx++;
|
||||
sc->sample_to_chunk_index = idx;
|
||||
if (sc->sample_size == 0 || sc->sample_size > 100) {
|
||||
if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
|
||||
mov->partial = sc;
|
||||
/* we'll have to get those samples before next chunk */
|
||||
|
@ -1958,6 +1957,8 @@ again:
|
|||
}
|
||||
|
||||
sc->current_sample++;
|
||||
}else if(idx + 1 < sc->sample_to_chunk_sz){
|
||||
sc->current_sample += sc->sample_size * sc->sample_to_chunk[idx].count;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue