mirror of
https://github.com/mpv-player/mpv
synced 2024-09-12 23:45:53 +02:00
fixed endless 'unknown chunk' and doublespeed ima4 audio bugs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6656 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b2ff3dd68c
commit
8d8026ed48
@ -873,11 +873,14 @@ static void lschunks(demuxer_t* demuxer,int level,off_t endpos,mov_track_t* trak
|
|||||||
mp4_free_esds(&esds); // freeup esds mem
|
mp4_free_esds(&esds); // freeup esds mem
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case 0:
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: Found unknown movie atom %c%c%c%c (%d)!\n",
|
mp_msg(MSGT_DEMUX, MSGL_INFO, "MOV: Found unknown movie atom %c%c%c%c (%d)!\n",
|
||||||
trak->stdata[pos+4],trak->stdata[pos+5],trak->stdata[pos+6],trak->stdata[pos+7],
|
trak->stdata[pos+4],trak->stdata[pos+5],trak->stdata[pos+6],trak->stdata[pos+7],
|
||||||
atom_len);
|
atom_len);
|
||||||
}
|
}
|
||||||
|
if(atom_len<8) break;
|
||||||
pos+=atom_len;
|
pos+=atom_len;
|
||||||
// printf("pos=%d max=%d\n",pos,trak->stdata_len);
|
// printf("pos=%d max=%d\n",pos,trak->stdata_len);
|
||||||
}
|
}
|
||||||
@ -1302,8 +1305,8 @@ if(trak->samplesize){
|
|||||||
if(trak->stdata_len>=44 && trak->stdata[9]>=1){
|
if(trak->stdata_len>=44 && trak->stdata[9]>=1){
|
||||||
// stsd version 1 - we have audio compression ratio info:
|
// stsd version 1 - we have audio compression ratio info:
|
||||||
x/=char2int(trak->stdata,28); // samples/packet
|
x/=char2int(trak->stdata,28); // samples/packet
|
||||||
x*=char2int(trak->stdata,32); // bytes/packet
|
// x*=char2int(trak->stdata,32); // bytes/packet
|
||||||
// x*=char2int(trak->stdata,36); // bytes/frame
|
x*=char2int(trak->stdata,36); // bytes/frame
|
||||||
} else {
|
} else {
|
||||||
if(ds->ss_div!=1 || ds->ss_mul!=1){
|
if(ds->ss_div!=1 || ds->ss_mul!=1){
|
||||||
// workaround for buggy files like 7up-high-traffic-areas.mov,
|
// workaround for buggy files like 7up-high-traffic-areas.mov,
|
||||||
|
Loading…
Reference in New Issue
Block a user