Hi, This patch fixes pcm (twos, swot) in MOV. The correct sample size is correctly computed just below. IMHO disabled code seems not needed. I have no samples not working with that fix, If someone can check. Video fixed samplesize is handled in mov_build_index This fix playing samples produced by ffmpeg(which set correct values), and many samples in archive. -- Baptiste COUDURIER GnuPG Key Id: 0x5C1ABAAA SMARTJOG S.A. http://www.smartjog.com Key fingerprint 8D77134D20CC9220201FC5DB0AC9325C5C1ABAAA Phone: +33 1 49966312 Index: libmpdemux/demux_mov.c =================================================================== RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v retrieving revision 1.139 diff -u -p -r1.139 demux_mov.c --- libmpdemux/demux_mov.c 17 Feb 2006 01:57:40 -0000 1.139 +++ libmpdemux/demux_mov.c 2 Mar 2006 21:38:51 -0000 @@ -1891,10 +1891,10 @@ if(trak->samplesize){ { mp_msg(MSGT_DEMUX, MSGL_DBG2, "WARNING! Samplesize(%d) != 1\n", trak->samplesize); - x=trak->chunks[trak->pos].size*trak->samplesize; + //x=trak->chunks[trak->pos].size*trak->samplesize; } - else - x=trak->chunks[trak->pos].size; + //else + x=trak->chunks[trak->pos].size; // printf("X = %d\n", x); /* the following stuff is audio related */ if (trak->type == MOV_TRAK_AUDIO){
On Thu, 02 Mar 2006 22:39:04 +0100 Baptiste COUDURIER <baptiste.coudurier@smartjog.com> wrote:
Hi,
This patch fixes pcm (twos, swot) in MOV. The correct sample size is correctly computed just below. IMHO disabled code seems not needed. I have no samples not working with that fix, If someone can check.
Video fixed samplesize is handled in mov_build_index
This fix playing samples produced by ffmpeg(which set correct values), and many samples in archive. byte Size of stream descriprion string byte[] Stream description string
This fixes the long-standing bug with twos samples generated on sgi machines (see http://www.mplayerhq.hu/MPlayer/samples/A-codecs/twos/ files pet* and sgi.mov). Tesing with some random samples with and without pcm audio i got no problems. Applied. Ciao, Roberto
On Thu, 2 Mar 2006 23:28:32 +0100 Roberto Togni <r_togni@tiscali.it> wrote: [...]
and many samples in archive. byte Size of stream descriprion string byte[] Stream description string [...]
Bad paste, luckily i had nothing bad in my clipboard :) Ciao, Roberto
_______________________________________________ MPlayer-dev-eng mailing list MPlayer-dev-eng@mplayerhq.hu http://mplayerhq.hu/mailman/listinfo/mplayer-dev-eng
participants (2)
-
Baptiste COUDURIER -
Roberto Togni