X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fmov.c;h=c15fd9a47ffd9b1fc8684a2c7a48dd1bb62c7696;hb=dcadd216f116b6a4b83d41c0cfe36b3986daae15;hp=6b1d333e749ad48a00068fa609f9e1f2d91b71c6;hpb=01f4895c682a1752bf6d138ffb0628470e16b85a;p=ffmpeg

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6b1d333e749..c15fd9a47ff 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -14,13 +14,16 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <limits.h>
- 
+
+//#define DEBUG
+
 #include "avformat.h"
 #include "avi.h"
+#include "mov.h"
 
 #ifdef CONFIG_ZLIB
 #include <zlib.h>
@@ -28,7 +31,7 @@
 
 /*
  * First version by Francois Revol revol@free.fr
- * Seek function by Gael Chardon gael.dev@4now.net 
+ * Seek function by Gael Chardon gael.dev@4now.net
  *
  * Features and limitations:
  * - reads most of the QT files I have (at least the structure),
@@ -54,21 +57,14 @@
  * QuickTime is a trademark of Apple (AFAIK :))
  */
 
-//#define DEBUG
-#ifdef DEBUG
-#include <stdio.h>
-#include <fcntl.h>
-#endif
-
 #include "qtpalette.h"
 
 
-/* Allows seeking (MOV_SPLIT_CHUNKS should also be defined) */
-#define MOV_SEEK
+#undef NDEBUG
+#include <assert.h>
 
-/* allows chunk splitting - should work now... */
-/* in case you can't read a file, try commenting */
-#define MOV_SPLIT_CHUNKS
+/* Allows seeking */
+#define MOV_SEEK
 
 /* Special handling for movies created with Minolta Dimaxe Xi*/
 /* this fix should not interfere with other .mov files, but just in case*/
@@ -77,7 +73,36 @@
 /* some streams in QT (and in MP4 mostly) aren't either video nor audio */
 /* so we first list them as this, then clean up the list of streams we give back, */
 /* getting rid of these */
-#define CODEC_TYPE_MOV_OTHER	(enum CodecType) 2
+#define CODEC_TYPE_MOV_OTHER    (enum CodecType) 2
+
+/* http://gpac.sourceforge.net/tutorial/mediatypes.htm */
+const CodecTag ff_mov_obj_type[] = {
+    { CODEC_ID_MPEG4     ,  32 },
+    { CODEC_ID_H264      ,  33 },
+    { CODEC_ID_AAC       ,  64 },
+    { CODEC_ID_MPEG2VIDEO,  96 }, /* MPEG2 Simple */
+    { CODEC_ID_MPEG2VIDEO,  97 }, /* MPEG2 Main */
+    { CODEC_ID_MPEG2VIDEO,  98 }, /* MPEG2 SNR */
+    { CODEC_ID_MPEG2VIDEO,  99 }, /* MPEG2 Spatial */
+    { CODEC_ID_MPEG2VIDEO, 100 }, /* MPEG2 High */
+    { CODEC_ID_MPEG2VIDEO, 101 }, /* MPEG2 422 */
+    { CODEC_ID_AAC       , 102 }, /* MPEG2 AAC Main */
+    { CODEC_ID_AAC       , 103 }, /* MPEG2 AAC Low */
+    { CODEC_ID_AAC       , 104 }, /* MPEG2 AAC SSR */
+    { CODEC_ID_MP3       , 105 },
+    { CODEC_ID_MPEG1VIDEO, 106 },
+    { CODEC_ID_MP2       , 107 },
+    { CODEC_ID_MJPEG     , 108 },
+    { CODEC_ID_PCM_S16LE , 224 },
+    { CODEC_ID_VORBIS    , 225 },
+    { CODEC_ID_AC3       , 226 },
+    { CODEC_ID_PCM_ALAW  , 227 },
+    { CODEC_ID_PCM_MULAW , 228 },
+    { CODEC_ID_PCM_S16BE , 230 },
+    { CODEC_ID_H263      , 242 },
+    { CODEC_ID_H261      , 243 },
+    { 0, 0 },
+};
 
 static const CodecTag mov_video_tags[] = {
 /*  { CODEC_ID_, MKTAG('c', 'v', 'i', 'd') }, *//* Cinepak */
@@ -119,10 +144,18 @@ static const CodecTag mov_video_tags[] = {
     { CODEC_ID_QDRAW, MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
     { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
     { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 produced by Sony HD camera */
+    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX 635/50 50mb/s produced by FCP */
+    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX 635/50 30mb/s produced by FCP */
+    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */
+    //{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD produced by FCP */
+    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 produced by FCP */
+    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* HDV produced by FCP */
+    //{ CODEC_ID_MJPEG, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
     { CODEC_ID_NONE, 0 },
 };
 
 static const CodecTag mov_audio_tags[] = {
+    { CODEC_ID_PCM_S24BE, MKTAG('i', 'n', '2', '4') },
 /*    { CODEC_ID_PCM_S16BE, MKTAG('N', 'O', 'N', 'E') }, *//* uncompressed */
     { CODEC_ID_PCM_S16BE, MKTAG('t', 'w', 'o', 's') }, /* 16 bits */
     /* { CODEC_ID_PCM_S8, MKTAG('t', 'w', 'o', 's') },*/ /* 8 bits */
@@ -145,9 +178,36 @@ static const CodecTag mov_audio_tags[] = {
     { CODEC_ID_AMR_WB, MKTAG('s', 'a', 'w', 'b') }, /* AMR-WB 3gp */
     { CODEC_ID_AC3, MKTAG('m', 's', 0x20, 0x00) }, /* Dolby AC-3 */
     { CODEC_ID_ALAC,MKTAG('a', 'l', 'a', 'c') }, /* Apple Lossless */
+    { CODEC_ID_QDM2,MKTAG('Q', 'D', 'M', '2') }, /* QDM2 */
     { CODEC_ID_NONE, 0 },
 };
 
+/* map numeric codes from mdhd atom to ISO 639 */
+/* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
+/* http://developer.apple.com/documentation/mac/Text/Text-368.html */
+/* deprecated by putting the code as 3*5bit ascii */
+static const char *mov_mdhd_language_map[] = {
+/* 0-9 */
+"eng", "fra", "ger", "ita", "dut", "sve", "spa", "dan", "por", "nor",
+"heb", "jpn", "ara", "fin", "gre", "ice", "mlt", "tur", "hr "/*scr*/, "chi"/*ace?*/,
+"urd", "hin", "tha", "kor", "lit", "pol", "hun", "est", "lav",  NULL,
+"fo ",  NULL, "rus", "chi",  NULL, "iri", "alb", "ron", "ces", "slk",
+"slv", "yid", "sr ", "mac", "bul", "ukr", "bel", "uzb", "kaz", "aze",
+/*?*/
+"aze", "arm", "geo", "mol", "kir", "tgk", "tuk", "mon",  NULL, "pus",
+"kur", "kas", "snd", "tib", "nep", "san", "mar", "ben", "asm", "guj",
+"pa ", "ori", "mal", "kan", "tam", "tel",  NULL, "bur", "khm", "lao",
+/*                   roman? arabic? */
+"vie", "ind", "tgl", "may", "may", "amh", "tir", "orm", "som", "swa",
+/*==rundi?*/
+ NULL, "run",  NULL, "mlg", "epo",  NULL,  NULL,  NULL,  NULL,  NULL,
+/* 100 */
+ NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+ NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,
+ NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL,  NULL, "wel", "baq",
+"cat", "lat", "que", "grn", "aym", "tat", "uig", "dzo", "jav"
+};
+
 /* the QuickTime file format is quite convoluted...
  * it has lots of index tables, each indexing something in another one...
  * Here we just use what is needed to read the chunks
@@ -178,25 +238,25 @@ typedef struct {
 
     /* 0x03 ESDescrTag */
     uint16_t es_id;
-#define MP4ODescrTag			0x01
-#define MP4IODescrTag			0x02
-#define MP4ESDescrTag			0x03
-#define MP4DecConfigDescrTag		0x04
-#define MP4DecSpecificDescrTag		0x05
-#define MP4SLConfigDescrTag		0x06
-#define MP4ContentIdDescrTag		0x07
-#define MP4SupplContentIdDescrTag	0x08
-#define MP4IPIPtrDescrTag		0x09
-#define MP4IPMPPtrDescrTag		0x0A
-#define MP4IPMPDescrTag			0x0B
-#define MP4RegistrationDescrTag		0x0D
-#define MP4ESIDIncDescrTag		0x0E
-#define MP4ESIDRefDescrTag		0x0F
-#define MP4FileIODescrTag		0x10
-#define MP4FileODescrTag		0x11
-#define MP4ExtProfileLevelDescrTag	0x13
-#define MP4ExtDescrTagsStart		0x80
-#define MP4ExtDescrTagsEnd		0xFE
+#define MP4ODescrTag                    0x01
+#define MP4IODescrTag                   0x02
+#define MP4ESDescrTag                   0x03
+#define MP4DecConfigDescrTag            0x04
+#define MP4DecSpecificDescrTag          0x05
+#define MP4SLConfigDescrTag             0x06
+#define MP4ContentIdDescrTag            0x07
+#define MP4SupplContentIdDescrTag       0x08
+#define MP4IPIPtrDescrTag               0x09
+#define MP4IPMPPtrDescrTag              0x0A
+#define MP4IPMPDescrTag                 0x0B
+#define MP4RegistrationDescrTag         0x0D
+#define MP4ESIDIncDescrTag              0x0E
+#define MP4ESIDRefDescrTag              0x0F
+#define MP4FileIODescrTag               0x10
+#define MP4FileODescrTag                0x11
+#define MP4ExtProfileLevelDescrTag      0x13
+#define MP4ExtDescrTagsStart            0x80
+#define MP4ExtDescrTagsEnd              0xFE
     uint8_t  stream_priority;
 
     /* 0x04 DecConfigDescrTag */
@@ -241,9 +301,9 @@ typedef struct MOVStreamContext {
     long sample_to_chunk_sz;
     MOV_sample_to_chunk_tbl *sample_to_chunk;
     long sample_to_chunk_index;
-    int sample_to_time_index;	 
-    long sample_to_time_sample;	 
-    uint64_t sample_to_time_time;    
+    int sample_to_time_index;
+    long sample_to_time_sample;
+    uint64_t sample_to_time_time;
     int sample_to_ctime_index;
     int sample_to_ctime_sample;
     long sample_size;
@@ -252,6 +312,7 @@ typedef struct MOVStreamContext {
     long keyframe_count;
     long *keyframes;
     int time_scale;
+    int time_rate;
     long current_sample;
     long left_in_chunk; /* how many samples before next chunk */
     MOV_esds_t esds;
@@ -300,39 +361,58 @@ typedef struct MOVParseTableEntry {
     mov_parse_function func;
 } MOVParseTableEntry;
 
-#ifdef DEBUG
-/*
- * XXX: static sux, even more in a multithreaded environment...
- * Avoid them. This is here just to help debugging.
- */
-static int debug_indent = 0;
-void print_atom(const char *str, MOV_atom_t atom)
+static int ff_mov_lang_to_iso639(int code, char *to)
 {
-    unsigned int tag, i;
-    tag = (unsigned int) atom.type;
-    i=debug_indent;
-    if(tag == 0) tag = MKTAG('N', 'U', 'L', 'L');
-    while(i--)
-        av_log(NULL, AV_LOG_DEBUG, "|");
-    av_log(NULL, AV_LOG_DEBUG, "parse:");
-    av_log(NULL, AV_LOG_DEBUG, " %s: tag=%c%c%c%c offset=0x%x size=0x%x\n",
-           str, tag & 0xff,
-           (tag >> 8) & 0xff,
-           (tag >> 16) & 0xff,
-           (tag >> 24) & 0xff,
-           (unsigned int)atom.offset,
-	   (unsigned int)atom.size);
-    assert((unsigned int)atom.size < 0x7fffffff);// catching errors
+    int i;
+    /* is it the mangled iso code? */
+    /* see http://www.geocities.com/xhelmboyx/quicktime/formats/mp4-layout.txt */
+    if (code > 138) {
+        for (i = 2; i >= 0; i--) {
+            to[i] = 0x60 + (code & 0x1f);
+            code >>= 5;
+        }
+        return 1;
+    }
+    /* old fashion apple lang code */
+    if (code >= (sizeof(mov_mdhd_language_map)/sizeof(char *)))
+        return 0;
+    if (!mov_mdhd_language_map[code])
+        return 0;
+    strncpy(to, mov_mdhd_language_map[code], 4);
+    return 1;
 }
-#else
-#define print_atom(a,b)
-#endif
 
+extern int ff_mov_iso639_to_lang(const char *lang, int mp4); /* for movenc.c */
+int ff_mov_iso639_to_lang(const char *lang, int mp4)
+{
+    int i, code = 0;
+
+    /* old way, only for QT? */
+    for (i = 0; !mp4 && (i < (sizeof(mov_mdhd_language_map)/sizeof(char *))); i++) {
+        if (mov_mdhd_language_map[i] && !strcmp(lang, mov_mdhd_language_map[i]))
+            return i;
+    }
+    /* XXX:can we do that in mov too? */
+    if (!mp4)
+        return 0;
+    /* handle undefined as such */
+    if (lang[0] == '\0')
+        lang = "und";
+    /* 5bit ascii */
+    for (i = 0; i < 3; i++) {
+        unsigned char c = (unsigned char)lang[i];
+        if (c < 0x60)
+            return 0;
+        if (c > 0x60 + 0x1f)
+            return 0;
+        code <<= 5;
+        code |= (c - 0x60);
+    }
+    return code;
+}
 
 static int mov_read_leaf(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
-    print_atom("leaf", atom);
-
     if (atom.size>1)
         url_fskip(pb, atom.size);
 /*        url_seek(pb, atom_offset+atom.size, SEEK_SET); */
@@ -346,71 +426,53 @@ static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     int i;
     int err = 0;
 
-#ifdef DEBUG
-    print_atom("default", atom);
-    debug_indent++;
-#endif
-
     a.offset = atom.offset;
 
     if (atom.size < 0)
-	atom.size = 0x7fffffffffffffffLL;
+        atom.size = 0x7fffffffffffffffLL;
     while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) {
-	a.size = atom.size;
-	a.type=0L;
+        a.size = atom.size;
+        a.type=0L;
         if(atom.size >= 8) {
-	    a.size = get_be32(pb);
+            a.size = get_be32(pb);
             a.type = get_le32(pb);
         }
-	total_size += 8;
+        total_size += 8;
         a.offset += 8;
-	//av_log(NULL, AV_LOG_DEBUG, "type: %08x  %.4s  sz: %Lx  %Lx   %Lx\n", type, (char*)&type, size, atom.size, total_size);
+        dprintf("type: %08x  %.4s  sz: %Lx  %Lx   %Lx\n", a.type, (char*)&a.type, a.size, atom.size, total_size);
         if (a.size == 1) { /* 64 bit extended size */
-	    a.size = get_be64(pb) - 8;
+            a.size = get_be64(pb) - 8;
             a.offset += 8;
             total_size += 8;
         }
-	if (a.size == 0) {
-	    a.size = atom.size - total_size;
-	    if (a.size <= 8)
+        if (a.size == 0) {
+            a.size = atom.size - total_size;
+            if (a.size <= 8)
                 break;
-	}
-	for (i = 0; c->parse_table[i].type != 0L
-	     && c->parse_table[i].type != a.type; i++)
-	    /* empty */;
+        }
+        for (i = 0; c->parse_table[i].type != 0L
+             && c->parse_table[i].type != a.type; i++)
+            /* empty */;
+
+        a.size -= 8;
 
-	a.size -= 8;
-        
         if(a.size < 0)
             break;
-        
-//        av_log(NULL, AV_LOG_DEBUG, " i=%ld\n", i);
-	if (c->parse_table[i].type == 0) { /* skip leaf atoms data */
-//            url_seek(pb, atom.offset+atom.size, SEEK_SET);
-#ifdef DEBUG
-            print_atom("unknown", a);
-#endif
+
+        if (c->parse_table[i].type == 0) { /* skip leaf atoms data */
             url_fskip(pb, a.size);
-	} else {
-#ifdef DEBUG
-	    //char b[5] = { type & 0xff, (type >> 8) & 0xff, (type >> 16) & 0xff, (type >> 24) & 0xff, 0 };
-	    //print_atom(b, type, offset, size);
-#endif
-	    err = (c->parse_table[i].func)(c, pb, a);
-	}
+        } else {
+            err = (c->parse_table[i].func)(c, pb, a);
+        }
 
-	a.offset += a.size;
+        a.offset += a.size;
         total_size += a.size;
     }
 
     if (!err && total_size < atom.size && atom.size < 0x7ffff) {
-	//av_log(NULL, AV_LOG_DEBUG, "RESET  %Ld  %Ld  err:%d\n", atom.size, total_size, err);
         url_fskip(pb, atom.size - total_size);
     }
 
-#ifdef DEBUG
-    debug_indent--;
-#endif
     return err;
 }
 
@@ -429,9 +491,9 @@ static int mov_read_ctab(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     t->size = get_be16(pb) + 1;
     len = 2 * t->size * 4;
     if (len > 0) {
-	t->clrs = av_malloc(len); // 16bit A R G B
-	if (t->clrs)
-	    get_buffer(pb, t->clrs, len);
+        t->clrs = av_malloc(len); // 16bit A R G B
+        if (t->clrs)
+            get_buffer(pb, t->clrs, len);
     }
 #endif
 
@@ -445,8 +507,6 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     uint32_t type;
     uint32_t ctype;
 
-    print_atom("hdlr", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
@@ -454,29 +514,8 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     ctype = get_le32(pb);
     type = get_le32(pb); /* component subtype */
 
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype);
-    av_log(NULL, AV_LOG_DEBUG, "stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
-#endif
-#ifdef DEBUG
-/* XXX: yeah this is ugly... */
-    if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */
-        if(type == MKTAG('v', 'i', 'd', 'e'))
-            puts("hdlr: vide");
-        else if(type == MKTAG('s', 'o', 'u', 'n'))
-            puts("hdlr: soun");
-    } else if(ctype == 0) { /* MP4 */
-        if(type == MKTAG('v', 'i', 'd', 'e'))
-            puts("hdlr: vide");
-        else if(type == MKTAG('s', 'o', 'u', 'n'))
-            puts("hdlr: soun");
-        else if(type == MKTAG('o', 'd', 's', 'm'))
-            puts("hdlr: odsm");
-        else if(type == MKTAG('s', 'd', 's', 'm'))
-            puts("hdlr: sdsm");
-    } else puts("hdlr: meta");
-#endif
-
+    dprintf("ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype);
+    dprintf("stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
     if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */
         /* helps parsing the string hereafter... */
         c->mp4 = 0;
@@ -506,20 +545,8 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         while(get_byte(pb) && (++len < (atom.size - 24)));
     } else {
         /* .mov: PASCAL string */
-#ifdef DEBUG
-        char* buf;
-#endif
         len = get_byte(pb);
-#ifdef DEBUG
-	buf = (uint8_t*) av_malloc(len+1);
-	if (buf) {
-	    get_buffer(pb, buf, len);
-	    buf[len] = '\0';
-	    av_log(NULL, AV_LOG_DEBUG, "**buf='%s'\n", buf);
-	    av_free(buf);
-	} else
-#endif
-	    url_fskip(pb, len);
+        url_fskip(pb, len);
     }
 
     url_fskip(pb, atom.size - (url_ftell(pb) - atom.offset));
@@ -532,9 +559,9 @@ static int mov_mp4_read_descr_len(ByteIOContext *pb)
     int count = 4;
     while (count--) {
         int c = get_byte(pb);
-	len = (len << 7) | (c & 0x7f);
-	if (!(c & 0x80))
-	    break;
+        len = (len << 7) | (c & 0x7f);
+        if (!(c & 0x80))
+            break;
     }
     return len;
 }
@@ -544,21 +571,10 @@ static int mov_mp4_read_descr(ByteIOContext *pb, int *tag)
     int len;
     *tag = get_byte(pb);
     len = mov_mp4_read_descr_len(pb);
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
-#endif
+    dprintf("MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
     return len;
 }
 
-static inline unsigned int get_be24(ByteIOContext *s)
-{
-    unsigned int val;
-    val = get_byte(s) << 16;
-    val |= get_byte(s) << 8;
-    val |= get_byte(s);
-    return val;
-}
-
 static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     AVStream *st = c->fc->streams[c->fc->nb_streams-1];
@@ -566,37 +582,33 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     int64_t start_pos = url_ftell(pb);
     int tag, len;
 
-    print_atom("esds", atom);
-
     /* Well, broken but suffisant for some MP4 streams */
     get_be32(pb); /* version + flags */
     len = mov_mp4_read_descr(pb, &tag);
     if (tag == MP4ESDescrTag) {
-	get_be16(pb); /* ID */
-	get_byte(pb); /* priority */
+        get_be16(pb); /* ID */
+        get_byte(pb); /* priority */
     } else
-	get_be16(pb); /* ID */
+        get_be16(pb); /* ID */
 
     len = mov_mp4_read_descr(pb, &tag);
     if (tag == MP4DecConfigDescrTag) {
-	sc->esds.object_type_id = get_byte(pb);
-	sc->esds.stream_type = get_byte(pb);
-	sc->esds.buffer_size_db = get_be24(pb);
-	sc->esds.max_bitrate = get_be32(pb);
-	sc->esds.avg_bitrate = get_be32(pb);
-
-	len = mov_mp4_read_descr(pb, &tag);
-	//av_log(NULL, AV_LOG_DEBUG, "LEN %d  TAG %d  m:%d a:%d\n", len, tag, sc->esds.max_bitrate, sc->esds.avg_bitrate);
-	if (tag == MP4DecSpecificDescrTag) {
-#ifdef DEBUG
-	    av_log(NULL, AV_LOG_DEBUG, "Specific MPEG4 header len=%d\n", len);
-#endif
-	    st->codec->extradata = (uint8_t*) av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
-	    if (st->codec->extradata) {
-		get_buffer(pb, st->codec->extradata, len);
-		st->codec->extradata_size = len;
-	    }
-	}
+        sc->esds.object_type_id = get_byte(pb);
+        sc->esds.stream_type = get_byte(pb);
+        sc->esds.buffer_size_db = get_be24(pb);
+        sc->esds.max_bitrate = get_be32(pb);
+        sc->esds.avg_bitrate = get_be32(pb);
+
+        st->codec->codec_id= codec_get_id(ff_mov_obj_type, sc->esds.object_type_id);
+        len = mov_mp4_read_descr(pb, &tag);
+        if (tag == MP4DecSpecificDescrTag) {
+            dprintf("Specific MPEG4 header len=%d\n", len);
+            st->codec->extradata = (uint8_t*) av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
+            if (st->codec->extradata) {
+                get_buffer(pb, st->codec->extradata, len);
+                st->codec->extradata_size = len;
+            }
+        }
     }
     /* in any case, skip garbage */
     url_fskip(pb, atom.size - ((url_ftell(pb) - start_pos)));
@@ -606,8 +618,6 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 /* this atom contains actual media data */
 static int mov_read_mdat(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
-    print_atom("mdat", atom);
-
     if(atom.size == 0) /* wrong one (MP4) */
         return 0;
     c->found_mdat=1;
@@ -624,8 +634,6 @@ static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     int err;
 
-    print_atom("moov", atom);
-
     err = mov_read_default(c, pb, atom);
     /* we parsed the 'moov' atom, we can terminate the parsing as soon as we find the 'mdat' */
     /* so we don't parse the whole file if over a network */
@@ -638,24 +646,24 @@ static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
 static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
-    print_atom("mdhd", atom);
+    int version;
+    int lang;
 
-    get_byte(pb); /* version */
+    version = get_byte(pb); /* version */
+    if (version > 1)
+        return 1; /* unsupported */
 
     get_byte(pb); get_byte(pb);
     get_byte(pb); /* flags */
 
-    get_be32(pb); /* creation time */
-    get_be32(pb); /* modification time */
+    (version==1)?get_be64(pb):get_be32(pb); /* creation time */
+    (version==1)?get_be64(pb):get_be32(pb); /* modification time */
 
     c->streams[c->fc->nb_streams-1]->time_scale = get_be32(pb);
+    c->fc->streams[c->fc->nb_streams-1]->duration = (version==1)?get_be64(pb):get_be32(pb); /* duration */
 
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "track[%i].time_scale = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->time_scale); /* time scale */
-#endif
-    c->fc->streams[c->fc->nb_streams-1]->duration= get_be32(pb); /* duration */
-
-    get_be16(pb); /* language */
+    lang = get_be16(pb); /* language */
+    ff_mov_lang_to_iso639(lang, c->fc->streams[c->fc->nb_streams-1]->language);
     get_be16(pb); /* quality */
 
     return 0;
@@ -663,8 +671,6 @@ static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
 static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
-    print_atom("mvhd", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
@@ -700,7 +706,7 @@ static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
     if((uint64_t)atom.size > (1<<30))
         return -1;
-    
+
     // currently SVQ3 decoder expect full STSD header - so let's fake it
     // this should be fixed and just SMI header should be passed
     av_free(st->codec->extradata);
@@ -708,12 +714,36 @@ static int mov_read_smi(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
 
     if (st->codec->extradata) {
-	strcpy(st->codec->extradata, "SVQ3"); // fake
-	get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
-	//av_log(NULL, AV_LOG_DEBUG, "Reading SMI %Ld  %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
+        strcpy(st->codec->extradata, "SVQ3"); // fake
+        get_buffer(pb, st->codec->extradata + 0x5a, atom.size);
+        dprintf("Reading SMI %Ld  %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
     } else
-	url_fskip(pb, atom.size);
+        url_fskip(pb, atom.size);
+
+    return 0;
+}
+
+static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+{
+    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+
+    if((uint64_t)atom.size > (1<<30))
+        return -1;
 
+    if (st->codec->codec_id == CODEC_ID_QDM2) {
+        // pass all frma atom to codec, needed at least for QDM2
+        av_free(st->codec->extradata);
+        st->codec->extradata_size = atom.size;
+        st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+
+        if (st->codec->extradata) {
+            get_buffer(pb, st->codec->extradata, atom.size);
+        } else
+            url_fskip(pb, atom.size);
+    } else if (atom.size > 8) { /* to read frma, esds atoms */
+        mov_read_default(c, pb, atom);
+    } else if (atom.size > 0)
+        url_fskip(pb, atom.size);
     return 0;
 }
 
@@ -730,9 +760,9 @@ static int mov_read_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
 
     if (st->codec->extradata) {
-	get_buffer(pb, st->codec->extradata, atom.size);
+        get_buffer(pb, st->codec->extradata, atom.size);
     } else
-	url_fskip(pb, atom.size);
+        url_fskip(pb, atom.size);
 
     return 0;
 }
@@ -743,16 +773,14 @@ static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     unsigned int i, entries;
 
-    print_atom("stco", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
     entries = get_be32(pb);
-        
+
     if(entries >= UINT_MAX/sizeof(int64_t))
         return -1;
- 
+
     sc->chunk_count = entries;
     sc->chunk_offsets = (int64_t*) av_malloc(entries * sizeof(int64_t));
     if (!sc->chunk_offsets)
@@ -767,7 +795,7 @@ static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         }
     } else
         return -1;
-    
+
     for(i=0; i<c->fc->nb_streams; i++){
         MOVStreamContext *sc2 = (MOVStreamContext *)c->fc->streams[i]->priv_data;
         if(sc2 && sc2->chunk_offsets){
@@ -777,20 +805,13 @@ static int mov_read_stco(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                 c->ni=1;
         }
     }
-#ifdef DEBUG
-/*
-    for(i=0; i<entries; i++) {
-        av_log(NULL, AV_LOG_DEBUG, "chunk offset=0x%Lx\n", sc->chunk_offsets[i]);
-    }
-*/
-#endif
     return 0;
 }
 
 static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     AVStream *st = c->fc->streams[c->fc->nb_streams-1];
-    //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
+    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     int entries, frames_per_sample;
     uint32_t format;
     uint8_t codec_name[32];
@@ -807,8 +828,6 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     int j;
     unsigned char r, g, b;
 
-    print_atom("stsd", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
@@ -816,7 +835,8 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
     while(entries--) { //Parsing Sample description table
         enum CodecID id;
-	int size = get_be32(pb); /* size */
+        offset_t start_pos = url_ftell(pb);
+        int size = get_be32(pb); /* size */
         format = get_le32(pb); /* data format */
 
         get_be32(pb); /* reserved */
@@ -825,24 +845,21 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
         /* for MPEG4: set codec type by looking for it */
         id = codec_get_id(mov_video_tags, format);
+        if(id <= 0)
+            id = codec_get_id(codec_bmp_tags, format);
         if (id >= 0) {
             AVCodec *codec;
-	    codec = avcodec_find_decoder(id);
+            codec = avcodec_find_decoder(id);
             if (codec)
-		st->codec->codec_type = codec->type;
+                st->codec->codec_type = codec->type;
         }
-#ifdef DEBUG
-        av_log(NULL, AV_LOG_DEBUG, "size=%d 4CC= %c%c%c%c codec_type=%d\n",
-               size,
-               (format >> 0) & 0xff,
-               (format >> 8) & 0xff,
-               (format >> 16) & 0xff,
-               (format >> 24) & 0xff,
-               st->codec->codec_type);
-#endif
-	st->codec->codec_tag = format;
-	if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
-	    MOV_atom_t a = { 0, 0, 0 };
+        dprintf("size=%d 4CC= %c%c%c%c codec_type=%d\n",
+                size,
+                (format >> 0) & 0xff, (format >> 8) & 0xff, (format >> 16) & 0xff, (format >> 24) & 0xff,
+                st->codec->codec_type);
+        st->codec->codec_tag = format;
+        if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
+            MOV_atom_t a = { 0, 0, 0 };
             st->codec->codec_id = id;
             get_be16(pb); /* version */
             get_be16(pb); /* revision level */
@@ -861,7 +878,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
             get_be32(pb); /* data size, always 0 */
             frames_per_sample = get_be16(pb); /* frames per samples */
 #ifdef DEBUG
-	    av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample);
+            av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample);
 #endif
         get_buffer(pb, codec_name, 32); /* codec name, pascal string (FIXME: true for mp4?) */
         if (codec_name[0] <= 31) {
@@ -869,90 +886,20 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
             st->codec->codec_name[codec_name[0]] = 0;
         }
 
-	    st->codec->bits_per_sample = get_be16(pb); /* depth */
+            st->codec->bits_per_sample = get_be16(pb); /* depth */
             st->codec->color_table_id = get_be16(pb); /* colortable id */
 
 /*          These are set in mov_read_stts and might already be set!
             st->codec->time_base.den      = 25;
             st->codec->time_base.num = 1;
 */
-	    size -= (16+8*4+2+32+2*2);
-#if 0
-	    while (size >= 8) {
-		MOV_atom_t a;
-                int64_t start_pos;
-
-		a.size = get_be32(pb);
-		a.type = get_le32(pb);
-		size -= 8;
-#ifdef DEBUG
-                av_log(NULL, AV_LOG_DEBUG, "VIDEO: atom_type=%c%c%c%c atom.size=%Ld size_left=%d\n",
-                       (a.type >> 0) & 0xff,
-                       (a.type >> 8) & 0xff,
-                       (a.type >> 16) & 0xff,
-                       (a.type >> 24) & 0xff,
-		       a.size, size);
-#endif
-                start_pos = url_ftell(pb);
-
-		switch(a.type) {
-                case MKTAG('e', 's', 'd', 's'):
-                    {
-                        int tag, len;
-                        /* Well, broken but suffisant for some MP4 streams */
-                        get_be32(pb); /* version + flags */
-			len = mov_mp4_read_descr(pb, &tag);
-                        if (tag == 0x03) {
-                            /* MP4ESDescrTag */
-                            get_be16(pb); /* ID */
-                            get_byte(pb); /* priority */
-			    len = mov_mp4_read_descr(pb, &tag);
-                            if (tag != 0x04)
-                                goto fail;
-                            /* MP4DecConfigDescrTag */
-                            get_byte(pb); /* objectTypeId */
-                            get_be32(pb); /* streamType + buffer size */
-			    get_be32(pb); /* max bit rate */
-                            get_be32(pb); /* avg bit rate */
-                            len = mov_mp4_read_descr(pb, &tag);
-                            if (tag != 0x05)
-                                goto fail;
-                            /* MP4DecSpecificDescrTag */
-#ifdef DEBUG
-                            av_log(NULL, AV_LOG_DEBUG, "Specific MPEG4 header len=%d\n", len);
-#endif
-                            sc->header_data = av_mallocz(len);
-                            if (sc->header_data) {
-                                get_buffer(pb, sc->header_data, len);
-				sc->header_len = len;
-                            }
-                        }
-                        /* in any case, skip garbage */
-                    }
-                    break;
-                default:
-                    break;
-                }
-	    fail:
-		av_log(NULL, AV_LOG_DEBUG, "ATOMENEWSIZE %Ld   %d\n", atom.size, url_ftell(pb) - start_pos);
-		if (atom.size > 8) {
-		    url_fskip(pb, (atom.size - 8) -
-			      ((url_ftell(pb) - start_pos)));
-		    size -= atom.size - 8;
-		}
-	    }
-            if (size > 0) {
-                /* unknown extension */
-                url_fskip(pb, size);
-            }
-#else
 
             /* figure out the palette situation */
             color_depth = st->codec->bits_per_sample & 0x1F;
             color_greyscale = st->codec->bits_per_sample & 0x20;
 
             /* if the depth is 2, 4, or 8 bpp, file is palettized */
-            if ((color_depth == 2) || (color_depth == 4) || 
+            if ((color_depth == 2) || (color_depth == 4) ||
                 (color_depth == 8)) {
 
                 if (color_greyscale) {
@@ -1017,16 +964,16 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
             } else
                 st->codec->palctrl = NULL;
 
-            a.size = size;
-	    mov_read_default(c, pb, a);
-#endif
-	} else {
+            a.size = size - (url_ftell(pb) - start_pos);
+            if (a.size > 8)
+                mov_read_default(c, pb, a);
+            else if (a.size > 0)
+                url_fskip(pb, a.size);
+        } else {
             st->codec->codec_id = codec_get_id(mov_audio_tags, format);
-	    if(st->codec->codec_id==CODEC_ID_AMR_NB || st->codec->codec_id==CODEC_ID_AMR_WB) //from TS26.244
-	    {
-#ifdef DEBUG
-               av_log(NULL, AV_LOG_DEBUG, "AMR-NB or AMR-WB audio identified!!\n");
-#endif
+            if(st->codec->codec_id==CODEC_ID_AMR_NB || st->codec->codec_id==CODEC_ID_AMR_WB) //from TS26.244
+            {
+               dprintf("AMR audio identified %d!!\n", st->codec->codec_id);
                get_be32(pb);get_be32(pb); //Reserved_8
                get_be16(pb);//Reserved_2
                get_be16(pb);//Reserved_2
@@ -1035,7 +982,7 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                get_be16(pb);//Reserved_2
 
                 //AMRSpecificBox.(10 bytes)
-               
+
                get_be32(pb); //size
                get_be32(pb); //type=='damr'
                get_be32(pb); //vendor
@@ -1056,9 +1003,9 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                    st->codec->channels=1;
                }
                st->codec->bits_per_sample=16;
-               st->codec->bit_rate=0; /*It is not possible to tell this before we have 
+               st->codec->bit_rate=0; /*It is not possible to tell this before we have
                                        an audio frame and even then every frame can be different*/
-	    }
+            }
             else if( st->codec->codec_tag == MKTAG( 'm', 'p', '4', 's' ))
             {
                 //This is some stuff for the hint track, lets ignore it!
@@ -1080,9 +1027,12 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                 st->codec->bits_per_sample = get_be16(pb); /* bits per sample */
                 get_be32(pb);
                 st->codec->sample_rate = get_be16(pb); /* sample rate, not always correct */
+                if(st->codec->sample_rate == 1) //nonsese rate? -> ignore
+                    st->codec->sample_rate= 0;
+
                 get_be16(pb);
                 c->mp4=1;
-                
+
                 if(mp4_version==1)
                 {
                     url_fskip(pb,16);
@@ -1092,13 +1042,13 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                     a.size=size-(16+20);
 
                 a.offset=url_ftell(pb);
-                                
+
                 mov_read_default(c, pb, a);
 
                 /* Get correct sample rate from extradata */
                 if(st->codec->extradata_size) {
                    const int samplerate_table[] = {
-                     96000, 88200, 64000, 48000, 44100, 32000, 
+                     96000, 88200, 64000, 48000, 44100, 32000,
                      24000, 22050, 16000, 12000, 11025, 8000,
                      7350, 0, 0, 0
                    };
@@ -1122,47 +1072,40 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
                 /* fetch the 36-byte extradata needed for alac decoding */
                 st->codec->extradata_size = 36;
-                st->codec->extradata = (uint8_t*) 
+                st->codec->extradata = (uint8_t*)
                     av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
                 get_buffer(pb, st->codec->extradata, st->codec->extradata_size);
             }
-	    else if(size>=(16+20))
-	    {//16 bytes read, reading atleast 20 more
+            else if(size>=(16+20))
+            {//16 bytes read, reading atleast 20 more
                 uint16_t version;
-#ifdef DEBUG
-                av_log(NULL, AV_LOG_DEBUG, "audio size=0x%X\n",size);
-#endif
                 version = get_be16(pb); /* version */
                 get_be16(pb); /* revision level */
                 get_be32(pb); /* vendor */
 
-                st->codec->channels = get_be16(pb);		/* channel count */
-	        st->codec->bits_per_sample = get_be16(pb);	/* sample size */
+                st->codec->channels = get_be16(pb);             /* channel count */
+                st->codec->bits_per_sample = get_be16(pb);      /* sample size */
 
                 /* handle specific s8 codec */
                 get_be16(pb); /* compression id = 0*/
                 get_be16(pb); /* packet size = 0 */
 
                 st->codec->sample_rate = ((get_be32(pb) >> 16));
-	        //av_log(NULL, AV_LOG_DEBUG, "CODECID %d  %d  %.4s\n", st->codec->codec_id, CODEC_ID_PCM_S16BE, (char*)&format);
 
-	        switch (st->codec->codec_id) {
-	        case CODEC_ID_PCM_S16BE:
-		    if (st->codec->bits_per_sample == 8)
-		        st->codec->codec_id = CODEC_ID_PCM_S8;
+                switch (st->codec->codec_id) {
+                case CODEC_ID_PCM_S16BE:
+                    if (st->codec->bits_per_sample == 8)
+                        st->codec->codec_id = CODEC_ID_PCM_S8;
                     /* fall */
-	        case CODEC_ID_PCM_U8:
-		    st->codec->bit_rate = st->codec->sample_rate * 8;
-		    break;
-	        default:
+                case CODEC_ID_PCM_U8:
+                    st->codec->bit_rate = st->codec->sample_rate * 8;
+                    break;
+                default:
                     ;
-	        }
+                }
 
                 //Read QT version 1 fields. In version 0 theese dont exist
-#ifdef DEBUG
-                av_log(NULL, AV_LOG_DEBUG, "version =%d mp4=%d\n",version,c->mp4);
-                av_log(NULL, AV_LOG_DEBUG, "size-(16+20+16)=%d\n",size-(16+20+16));
-#endif
+                dprintf("version =%d mp4=%d\n",version,c->mp4);
                 if((version==1) && size>=(16+20+16))
                 {
                     get_be32(pb); /* samples per packet */
@@ -1173,13 +1116,6 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                     {
                         //Optional, additional atom-based fields
                         MOV_atom_t a = { format, url_ftell(pb), size - (16 + 20 + 16 + 8) };
-#ifdef DEBUG
-                        av_log(NULL, AV_LOG_DEBUG, "offest=0x%X, sizeleft=%d=0x%x,format=%c%c%c%c\n",(int)url_ftell(pb),size - (16 + 20 + 16 ),size - (16 + 20 + 16 ),
-                            (format >> 0) & 0xff,
-                            (format >> 8) & 0xff,
-                            (format >> 16) & 0xff,
-                            (format >> 24) & 0xff);
-#endif
                         mov_read_default(c, pb, a);
                     }
                 }
@@ -1187,25 +1123,26 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                 {
                     //We should be down to 0 bytes here, but lets make sure.
                     size-=(16+20);
-#ifdef DEBUG
-                    if(size>0)
-                        av_log(NULL, AV_LOG_DEBUG, "skipping 0x%X bytes\n",size-(16+20));
-#endif
-                    url_fskip(pb, size);
+                    if(size>0) {
+                        dprintf("skipping 0x%X bytes\n",size-(16+20));
+                        url_fskip(pb, size);
+                    }
                 }
             }
             else
             {
                 size-=16;
                 //Unknown size, but lets do our best and skip the rest.
-#ifdef DEBUG
-                av_log(NULL, AV_LOG_DEBUG, "Strange size, skipping 0x%X bytes\n",size);
-#endif
+                dprintf("Strange size, skipping 0x%X bytes\n",size);
                 url_fskip(pb, size);
             }
         }
     }
 
+    if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) {
+        st->codec->sample_rate= sc->time_scale;
+    }
+
     return 0;
 }
 
@@ -1215,16 +1152,14 @@ static int mov_read_stsc(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     unsigned int i, entries;
 
-    print_atom("stsc", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
     entries = get_be32(pb);
-    
+
     if(entries >= UINT_MAX / sizeof(MOV_sample_to_chunk_tbl))
         return -1;
-    
+
 #ifdef DEBUG
 av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries);
 #endif
@@ -1236,9 +1171,6 @@ av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1,
         sc->sample_to_chunk[i].first = get_be32(pb);
         sc->sample_to_chunk[i].count = get_be32(pb);
         sc->sample_to_chunk[i].id = get_be32(pb);
-#ifdef DEBUG
-/*        av_log(NULL, AV_LOG_DEBUG, "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); */
-#endif
     }
     return 0;
 }
@@ -1249,16 +1181,14 @@ static int mov_read_stss(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     unsigned int i, entries;
 
-    print_atom("stss", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
     entries = get_be32(pb);
-    
+
     if(entries >= UINT_MAX / sizeof(long))
         return -1;
-    
+
     sc->keyframe_count = entries;
 #ifdef DEBUG
     av_log(NULL, AV_LOG_DEBUG, "keyframe_count = %ld\n", sc->keyframe_count);
@@ -1281,8 +1211,6 @@ static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     unsigned int i, entries;
 
-    print_atom("stsz", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
 
@@ -1312,44 +1240,43 @@ static int mov_read_stsz(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 static int mov_read_stts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     AVStream *st = c->fc->streams[c->fc->nb_streams-1];
-    //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
+    MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     unsigned int i, entries;
     int64_t duration=0;
     int64_t total_sample_count=0;
 
-    print_atom("stts", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
     entries = get_be32(pb);
     if(entries >= UINT_MAX / sizeof(Time2Sample))
         return -1;
 
-    c->streams[c->fc->nb_streams-1]->stts_count = entries;
-    c->streams[c->fc->nb_streams-1]->stts_data = av_malloc(entries * sizeof(Time2Sample));
+    sc->stts_count = entries;
+    sc->stts_data = av_malloc(entries * sizeof(Time2Sample));
 
 #ifdef DEBUG
 av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries);
 #endif
+
+    sc->time_rate=0;
+
     for(i=0; i<entries; i++) {
         int sample_duration;
         int sample_count;
 
         sample_count=get_be32(pb);
         sample_duration = get_be32(pb);
-        c->streams[c->fc->nb_streams - 1]->stts_data[i].count= sample_count;
-        c->streams[c->fc->nb_streams - 1]->stts_data[i].duration= sample_duration;
+        sc->stts_data[i].count= sample_count;
+        sc->stts_data[i].duration= sample_duration;
+
+        sc->time_rate= ff_gcd(sc->time_rate, sample_duration);
+
+        dprintf("sample_count=%d, sample_duration=%d\n",sample_count,sample_duration);
 
-#ifdef DEBUG
-        av_log(NULL, AV_LOG_DEBUG, "sample_count=%d, sample_duration=%d\n",sample_count,sample_duration);
-#endif
         duration+=sample_duration*sample_count;
         total_sample_count+=sample_count;
     }
 
-    av_set_pts_info(st, 64, 1, c->streams[c->fc->nb_streams-1]->time_scale);
-//    st->codec->time_base.num = 1;
-//    st->codec->time_base.den = c->streams[c->fc->nb_streams-1]->time_scale;
     st->nb_frames= total_sample_count;
     if(duration)
         st->duration= duration;
@@ -1358,12 +1285,8 @@ av_log(NULL, AV_LOG_DEBUG, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1,
 
 static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
-//    AVStream *st = c->fc->streams[c->fc->nb_streams-1];
-    //MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
     unsigned int i, entries;
 
-    print_atom("ctts", atom);
-
     get_byte(pb); /* version */
     get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
     entries = get_be32(pb);
@@ -1373,9 +1296,8 @@ static int mov_read_ctts(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     c->streams[c->fc->nb_streams-1]->ctts_count = entries;
     c->streams[c->fc->nb_streams-1]->ctts_data = av_malloc(entries * sizeof(Time2Sample));
 
-// #ifdef DEBUG
-av_log(NULL, AV_LOG_DEBUG, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
-// #endif
+    dprintf("track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
+
     for(i=0; i<entries; i++) {
         c->streams[c->fc->nb_streams - 1]->ctts_data[i].count= get_be32(pb);
         c->streams[c->fc->nb_streams - 1]->ctts_data[i].duration= get_be32(pb);
@@ -1388,13 +1310,11 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     AVStream *st;
     MOVStreamContext *sc;
 
-    print_atom("trak", atom);
-
     st = av_new_stream(c->fc, c->fc->nb_streams);
     if (!st) return -2;
     sc = (MOVStreamContext*) av_mallocz(sizeof(MOVStreamContext));
     if (!sc) {
-	av_free(st);
+        av_free(st);
         return -1;
     }
 
@@ -1411,8 +1331,6 @@ static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     AVStream *st;
 
-    print_atom("tkhd", atom);
-
     st = c->fc->streams[c->fc->nb_streams-1];
 
     get_byte(pb); /* version */
@@ -1456,10 +1374,6 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
     int err;
 
-#ifdef DEBUG
-    print_atom("wide", atom);
-    debug_indent++;
-#endif
     if (atom.size < 8)
         return 0; /* continue */
     if (get_be32(pb) != 0) { /* 0 sized mdat atom... use the 'wide' atom size */
@@ -1474,9 +1388,6 @@ static int mov_read_wide(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         return 0;
     }
     err = mov_read_mdat(c, pb, atom);
-#ifdef DEBUG
-    debug_indent--;
-#endif
     return err;
 }
 
@@ -1495,13 +1406,11 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     long cmov_len, moov_len;
     int ret;
 
-    print_atom("cmov", atom);
-
     get_be32(pb); /* dcom atom */
     if (get_le32(pb) != MKTAG( 'd', 'c', 'o', 'm' ))
         return -1;
     if (get_le32(pb) != MKTAG( 'z', 'l', 'i', 'b' )) {
-        av_log(NULL, AV_LOG_DEBUG, "unknown compression for cmov atom !");
+        av_log(NULL, AV_LOG_ERROR, "unknown compression for cmov atom !");
         return -1;
     }
     get_be32(pb); /* cmvd atom */
@@ -1528,7 +1437,7 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     atom.offset = 0;
     atom.size = moov_len;
 #ifdef DEBUG
-    { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); }
+//    { int fd = open("/tmp/uncompheader.mov", O_WRONLY | O_CREAT); write(fd, moov_data, moov_len); close(fd); }
 #endif
     ret = mov_read_default(c, &ctx, atom);
     av_free(moov_data);
@@ -1542,20 +1451,17 @@ static int mov_read_cmov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 {
   int i, edit_count;
-  print_atom("elst", atom);
 
   get_byte(pb); /* version */
   get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
   edit_count= c->streams[c->fc->nb_streams-1]->edit_count = get_be32(pb);     /* entries */
-  
+
   for(i=0; i<edit_count; i++){
     get_be32(pb); /* Track duration */
     get_be32(pb); /* Media time */
     get_be32(pb); /* Media rate */
   }
-#ifdef DEBUG
-  av_log(NULL, AV_LOG_DEBUG, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
-#endif
+  dprintf("track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
   return 0;
 }
 
@@ -1591,7 +1497,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
 { MKTAG( 's', 'k', 'i', 'p' ), mov_read_leaf },
 { MKTAG( 's', 'm', 'h', 'd' ), mov_read_leaf }, /* sound media info header */
 { MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */
-{ MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC }, 
+{ MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC },
 { MKTAG( 's', 't', 'b', 'l' ), mov_read_default },
 { MKTAG( 's', 't', 'c', 'o' ), mov_read_stco },
 { MKTAG( 's', 't', 'd', 'p' ), mov_read_default },
@@ -1609,7 +1515,7 @@ static const MOVParseTableEntry mov_default_parse_table[] = {
 { MKTAG( 'u', 'r', 'n', ' ' ), mov_read_leaf },
 { MKTAG( 'u', 'u', 'i', 'd' ), mov_read_leaf },
 { MKTAG( 'v', 'm', 'h', 'd' ), mov_read_leaf }, /* video media info header */
-{ MKTAG( 'w', 'a', 'v', 'e' ), mov_read_default },
+{ MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave },
 /* extra mp4 */
 { MKTAG( 'M', 'D', 'E', 'S' ), mov_read_leaf },
 /* QT atoms */
@@ -1645,8 +1551,8 @@ static void mov_free_stream_context(MOVStreamContext *sc)
         av_freep(&sc->sample_to_chunk);
         av_freep(&sc->sample_sizes);
         av_freep(&sc->keyframes);
-        av_freep(&sc->stts_data);        
-        av_freep(&sc->ctts_data);        
+        av_freep(&sc->stts_data);
+        av_freep(&sc->ctts_data);
         av_freep(&sc);
     }
 }
@@ -1714,43 +1620,26 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
     mov->fc = s;
     mov->parse_table = mov_default_parse_table;
-#if 0
-    /* XXX: I think we should auto detect */
-    if(s->iformat->name[1] == 'p')
-        mov->mp4 = 1;
-#endif
+
     if(!url_is_streamed(pb)) /* .mov and .mp4 aren't streamable anyway (only progressive download if moov is before mdat) */
-	atom.size = url_fsize(pb);
+        atom.size = url_fsize(pb);
     else
-	atom.size = 0x7FFFFFFFFFFFFFFFLL;
-
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "filesz=%Ld\n", atom.size);
-#endif
+        atom.size = 0x7FFFFFFFFFFFFFFFLL;
 
     /* check MOV header */
     err = mov_read_default(mov, pb, atom);
     if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
-	av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%lld\n",
-		err, mov->found_moov, mov->found_mdat, url_ftell(pb));
-	return -1;
+        av_log(s, AV_LOG_ERROR, "mov: header not found !!! (err:%d, moov:%d, mdat:%d) pos:%"PRId64"\n",
+                err, mov->found_moov, mov->found_mdat, url_ftell(pb));
+        return -1;
     }
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "on_parse_exit_offset=%d\n", (int) url_ftell(pb));
-#endif
+    dprintf("on_parse_exit_offset=%d\n", (int) url_ftell(pb));
+
     /* some cleanup : make sure we are on the mdat atom */
     if(!url_is_streamed(pb) && (url_ftell(pb) != mov->mdat_offset))
         url_fseek(pb, mov->mdat_offset, SEEK_SET);
 
     mov->next_chunk_offset = mov->mdat_offset; /* initialise reading */
-
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "mdat_reset_offset=%d\n", (int) url_ftell(pb));
-#endif
-
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "streams= %d\n", s->nb_streams);
-#endif
     mov->total_streams = nb = s->nb_streams;
 
 #if 1
@@ -1764,14 +1653,20 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
             i++;
     }
     for(i=0; i<s->nb_streams;i++) {
-        MOVStreamContext *sc;
-        sc = (MOVStreamContext *)s->streams[i]->priv_data;
+        MOVStreamContext *sc = (MOVStreamContext *)s->streams[i]->priv_data;
+
+        if(!sc->time_rate)
+            sc->time_rate=1;
+        av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale);
+
+        if(s->streams[i]->duration != AV_NOPTS_VALUE){
+            assert(s->streams[i]->duration % sc->time_rate == 0);
+            s->streams[i]->duration /= sc->time_rate;
+        }
+
         sc->ffindex = i;
         sc->is_ff_stream = 1;
     }
-#endif
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "real streams= %d\n", s->nb_streams);
 #endif
     return 0;
 }
@@ -1782,6 +1677,7 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
 {
     MOVContext *mov = (MOVContext *) s->priv_data;
     MOVStreamContext *sc;
+    AVStream *st;
     int64_t offset = INT64_MAX;
     int64_t best_dts = INT64_MAX;
     int i, a, b, m;
@@ -1789,15 +1685,12 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
     int idx;
     size = 0x0FFFFFFF;
 
-#ifdef MOV_SPLIT_CHUNKS
     if (mov->partial) {
-	sc = mov->partial;
-	idx = sc->sample_to_chunk_index;
+        sc = mov->partial;
+        idx = sc->sample_to_chunk_index;
 
         if (idx < 0) return 0;
-#ifdef DEBUG
-        fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
-#endif
+        dprintf("sc[ffid %d]->sample_size = %ld\n", sc->ffindex, sc->sample_size);
         //size = sc->sample_sizes[sc->current_sample];
         // that ain't working...
         //size = (sc->sample_size)?sc->sample_size:sc->sample_sizes[sc->current_sample];
@@ -1813,14 +1706,13 @@ static int mov_read_packet(AVFormatContext *s, AVPacket *pkt)
 
         goto readchunk;
     }
-#endif
 
 again:
     sc = 0;
     if(offset == INT64_MAX)
         best_dts= INT64_MAX;
     for(i=0; i<mov->total_streams; i++) {
-	MOVStreamContext *msc = mov->streams[i];
+        MOVStreamContext *msc = mov->streams[i];
 
         if ((msc->next_chunk < msc->chunk_count) && msc->next_chunk >= 0){
             if (msc->sample_to_time_index < msc->stts_count && mov->ni) {
@@ -1838,24 +1730,22 @@ again:
                 }
                 dts = time + (msc->current_sample-1 - sample) * (int64_t)duration;
                 dts = av_rescale(dts, AV_TIME_BASE, msc->time_scale);
-//                av_log(NULL, AV_LOG_DEBUG, "%d %Ld %Ld %Ld \n", i, dts, best_dts, offset);
+                dprintf("stream: %d dts: %Ld best_dts: %Ld offset: %Ld \n", i, dts, best_dts, offset);
                 if(dts < best_dts){
                     best_dts= dts;
                     sc = msc;
                     offset = msc->chunk_offsets[msc->next_chunk];
                 }
             }else{
-            //av_log(NULL, AV_LOG_DEBUG, "MOCHUNK %ld  %d   %p  pos:%Ld\n", mov->streams[i]->next_chunk, mov->total_streams, mov->streams[i], url_ftell(&s->pb));
                 if ((msc->chunk_offsets[msc->next_chunk] < offset)) {
                     sc = msc;
                     offset = msc->chunk_offsets[msc->next_chunk];
-                    //av_log(NULL, AV_LOG_DEBUG, "SELETED  %Ld  i:%d\n", offset, i);
                 }
             }
         }
     }
     if (!sc || offset==INT64_MAX)
-	return -1;
+        return -1;
 
     sc->next_chunk++;
 
@@ -1864,51 +1754,45 @@ again:
         mov->next_chunk_offset = offset;
     }
 
-//av_log(NULL, AV_LOG_DEBUG, "chunk: [%i] %lli -> %lli\n", st_id, mov->next_chunk_offset, offset);
     if(!sc->is_ff_stream || (s->streams[sc->ffindex]->discard >= AVDISCARD_ALL)) {
         url_fskip(&s->pb, (offset - mov->next_chunk_offset));
         mov->next_chunk_offset = offset;
-	offset = INT64_MAX;
+        offset = INT64_MAX;
         goto again;
     }
 
     /* now get the chunk size... */
 
     for(i=0; i<mov->total_streams; i++) {
-	MOVStreamContext *msc = mov->streams[i];
-	if ((msc->next_chunk < msc->chunk_count)
+        MOVStreamContext *msc = mov->streams[i];
+        if ((msc->next_chunk < msc->chunk_count)
             && msc->chunk_offsets[msc->next_chunk] - offset < size
             && msc->chunk_offsets[msc->next_chunk] > offset)
-	    size = msc->chunk_offsets[msc->next_chunk] - offset;
+            size = msc->chunk_offsets[msc->next_chunk] - offset;
     }
 
 #ifdef MOV_MINOLTA_FIX
-    //Make sure that size is according to sample_size (Needed by .mov files 
+    //Make sure that size is according to sample_size (Needed by .mov files
     //created on a Minolta Dimage Xi where audio chunks contains waste data in the end)
     //Maybe we should really not only check sc->sample_size, but also sc->sample_sizes
     //but I have no such movies
-    if (sc->sample_size > 0) { 
+    if (sc->sample_size > 0) {
         int foundsize=0;
         for(i=0; i<(sc->sample_to_chunk_sz); i++) {
             if( (sc->sample_to_chunk[i].first)<=(sc->next_chunk) )
             {
-		// 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;
+                // 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;
+                    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
-            av_log(NULL, AV_LOG_DEBUG, "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);
-#endif
+            dprintf("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);
         }
         if( (foundsize>0) && (foundsize<size) )
         {
-#ifdef DEBUG
-            /*av_log(NULL, AV_LOG_DEBUG, "this size should actually be %d\n",foundsize);*/
-#endif
             size=foundsize;
         }
     }
@@ -1918,11 +1802,10 @@ again:
     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 || sc->sample_size > 100) {
         if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
-	    mov->partial = sc;
+            mov->partial = sc;
             /* we'll have to get those samples before next chunk */
             sc->left_in_chunk = sc->sample_to_chunk[idx].count - 1;
             size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
@@ -1932,12 +1815,9 @@ again:
     }else if(idx + 1 < sc->sample_to_chunk_sz){
         sc->current_sample += sc->sample_size * sc->sample_to_chunk[idx].count;
     }
-#endif
 
 readchunk:
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
-#endif
+    dprintf("chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
     if(size == 0x0FFFFFFF)
         size = mov->mdat_size + mov->mdat_offset - offset;
     if(size < 0)
@@ -1948,53 +1828,42 @@ readchunk:
 
     av_get_packet(&s->pb, pkt, size);
     pkt->stream_index = sc->ffindex;
-    
+
     // If the keyframes table exists, mark any samples that are in the table as key frames.
     // If no table exists, treat very sample as a key frame.
-    if (sc->keyframes) {        
+    if (sc->keyframes) {
         a = 0;
         b = sc->keyframe_count - 1;
-        
+
         while (a < b) {
             m = (a + b + 1) >> 1;
             if (sc->keyframes[m] > sc->current_sample) {
                 b = m - 1;
             } else {
                 a = m;
-            }    
+            }
         }
-        
+
         if (sc->keyframes[a] == sc->current_sample)
             pkt->flags |= PKT_FLAG_KEY;
     }
     else
         pkt->flags |= PKT_FLAG_KEY;
 
-#ifdef DEBUG
-/*
-    av_log(NULL, AV_LOG_DEBUG, "Packet (%d, %ld) ", pkt->stream_index, pkt->size);
-    for(i=0; i<8; i++)
-        av_log(NULL, AV_LOG_DEBUG, "%02x ", pkt->data[i]);
-    for(i=0; i<8; i++)
-        av_log(NULL, AV_LOG_DEBUG, "%c ", (pkt->data[i]) & 0x7F);
-    av_log(NULL, AV_LOG_DEBUG, "\n");
-*/
-#endif
-
     mov->next_chunk_offset = offset + size;
-    
-    /* find the corresponding dts */	 
-    if (sc && sc->sample_to_time_index < sc->stts_count && pkt) {	 
+
+    /* find the corresponding dts */
+    if (sc && sc->sample_to_time_index < sc->stts_count && pkt) {
       unsigned int count;
       uint64_t dts, pts;
       unsigned int duration = sc->stts_data[sc->sample_to_time_index].duration;
       count = sc->stts_data[sc->sample_to_time_index].count;
-      if ((sc->sample_to_time_sample + count) < sc->current_sample) {	 
-        sc->sample_to_time_sample += count;	 
-        sc->sample_to_time_time   += count*duration;	 
-        sc->sample_to_time_index ++;	 
+      if ((sc->sample_to_time_sample + count) < sc->current_sample) {
+        sc->sample_to_time_sample += count;
+        sc->sample_to_time_time   += count*duration;
+        sc->sample_to_time_index ++;
         duration = sc->stts_data[sc->sample_to_time_index].duration;
-      }	 
+      }
       dts = sc->sample_to_time_time + (sc->current_sample-1 - sc->sample_to_time_sample) * (int64_t)duration;
         /* find the corresponding pts */
         if (sc->sample_to_ctime_index < sc->ctts_count) {
@@ -2009,24 +1878,27 @@ readchunk:
             pts = dts + duration;
         }else
             pts = dts;
-        pkt->pts = pts;
-        pkt->dts = dts;
-#ifdef DEBUG
-    av_log(NULL, AV_LOG_DEBUG, "stream #%d smp #%ld dts = %lld pts = %lld (smp:%ld time:%lld idx:%d ent:%d count:%d dur:%d)\n"
-      , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts
-      , sc->sample_to_time_sample
-      , sc->sample_to_time_time
-      , sc->sample_to_time_index
-      , sc->stts_count
-      , count
-      , duration);
-#endif
+
+        st= s->streams[ sc->ffindex ];
+        assert(pts % st->time_base.num == 0);
+        assert(dts % st->time_base.num == 0);
+
+        pkt->pts = pts / st->time_base.num;
+        pkt->dts = dts / st->time_base.num;
+        dprintf("stream #%d smp #%ld dts = %lld pts = %lld (smp:%ld time:%lld idx:%d ent:%d count:%d dur:%d)\n"
+                , pkt->stream_index, sc->current_sample-1, pkt->dts, pkt->pts
+                , sc->sample_to_time_sample
+                , sc->sample_to_time_time
+                , sc->sample_to_time_index
+                , sc->stts_count
+                , count
+                , duration);
     }
 
     return 0;
 }
 
-#if defined(MOV_SPLIT_CHUNKS) && defined(MOV_SEEK)
+#if defined(MOV_SEEK)
 /**
  * Seek method based on the one described in the Appendix C of QTFileFormat.pdf
  */
@@ -2045,9 +1917,9 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
     int64_t sample_file_offset;
     int32_t first_chunk_sample;
     int32_t sample_to_chunk_idx;
-    int sample_to_time_index;	 
-    long sample_to_time_sample = 0;	 
-    uint64_t sample_to_time_time = 0;      
+    int sample_to_time_index;
+    long sample_to_time_sample = 0;
+    uint64_t sample_to_time_time = 0;
     int mov_idx;
 
     // Find the corresponding mov stream
@@ -2060,45 +1932,39 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
     }
     sc = mov->streams[mov_idx];
 
+    sample_time *= s->streams[stream_index]->time_base.num;
+
     // Step 1. Find the edit that contains the requested time (elst)
-    if (sc->edit_count) {
+    if (sc->edit_count && 0) {
         // FIXME should handle edit list
         av_log(s, AV_LOG_ERROR, "mov: does not handle seeking in files that contain edit list (c:%d)\n", sc->edit_count);
         return -1;
     }
 
     // Step 2. Find the corresponding sample using the Time-to-sample atom (stts) */
-#ifdef DEBUG
-  av_log(s, AV_LOG_DEBUG, "Searching for time %li in stream #%i (time_scale=%i)\n", (long)timestamp, mov_idx, sc->time_scale);
-#endif
+    dprintf("Searching for time %li in stream #%i (time_scale=%i)\n", (long)sample_time, mov_idx, sc->time_scale);
     start_time = 0; // FIXME use elst atom
     sample = 1; // sample are 0 based in table
-#ifdef DEBUG
-    av_log(s, AV_LOG_DEBUG, "Searching for sample_time %li \n", (long)sample_time);
-#endif
+
     for (i = 0; i < sc->stts_count; i++) {
         count = sc->stts_data[i].count;
         duration = sc->stts_data[i].duration;
-//av_log(s, AV_LOG_DEBUG, "> sample_time %lli \n", (long)sample_time);                
-//av_log(s, AV_LOG_DEBUG, "> count=%i duration=%i\n", count, duration);        
         if ((start_time + count*duration) > sample_time) {
-            sample_to_time_time = start_time;	 
-            sample_to_time_index = i;	 
-            sample_to_time_sample = sample;         
+            sample_to_time_time = start_time;
+            sample_to_time_index = i;
+            sample_to_time_sample = sample;
             sample += (sample_time - start_time) / duration;
             break;
         }
         sample += count;
         start_time += count * duration;
-    }   
-    sample_to_time_time = start_time;	 
-    sample_to_time_index = i;       
+    }
+    sample_to_time_time = start_time;
+    sample_to_time_index = i;
     /* NOTE: despite what qt doc say, the dt value (Display Time in qt vocabulary) computed with the stts atom
        is a decoding time stamp (dts) not a presentation time stamp. And as usual dts != pts for stream with b frames */
 
-#ifdef DEBUG
-    av_log(s, AV_LOG_DEBUG, "Found time %li at sample #%u\n", (long)sample_time, sample);
-#endif
+    dprintf("Found time %li at sample #%u\n", (long)sample_time, sample);
     if (sample > sc->sample_count) {
         av_log(s, AV_LOG_ERROR, "mov: sample pos is too high, unable to seek (req. sample=%i, sample count=%ld)\n", sample, sc->sample_count);
         return -1;
@@ -2115,9 +1981,6 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
             } else {
                 a = m;
             }
-#ifdef DEBUG
-         // av_log(s, AV_LOG_DEBUG, "a=%i (%i) b=%i (%i) m=%i (%i) stream #%i\n", a, sc->keyframes[a], b, sc->keyframes[b], m, sc->keyframes[m], mov_idx);
-#endif
         }
         // for low latency prob: always use the previous keyframe, just uncomment the next line
         // if (a) a--;
@@ -2125,9 +1988,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
     }
     else
         seek_sample = sample; // else all samples are key frames
-#ifdef DEBUG
-    av_log(s, AV_LOG_DEBUG, "Found nearest keyframe at sample #%i \n", seek_sample);
-#endif
+    dprintf("Found nearest keyframe at sample #%i \n", seek_sample);
 
     // Step 4. Find the chunk of the sample using the Sample-to-chunk-atom (stsc)
     for (first_chunk_sample = 1, i = 0; i < (sc->sample_to_chunk_sz - 1); i++) {
@@ -2140,9 +2001,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
     left_in_chunk = sc->sample_to_chunk[i].count - (seek_sample - first_chunk_sample) % sc->sample_to_chunk[i].count;
     first_chunk_sample += ((seek_sample - first_chunk_sample) / sc->sample_to_chunk[i].count) * sc->sample_to_chunk[i].count;
     sample_to_chunk_idx = i;
-#ifdef DEBUG
-    av_log(s, AV_LOG_DEBUG, "Sample was found in chunk #%i at sample offset %i (idx %i)\n", chunk, seek_sample - first_chunk_sample, sample_to_chunk_idx);
-#endif
+    dprintf("Sample was found in chunk #%i at sample offset %i (idx %i)\n", chunk, seek_sample - first_chunk_sample, sample_to_chunk_idx);
 
     // Step 5. Find the offset of the chunk using the chunk offset atom
     if (!sc->chunk_offsets) {
@@ -2154,9 +2013,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
         return -1;
     }
     chunk_file_offset = sc->chunk_offsets[chunk - 1];
-#ifdef DEBUG
-    av_log(s, AV_LOG_DEBUG, "Chunk file offset is #%llu \n", chunk_file_offset);
-#endif
+    dprintf("Chunk file offset is #%llu \n", chunk_file_offset);
 
     // Step 6. Find the byte offset within the chunk using the sample size atom
     sample_file_offset = chunk_file_offset;
@@ -2167,9 +2024,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
         sample_file_offset += sc->sample_sizes[first_chunk_sample + i - 1];
         }
     }
-#ifdef DEBUG
-    av_log(s, AV_LOG_DEBUG, "Sample file offset is #%llu \n", sample_file_offset);
-#endif
+    dprintf("Sample file offset is #%llu \n", sample_file_offset);
 
     // Step 6. Update the parser
     mov->partial = sc;
@@ -2180,7 +2035,7 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
     sc->next_chunk = chunk; // +1 -1 (zero based)
     sc->sample_to_chunk_index = sample_to_chunk_idx;
 
-    // Update other streams    
+    // Update other streams
     for (i = 0; i<mov->total_streams; i++) {
         MOVStreamContext *msc;
         if (i == mov_idx) continue;
@@ -2195,17 +2050,12 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
             } else {
                 a = m;
             }
-#ifdef DEBUG            
-/*            av_log(s, AV_LOG_DEBUG, "a=%i (%li) b=%i (%li) m=%i (%li) stream #%i\n"
-            , a, (long)msc->chunk_offsets[a], b, (long)msc->chunk_offsets[b], m, (long)msc->chunk_offsets[m],  i); */
-#endif                  
         }
         msc->next_chunk = a;
         if (msc->chunk_offsets[a] < chunk_file_offset && a < (msc->chunk_count-1))
             msc->next_chunk ++;
-#ifdef DEBUG        
-        av_log(s, AV_LOG_DEBUG, "Nearest next chunk for stream #%i is #%i @%lli\n", i, msc->next_chunk+1, msc->chunk_offsets[msc->next_chunk]);
-#endif        
+        dprintf("Nearest next chunk for stream #%i is #%li @%lli\n", i, msc->next_chunk+1, msc->chunk_offsets[msc->next_chunk]);
+
         // Compute sample count and index in the sample_to_chunk table (what a pity)
         msc->sample_to_chunk_index = 0;
         msc->current_sample = 0;
@@ -2216,19 +2066,19 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
         }
         msc->current_sample += (msc->next_chunk - (msc->sample_to_chunk[msc->sample_to_chunk_index].first - 1)) * sc->sample_to_chunk[msc->sample_to_chunk_index].count;
         msc->left_in_chunk = msc->sample_to_chunk[msc->sample_to_chunk_index].count - 1;
-        // Find corresponding position in stts (used later to compute dts)	 
-        sample = 0;	 
-        start_time = 0;	 
-        for (msc->sample_to_time_index = 0; msc->sample_to_time_index < msc->stts_count; msc->sample_to_time_index++) {	 
+        // Find corresponding position in stts (used later to compute dts)
+        sample = 0;
+        start_time = 0;
+        for (msc->sample_to_time_index = 0; msc->sample_to_time_index < msc->stts_count; msc->sample_to_time_index++) {
             count = msc->stts_data[msc->sample_to_time_index].count;
             duration = msc->stts_data[msc->sample_to_time_index].duration;
-            if ((sample + count - 1) > msc->current_sample) {	 
-                msc->sample_to_time_time = start_time;	 
-                msc->sample_to_time_sample = sample;	 
-                break;	 
-            }	 
-            sample += count;	 
-            start_time += count * duration;	 
+            if ((sample + count - 1) > msc->current_sample) {
+                msc->sample_to_time_time = start_time;
+                msc->sample_to_time_sample = sample;
+                break;
+            }
+            sample += count;
+            start_time += count * duration;
         }
         sample = 0;
         for (msc->sample_to_ctime_index = 0; msc->sample_to_ctime_index < msc->ctts_count; msc->sample_to_ctime_index++) {
@@ -2239,11 +2089,9 @@ static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_ti
                 break;
             }
             sample += count;
-        }       
-#ifdef DEBUG        
-        av_log(s, AV_LOG_DEBUG, "Next Sample for stream #%i is #%i @%i\n", i, msc->current_sample + 1, msc->sample_to_chunk_index + 1);
-#endif        
-    }                
+        }
+        dprintf("Next Sample for stream #%i is #%li @%li\n", i, msc->current_sample + 1, msc->sample_to_chunk_index + 1);
+    }
     return 0;
 }
 #endif
@@ -2256,7 +2104,7 @@ static int mov_read_close(AVFormatContext *s)
         mov_free_stream_context(mov->streams[i]);
     /* free color tabs */
     for(i=0; i<mov->ctab_size; i++)
-	av_freep(&mov->ctab[i]);
+        av_freep(&mov->ctab[i]);
     av_freep(&mov->ctab);
     return 0;
 }
@@ -2269,9 +2117,9 @@ static AVInputFormat mov_iformat = {
     mov_read_header,
     mov_read_packet,
     mov_read_close,
-#if defined(MOV_SPLIT_CHUNKS) && defined(MOV_SEEK)
+#if defined(MOV_SEEK)
     mov_read_seek,
-#endif    
+#endif
 };
 
 int mov_init(void)