devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix a couple of MP4 demuxing problems, preventing playback in a few cases. All my test files now play properly.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12161 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Magnus Holmgren 2007-01-30 21:42:36 +00:00
parent ca3b5bb8e4
commit fc1efc7b13
3 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
apps/codecs/aac.c
View file

@ -157,6 +157,12 @@ next_track:
{ {
ci->advance_buffer(file_offset - ci->curpos); ci->advance_buffer(file_offset - ci->curpos);
} }
else if (file_offset == 0)
{
LOGF("AAC: get_sample_offset error\n");
err = CODEC_ERROR;
goto done;
}
/* Request the required number of bytes from the input buffer */ /* Request the required number of bytes from the input buffer */
buffer=ci->request_buffer(&n,sample_byte_size); buffer=ci->request_buffer(&n,sample_byte_size);

4
apps/codecs/libm4a/demux.c
View file

@ -762,7 +762,11 @@ int qtmovie_read(stream_t *file, demux_res_t *demux_res)
read_chunk_mdat(&qtmovie, chunk_len); read_chunk_mdat(&qtmovie, chunk_len);
/* Keep track of start of stream in file - used for seeking */ /* Keep track of start of stream in file - used for seeking */
qtmovie.res->mdat_offset=stream_tell(qtmovie.stream); qtmovie.res->mdat_offset=stream_tell(qtmovie.stream);
/* There can be empty mdats before the real one. If so, skip them */
if (qtmovie.res->mdat_len > 0) {
return 1; return 1;
}
break;
/* these following atoms can be skipped !!!! */ /* these following atoms can be skipped !!!! */
case MAKEFOURCC('f','r','e','e'): case MAKEFOURCC('f','r','e','e'):

5
apps/codecs/libm4a/m4a.c
View file

@ -199,7 +199,7 @@ unsigned int get_sample_offset(demux_res_t *demux_res, uint32_t sample)
prev_chunk_samples = demux_res->sample_to_chunk[i].num_samples; prev_chunk_samples = demux_res->sample_to_chunk[i].num_samples;
} }
if (demux_res->num_sample_to_chunks > 1) if (sample >= demux_res->sample_to_chunk[0].num_samples)
{ {
chunk = prev_chunk + (sample - total_samples) / prev_chunk_samples; chunk = prev_chunk + (sample - total_samples) / prev_chunk_samples;
} }
@ -223,7 +223,8 @@ unsigned int get_sample_offset(demux_res_t *demux_res, uint32_t sample)
file_offset = demux_res->chunk_offset[chunk - 1]; file_offset = demux_res->chunk_offset[chunk - 1];
} }
if (chunk_sample > sample) { if (chunk_sample > sample)
{
return 0; return 0;
} }