*
* 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>
* 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*/
/* getting rid of these */
#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 , 221 },
+ { 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 */
/* { CODEC_ID_H263, MKTAG('r', 'a', 'w', ' ') }, *//* Uncompressed RGB */
{ 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('h', 'd', 'v', '3') }, /* HDV produced by FCP */
+ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */
+ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */
+ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */
+ { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/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 50i produced by FCP */
+ //{ CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */
+ { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */
+ //{ CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
{ CODEC_ID_NONE, 0 },
};
static const CodecTag mov_audio_tags[] = {
+ { CODEC_ID_PCM_S32BE, MKTAG('i', 'n', '3', '2') },
+ { 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 */
/* map numeric codes from mdhd atom to ISO 639 */
/* cf. QTFileFormat.pdf p253, qtff.pdf p205 */
-static const char *mov_mdhd_language_map[] = {
+/* 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",
+"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,
+ 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, 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"
};
struct MOVParseTableEntry;
-typedef struct Time2Sample{
- int count;
- int duration;
-}Time2Sample;
-
typedef struct MOVStreamContext {
int ffindex; /* the ffmpeg stream id */
int is_ff_stream; /* Is this stream presented to ffmpeg ? i.e. is this an audio or video stream ? */
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;
int mp4; /* set to 1 as soon as we are sure that the file is an .mp4 file (even some header parsing depends on this) */
AVFormatContext *fc;
int time_scale;
- int duration; /* duration of the longest track */
+ int64_t duration; /* duration of the longest track */
int found_moov; /* when both 'moov' and 'mdat' sections has been found */
int found_mdat; /* we suppose we have enough data to read the file */
int64_t mdat_size;
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)
-{
- 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
-}
-#else
-#define print_atom(a,b)
-#endif
-
-const char *ff_mov_lang_to_iso639(int code)
+static int ff_mov_lang_to_iso639(int code, char *to)
{
+ 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 NULL;
+ return 0;
if (!mov_mdhd_language_map[code])
- return NULL;
- return mov_mdhd_language_map[code];
+ return 0;
+ strncpy(to, mov_mdhd_language_map[code], 4);
+ return 1;
}
-extern int ff_mov_iso639_to_lang(const char *lang); /* for movenc.c */
-int ff_mov_iso639_to_lang(const char *lang)
+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;
- for (i = 0; i < (sizeof(mov_mdhd_language_map)/sizeof(char *)); i++) {
+ 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;
}
- return -1;
+ /* 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); */
int i;
int err = 0;
-#ifdef DEBUG
- print_atom("default", atom);
- debug_indent++;
-#endif
-
a.offset = atom.offset;
if (atom.size < 0)
}
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: %"PRIx64" %"PRIx64" %"PRIx64"\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.offset += 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
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);
}
}
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;
}
uint32_t type;
uint32_t ctype;
- print_atom("hdlr", atom);
-
get_byte(pb); /* version */
get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
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
-
- if(ctype == MKTAG('m', 'h', 'l', 'r')) { /* MOV */
- /* helps parsing the string hereafter... */
+ 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 */
c->mp4 = 0;
- if(type == MKTAG('v', 'i', 'd', 'e'))
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- else if(type == MKTAG('s', 'o', 'u', 'n'))
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- } else if(ctype == 0) { /* MP4 */
- /* helps parsing the string hereafter... */
+ else if(ctype == 0)
c->mp4 = 1;
- if(type == MKTAG('v', 'i', 'd', 'e'))
- st->codec->codec_type = CODEC_TYPE_VIDEO;
- else if(type == MKTAG('s', 'o', 'u', 'n'))
- st->codec->codec_type = CODEC_TYPE_AUDIO;
- }
+ if(type == MKTAG('v', 'i', 'd', 'e'))
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ else if(type == MKTAG('s', 'o', 'u', 'n'))
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
get_be32(pb); /* component manufacture */
get_be32(pb); /* component flags */
get_be32(pb); /* component flags mask */
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));
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;
}
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);
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);
- //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
+ 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);
/* 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;
return 0; /* now go for moov */
}
+static int mov_read_ftyp(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+{
+ uint32_t type = get_le32(pb);
+
+ /* from mplayer */
+ switch (type) {
+ case MKTAG('i', 's', 'o', 'm'):
+ case MKTAG('m', 'p', '4', '1'):
+ case MKTAG('m', 'p', '4', '2'):
+ case MKTAG('3', 'g', 'p', '1'):
+ case MKTAG('3', 'g', 'p', '2'):
+ case MKTAG('3', 'g', '2', 'a'):
+ case MKTAG('3', 'g', 'p', '3'):
+ case MKTAG('3', 'g', 'p', '4'):
+ case MKTAG('3', 'g', 'p', '5'):
+ case MKTAG('m', 'm', 'p', '4'): /* Mobile MP4 */
+ case MKTAG('M', '4', 'A', ' '): /* Apple iTunes AAC-LC Audio */
+ case MKTAG('M', '4', 'P', ' '): /* Apple iTunes AAC-LC Protected Audio */
+ case MKTAG('m', 'j', 'p', '2'): /* Motion Jpeg 2000 */
+ c->mp4 = 1;
+ case MKTAG('q', 't', ' ', ' '):
+ default:
+ av_log(c->fc, AV_LOG_DEBUG, "ISO: File Type Major Brand: %.4s\n",(char *)&type);
+ }
+ get_be32(pb); /* minor version */
+ url_fskip(pb, atom.size - 8);
+ return 0;
+}
+
/* this atom should contain all header atoms */
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 */
static int mov_read_mdhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
- int version;
+ AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+ MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
+ int version = get_byte(pb);
int lang;
- const char *iso639;
- print_atom("mdhd", atom);
- version = get_byte(pb); /* version */
if (version > 1)
return 1; /* unsupported */
get_byte(pb); get_byte(pb);
get_byte(pb); /* flags */
- (version==1)?get_be64(pb):get_be32(pb); /* creation time */
- (version==1)?get_be64(pb):get_be32(pb); /* modification time */
+ if (version == 1) {
+ get_be64(pb);
+ get_be64(pb);
+ } else {
+ get_be32(pb); /* creation time */
+ get_be32(pb); /* modification time */
+ }
- c->streams[c->fc->nb_streams-1]->time_scale = get_be32(pb);
- av_set_pts_info(c->fc->streams[c->fc->nb_streams-1], 64, 1, c->streams[c->fc->nb_streams-1]->time_scale);
-
-#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 = (version==1)?get_be64(pb):get_be32(pb); /* duration */
+ sc->time_scale = get_be32(pb);
+ st->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
lang = get_be16(pb); /* language */
- iso639 = ff_mov_lang_to_iso639(lang);
- if (iso639)
- strncpy(c->fc->streams[c->fc->nb_streams-1]->language, iso639, 4);
+ ff_mov_lang_to_iso639(lang, st->language);
get_be16(pb); /* quality */
return 0;
static int mov_read_mvhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
- print_atom("mvhd", atom);
-
- get_byte(pb); /* version */
+ int version = get_byte(pb); /* version */
get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
- get_be32(pb); /* creation time */
- get_be32(pb); /* modification time */
+ if (version == 1) {
+ get_be64(pb);
+ get_be64(pb);
+ } else {
+ get_be32(pb); /* creation time */
+ get_be32(pb); /* modification time */
+ }
c->time_scale = get_be32(pb); /* time scale */
#ifdef DEBUG
av_log(NULL, AV_LOG_DEBUG, "time scale = %i\n", c->time_scale);
#endif
- c->duration = get_be32(pb); /* duration */
+ c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
get_be32(pb); /* preferred scale */
get_be16(pb); /* preferred volume */
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);
+ dprintf("Reading SMI %"PRId64" %s\n", atom.size, (char*)st->codec->extradata + 0x5a);
} else
url_fskip(pb, atom.size);
return 0;
}
+static int mov_read_enda(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+{
+ AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+ int little_endian = get_be16(pb);
+
+ if (little_endian) {
+ switch (st->codec->codec_id) {
+ case CODEC_ID_PCM_S24BE:
+ st->codec->codec_id = CODEC_ID_PCM_S24LE;
+ break;
+ case CODEC_ID_PCM_S32BE:
+ st->codec->codec_id = CODEC_ID_PCM_S32LE;
+ break;
+ default:
+ break;
+ }
+ }
+ return 0;
+}
+
+static int mov_read_alac(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+{
+ AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+
+ // currently ALAC decoder expect full atom header - so let's fake it
+ // this should be fixed and just ALAC header should be passed
+
+ av_free(st->codec->extradata);
+ st->codec->extradata_size = 36;
+ st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+
+ if (st->codec->extradata) {
+ strcpy(st->codec->extradata + 4, "alac"); // fake
+ get_buffer(pb, st->codec->extradata + 8, 36 - 8);
+ dprintf("Reading alac %d %s\n", st->codec->extradata_size, (char*)st->codec->extradata);
+ } else
+ url_fskip(pb, atom.size);
+ return 0;
+}
+
static int mov_read_wave(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+{
+ offset_t start_pos = url_ftell(pb);
+ 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);
+ /* in any case, skip garbage */
+ url_fskip(pb, atom.size - ((url_ftell(pb) - start_pos)));
+ return 0;
+}
+
+static int mov_read_jp2h(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;
- // 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_size = atom.size + 8;
st->codec->extradata = (uint8_t*) av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+ /* pass all jp2h atom to codec */
if (st->codec->extradata) {
- get_buffer(pb, st->codec->extradata, atom.size);
- //av_log(NULL, AV_LOG_DEBUG, "Reading frma %Ld %s\n", atom.size, (char*)st->codec->extradata);
+ strcpy(st->codec->extradata + 4, "jp2h");
+ get_buffer(pb, st->codec->extradata + 8, atom.size);
} else
url_fskip(pb, atom.size);
-
return 0;
}
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 */
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;
}
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 */
while(entries--) { //Parsing Sample description table
enum CodecID id;
+ MOV_atom_t a = { 0, 0, 0 };
+ offset_t start_pos = url_ftell(pb);
int size = get_be32(pb); /* size */
format = get_le32(pb); /* data format */
get_be16(pb); /* reserved */
get_be16(pb); /* index */
- /* for MPEG4: set codec type by looking for it */
- id = codec_get_id(mov_video_tags, format);
- if (id >= 0) {
- AVCodec *codec;
- codec = avcodec_find_decoder(id);
- if (codec)
- 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
+ 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;
+ id = codec_get_id(mov_audio_tags, format);
+ if (id > 0) {
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
+ } else if (format != MKTAG('m', 'p', '4', 's')) { /* skip old asf mpeg4 tag */
+ id = codec_get_id(mov_video_tags, format);
+ if (id <= 0)
+ id = codec_get_id(codec_bmp_tags, format);
+ if (id > 0)
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
+ }
+
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 */
#ifdef DEBUG
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) {
- memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]);
- st->codec->codec_name[codec_name[0]] = 0;
- }
+ get_buffer(pb, codec_name, 32); /* codec name, pascal string (FIXME: true for mp4?) */
+ if (codec_name[0] <= 31) {
+ memcpy(st->codec->codec_name, &codec_name[1],codec_name[0]);
+ st->codec->codec_name[codec_name[0]] = 0;
+ }
st->codec->bits_per_sample = get_be16(pb); /* depth */
st->codec->color_table_id = get_be16(pb); /* colortable id */
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;
st->codec->palctrl->palette_changed = 1;
} else
st->codec->palctrl = NULL;
+ } else if(st->codec->codec_type==CODEC_TYPE_AUDIO) {
+ uint16_t version = get_be16(pb);
- a.size = size;
- mov_read_default(c, pb, a);
-#endif
- } 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
- get_be32(pb);get_be32(pb); //Reserved_8
- get_be16(pb);//Reserved_2
- get_be16(pb);//Reserved_2
- get_be32(pb);//Reserved_4
- get_be16(pb);//TimeScale
- get_be16(pb);//Reserved_2
-
- //AMRSpecificBox.(10 bytes)
-
- get_be32(pb); //size
- get_be32(pb); //type=='damr'
- get_be32(pb); //vendor
- get_byte(pb); //decoder version
- get_be16(pb); //mode_set
- get_byte(pb); //mode_change_period
- get_byte(pb); //frames_per_sample
-
- st->duration = AV_NOPTS_VALUE;//Not possible to get from this info, must count number of AMR frames
- if(st->codec->codec_id==CODEC_ID_AMR_NB)
- {
- st->codec->sample_rate=8000;
- st->codec->channels=1;
- }
- else //AMR-WB
- {
- st->codec->sample_rate=16000;
- 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
- 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!
- //Do some mp4 auto detect.
- c->mp4=1;
- size-=(16);
- url_fskip(pb, size); /* The mp4s atom also contians a esds atom that we can skip*/
- }
- else if( st->codec->codec_tag == MKTAG( 'm', 'p', '4', 'a' ))
- {
- MOV_atom_t a;
- int mp4_version;
-
- /* Handle mp4 audio tag */
- mp4_version=get_be16(pb);/*version*/
- get_be16(pb); /*revesion*/
- get_be32(pb);
- st->codec->channels = get_be16(pb); /* channels */
- 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;
+ st->codec->codec_id = id;
+ get_be16(pb); /* revision level */
+ get_be32(pb); /* vendor */
- get_be16(pb);
- c->mp4=1;
+ st->codec->channels = get_be16(pb); /* channel count */
+ st->codec->bits_per_sample = get_be16(pb); /* sample size */
+ /* do we need to force to 16 for AMR ? */
- if(mp4_version==1)
- {
- url_fskip(pb,16);
- a.size=size-(16+20+16);
- }
- else
- 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,
- 24000, 22050, 16000, 12000, 11025, 8000,
- 7350, 0, 0, 0
- };
- unsigned char *px = st->codec->extradata;
- // 5 bits objectTypeIndex, 4 bits sampleRateIndex, 4 bits channels
- int samplerate_index = ((px[0] & 7) << 1) + ((px[1] >> 7) & 1);
- st->codec->sample_rate = samplerate_table[samplerate_index];
- st->codec->channels = (px[1] >> 3) & 15;
- }
- }
- else if( st->codec->codec_tag == MKTAG( 'a', 'l', 'a', 'c' ))
- {
- /* Handle alac audio tag + special extradata */
- get_be32(pb); /* version */
- get_be32(pb);
- st->codec->channels = get_be16(pb); /* channels */
- st->codec->bits_per_sample = get_be16(pb); /* bits per sample */
- get_be32(pb);
- st->codec->sample_rate = get_be16(pb);
- get_be16(pb);
+ /* handle specific s8 codec */
+ get_be16(pb); /* compression id = 0*/
+ get_be16(pb); /* packet size = 0 */
- /* fetch the 36-byte extradata needed for alac decoding */
- st->codec->extradata_size = 36;
- 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
- 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 */
-
- /* 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;
- /* fall */
- case CODEC_ID_PCM_U8:
- st->codec->bit_rate = st->codec->sample_rate * 8;
- break;
- default:
- ;
- }
+ st->codec->sample_rate = ((get_be32(pb) >> 16));
- //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
- if((version==1) && size>=(16+20+16))
- {
- get_be32(pb); /* samples per packet */
- get_be32(pb); /* bytes per packet */
- get_be32(pb); /* bytes per frame */
- get_be32(pb); /* bytes per sample */
- if(size>(16+20+16))
- {
- //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);
- }
- }
- else
- {
- //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);
- }
+ switch (st->codec->codec_id) {
+ case CODEC_ID_PCM_S16LE:
+ case CODEC_ID_PCM_S16BE:
+ if (st->codec->bits_per_sample == 8)
+ st->codec->codec_id = CODEC_ID_PCM_S8;
+ st->codec->bit_rate = st->codec->sample_rate * 8;
+ break;
+ case CODEC_ID_PCM_U8:
+ if (st->codec->bits_per_sample == 16)
+ st->codec->codec_id = CODEC_ID_PCM_S16BE;
+ st->codec->bit_rate = st->codec->sample_rate * 8;
+ break;
+ case CODEC_ID_AMR_WB:
+ st->codec->sample_rate = 16000; /* should really we ? */
+ st->codec->channels=1; /* really needed */
+ break;
+ case CODEC_ID_AMR_NB:
+ st->codec->sample_rate = 8000; /* should really we ? */
+ st->codec->channels=1; /* really needed */
+ break;
+ default:
+ break;
}
- 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
- url_fskip(pb, size);
+
+ //Read QT version 1 fields. In version 0 theese dont exist
+ dprintf("version =%d mp4=%d\n",version,c->mp4);
+ if(version==1) {
+ get_be32(pb); /* samples per packet */
+ get_be32(pb); /* bytes per packet */
+ get_be32(pb); /* bytes per frame */
+ get_be32(pb); /* bytes per sample */
+ } else if(version==2) {
+ get_be32(pb); /* sizeof struct only */
+ st->codec->sample_rate = av_int2dbl(get_be64(pb)); /* float 64 */
+ st->codec->channels = get_be32(pb);
+ get_be32(pb); /* always 0x7F000000 */
+ get_be32(pb); /* bits per channel if sound is uncompressed */
+ get_be32(pb); /* lcpm format specific flag */
+ get_be32(pb); /* bytes per audio packet if constant */
+ get_be32(pb); /* lpcm frames per audio packet if constant */
}
+ } else {
+ /* other codec type, just skip (rtp, mp4s, tmcd ...) */
+ url_fskip(pb, size - (url_ftell(pb) - start_pos));
}
+ /* this will read extra atoms at the end (wave, alac, damr, avcC, SMI ...) */
+ 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);
}
if(st->codec->codec_type==CODEC_TYPE_AUDIO && st->codec->sample_rate==0 && sc->time_scale>1) {
st->codec->sample_rate= sc->time_scale;
}
+#ifdef CONFIG_FAAD
+ if(st->codec->codec_id ==CODEC_ID_AAC) {
+ st->codec->sample_rate= 0; /* let faad init parameters properly */
+ }
+#endif
return 0;
}
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 */
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;
}
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 */
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 */
#ifdef DEBUG
av_log(NULL, AV_LOG_DEBUG, "sample_size = %ld sample_count = %ld\n", sc->sample_size, sc->sample_count);
#endif
- if(sc->sample_size)
+ if(sc->sample_size) {
+ /* override sample size for uncompressed sound */
+ switch (st->codec->codec_id) {
+ case CODEC_ID_PCM_S32BE:
+ case CODEC_ID_PCM_S32LE:
+ sc->sample_size = 4 * st->codec->channels;
+ break;
+ case CODEC_ID_PCM_S24BE:
+ case CODEC_ID_PCM_S24LE:
+ sc->sample_size = 3 * st->codec->channels;
+ break;
+ case CODEC_ID_PCM_S16BE:
+ case CODEC_ID_PCM_S16LE:
+ sc->sample_size = 2 * st->codec->channels;
+ break;
+ case CODEC_ID_PCM_MULAW:
+ case CODEC_ID_PCM_ALAW:
+ case CODEC_ID_PCM_S8:
+ case CODEC_ID_PCM_U8:
+ sc->sample_size = 1 * st->codec->channels;
+ break;
+ default:
+ break;
+ }
+ assert(sc->sample_size);
return 0; /* there isn't any table following */
+ }
sc->sample_sizes = (long*) av_malloc(entries * sizeof(long));
if (!sc->sample_sizes)
return -1;
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;
-#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;
+ sc->time_rate= ff_gcd(sc->time_rate, sample_duration);
+
+ dprintf("sample_count=%d, sample_duration=%d\n",sample_count,sample_duration);
+
+ duration+=(int64_t)sample_duration*sample_count;
total_sample_count+=sample_count;
}
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;
+ 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);
if(entries >= UINT_MAX / sizeof(Time2Sample))
return -1;
- c->streams[c->fc->nb_streams-1]->ctts_count = entries;
- c->streams[c->fc->nb_streams-1]->ctts_data = av_malloc(entries * sizeof(Time2Sample));
+ sc->ctts_count = entries;
+ sc->ctts_data = av_malloc(entries * sizeof(Time2Sample));
+
+ dprintf("track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
-// #ifdef DEBUG
-av_log(NULL, AV_LOG_DEBUG, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
-// #endif
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);
+ int count =get_be32(pb);
+ int duration =get_be32(pb);
+
+ sc->ctts_data[i].count = count;
+ sc->ctts_data[i].duration= duration;
+
+ sc->time_rate= ff_gcd(sc->time_rate, duration);
}
return 0;
}
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));
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 */
+ AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+ int version = get_byte(pb);
get_byte(pb); get_byte(pb);
get_byte(pb); /* flags */
MOV_TRACK_IN_POSTER 0x0008
*/
- get_be32(pb); /* creation time */
- get_be32(pb); /* modification time */
+ if (version == 1) {
+ get_be64(pb);
+ get_be64(pb);
+ } else {
+ get_be32(pb); /* creation time */
+ get_be32(pb); /* modification time */
+ }
st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
get_be32(pb); /* reserved */
st->start_time = 0; /* check */
- get_be32(pb); /* highlevel (considering edits) duration in movie timebase */
+ (version == 1) ? get_be64(pb) : get_be32(pb); /* highlevel (considering edits) duration in movie timebase */
get_be32(pb); /* reserved */
get_be32(pb); /* reserved */
{
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 */
return 0;
}
err = mov_read_mdat(c, pb, atom);
-#ifdef DEBUG
- debug_indent--;
-#endif
return err;
}
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 */
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);
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 */
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;
}
{ MKTAG( 'd', 'r', 'e', 'f' ), mov_read_leaf },
{ MKTAG( 'e', 'd', 't', 's' ), mov_read_default },
{ MKTAG( 'e', 'l', 's', 't' ), mov_read_elst },
+{ MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda },
{ MKTAG( 'f', 'r', 'e', 'e' ), mov_read_leaf },
+{ MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp },
{ MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr },
{ MKTAG( 'h', 'i', 'n', 't' ), mov_read_leaf },
{ MKTAG( 'h', 'm', 'h', 'd' ), mov_read_leaf },
{ MKTAG( 'i', 'o', 'd', 's' ), mov_read_leaf },
+{ MKTAG( 'j', 'p', '2', 'h' ), mov_read_jp2h },
{ MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat },
{ MKTAG( 'm', 'd', 'h', 'd' ), mov_read_mdhd },
{ MKTAG( 'm', 'd', 'i', 'a' ), mov_read_default },
{ 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', 'l', 'a', 'c' ), mov_read_alac }, /* alac specific atom */
{ MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC },
{ MKTAG( 's', 't', 'b', 'l' ), mov_read_default },
{ MKTAG( 's', 't', 'c', 'o' ), mov_read_stco },
tag = mov_to_tag(p->buf + offset + 4);
switch(tag) {
/* check for obvious tags */
+ case MKTAG( 'j', 'P', ' ', ' ' ): /* jpeg 2000 signature */
case MKTAG( 'm', 'o', 'o', 'v' ):
case MKTAG( 'm', 'd', 'a', 't' ):
case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */
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);
else
atom.size = 0x7FFFFFFFFFFFFFFFLL;
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "filesz=%Ld\n", atom.size);
-#endif
-
/* check MOV header */
err = mov_read_default(mov, pb, atom);
if (err<0 || (!mov->found_moov && !mov->found_mdat)) {
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
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;
+ if(!sc->time_scale)
+ sc->time_scale= mov->time_scale;
+ 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;
}
{
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;
+ int next_sample= -99;
int size;
int idx;
size = 0x0FFFFFFF;
-#ifdef MOV_SPLIT_CHUNKS
if (mov->partial) {
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];
size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
- sc->current_sample++;
+ next_sample= sc->current_sample+1;
+
sc->left_in_chunk--;
if (sc->left_in_chunk <= 0)
goto readchunk;
}
-#endif
again:
sc = 0;
int time= msc->sample_to_time_time;
int duration = msc->stts_data[index].duration;
int count = msc->stts_data[index].count;
- if (sample + count < msc->current_sample) {
+ if (sample + count <= msc->current_sample) {
sample += count;
time += count*duration;
index ++;
duration = msc->stts_data[index].duration;
}
- dts = time + (msc->current_sample-1 - sample) * (int64_t)duration;
+ dts = time + (msc->current_sample - 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: %"PRId64" best_dts: %"PRId64" offset: %"PRId64"\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);
}
}
}
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;
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;
- 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*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;
}
}
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) {
size = (sc->sample_size > 1)?sc->sample_size:sc->sample_sizes[sc->current_sample];
}
- sc->current_sample++;
- }else if(idx + 1 < sc->sample_to_chunk_sz){
- sc->current_sample += sc->sample_size * sc->sample_to_chunk[idx].count;
- }
-#endif
+ next_sample= sc->current_sample+1;
+ }else if(idx < sc->sample_to_chunk_sz){
+ next_sample= sc->current_sample + sc->sample_to_chunk[idx].count;
+ }else
+ next_sample= sc->current_sample;
readchunk:
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
-#endif
+ dprintf("chunk: %"PRId64" -> %"PRId64" (%i)\n", offset, offset + size, size);
if(size == 0x0FFFFFFF)
size = mov->mdat_size + mov->mdat_offset - offset;
if(size < 0)
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 */
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) {
+ 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;
+ dts = sc->sample_to_time_time + (sc->current_sample - sc->sample_to_time_sample) * (int64_t)duration;
/* find the corresponding pts */
if (sc->sample_to_ctime_index < sc->ctts_count) {
int duration = sc->ctts_data[sc->sample_to_ctime_index].duration;
int count = sc->ctts_data[sc->sample_to_ctime_index].count;
- if ((sc->sample_to_ctime_sample + count) < sc->current_sample) {
+ if ((sc->sample_to_ctime_sample + count) <= sc->current_sample) {
sc->sample_to_ctime_sample += count;
sc->sample_to_ctime_index ++;
duration = sc->ctts_data[sc->sample_to_ctime_index].duration;
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 = %"PRId64" pts = %"PRId64" (smp:%ld time:%"PRId64" 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);
}
+ assert(next_sample>=0);
+ sc->current_sample= next_sample;
+
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
*/
}
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;
/* 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;
} 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--;
}
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++) {
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) {
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 #%"PRIu64"\n", chunk_file_offset);
// Step 6. Find the byte offset within the chunk using the sample size atom
sample_file_offset = chunk_file_offset;
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 #%"PRIu64"\n", sample_file_offset);
// Step 6. Update the parser
mov->partial = sc;
} 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 @%"PRId64"\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;
}
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;
}
}
static AVInputFormat mov_iformat = {
- "mov,mp4,m4a,3gp,3g2",
- "QuickTime/MPEG4 format",
+ "mov,mp4,m4a,3gp,3g2,mj2",
+ "QuickTime/MPEG4/Motion JPEG 2000 format",
sizeof(MOVContext),
mov_probe,
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
};
projects / ffmpeg / blobdiff