Mercurial > libavformat.hg

changeset 401:42cc78ece67f libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* .mov files with uncompressed audio can't be correctly processed because of the sample_size == 1 and MINOLTA hack relying on the information. So in a way, it's a hack of a hack. btw, if somebody knows why in the world even Apple's software thinks that for PCM 16bit sample_size == 1 please let me know. It clearly isn't documented that way.
author romansh
date Wed, 31 Mar 2004 04:51:14 +0000
parents 62e4ea840c52
children 1e2ee60ad614
files mov.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mov.c	Sun Mar 28 03:29:00 2004 +0000
+++ b/mov.c	Wed Mar 31 04:51:14 2004 +0000
@@ -1676,7 +1676,13 @@
         for(i=0; i<(sc->sample_to_chunk_sz); i++) {
             if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) && (sc->sample_size>0) )
             {
-                foundsize=sc->sample_to_chunk[i].count*sc->sample_size;
+		// I can't figure out why for PCM audio sample_size is always 1
+		// (it should actually be channels*bits_per_second/8) but it is.
+		AVCodecContext* cod = &s->streams[sc->ffindex]->codec;
+                if (sc->sample_size == 1 && (cod->codec_id == CODEC_ID_PCM_S16BE || cod->codec_id == CODEC_ID_PCM_S16LE))
+		    foundsize=(sc->sample_to_chunk[i].count*cod->channels*cod->bits_per_sample)/8;
+		else
+		    foundsize=sc->sample_to_chunk[i].count*sc->sample_size;
             }
 #ifdef DEBUG
             /*printf("sample_to_chunk first=%ld count=%ld, id=%ld\n", sc->sample_to_chunk[i].first, sc->sample_to_chunk[i].count, sc->sample_to_chunk[i].id);*/