*
* Features and limitations:
* - reads most of the QT files I have (at least the structure),
- * the exceptions are .mov with zlib compressed headers ('cmov' section). It shouldn't be hard to implement.
- * FIXED, Francois Revol, 07/17/2002
- * - ffmpeg has nearly none of the usual QuickTime codecs,
- * although I succesfully dumped raw and mp3 audio tracks off .mov files.
* Sample QuickTime files with mp3 audio can be found at: http://www.3ivx.com/showcase.html
- * - .mp4 parsing is still hazardous, although the format really is QuickTime with some minor changes
- * (to make .mov parser crash maybe ?), despite what they say in the MPEG FAQ at
- * http://mpeg.telecomitalialab.com/faq.htm
* - the code is quite ugly... maybe I won't do it recursive next time :-)
- * - seek is not supported with files that contain edit list
*
* Funny I didn't know about http://sourceforge.net/projects/qt-ffmpeg/
* when coding this :) (it's a writer anyway)
* Here we just use what is needed to read the chunks
*/
-typedef struct MOV_sample_to_chunk_tbl {
- long first;
- long count;
- long id;
-} MOV_sample_to_chunk_tbl;
+typedef struct {
+ int first;
+ int count;
+ int id;
+} MOV_stsc_t;
typedef struct {
uint32_t type;
int64_t size; /* total size (excluding the size and type fields) */
} MOV_atom_t;
-typedef struct MOV_mdat_atom_s {
+typedef struct {
offset_t offset;
int64_t size;
-} MOV_mdat_atom_t;
+} MOV_mdat_t;
struct MOVParseTableEntry;
typedef struct MOVStreamContext {
int ffindex; /* the ffmpeg stream id */
- long next_chunk;
+ int next_chunk;
unsigned int chunk_count;
int64_t *chunk_offsets;
unsigned int stts_count;
- Time2Sample *stts_data;
+ MOV_stts_t *stts_data;
unsigned int ctts_count;
- Time2Sample *ctts_data;
+ MOV_stts_t *ctts_data;
unsigned int edit_count; /* number of 'edit' (elst atom) */
unsigned int sample_to_chunk_sz;
- MOV_sample_to_chunk_tbl *sample_to_chunk;
+ MOV_stsc_t *sample_to_chunk;
int sample_to_ctime_index;
int sample_to_ctime_sample;
unsigned int sample_size;
unsigned int sample_count;
- long *sample_sizes;
+ int *sample_sizes;
unsigned int keyframe_count;
- long *keyframes;
+ int *keyframes;
int time_scale;
int time_rate;
- long current_sample;
+ int current_sample;
unsigned int bytes_per_frame;
unsigned int samples_per_frame;
int dv_audio_container;
+ int pseudo_stream_id;
} MOVStreamContext;
typedef struct MOVContext {
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_offset;
- int total_streams;
- MOVStreamContext *streams[MAX_STREAMS];
-
- const struct MOVParseTableEntry *parse_table; /* could be eventually used to change the table */
- /* NOTE: for recursion save to/ restore from local variable! */
-
AVPaletteControl palette_control;
- MOV_mdat_atom_t *mdat_list;
+ MOV_mdat_t *mdat_list;
int mdat_count;
DVDemuxContext *dv_demux;
AVFormatContext *dv_fctx;
0: continue to parse next atom
-1: error occured, exit
*/
-typedef int (*mov_parse_function)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom);
-
/* links atom IDs to parse functions */
typedef struct MOVParseTableEntry {
uint32_t type;
- mov_parse_function func;
+ int (*parse)(MOVContext *ctx, ByteIOContext *pb, MOV_atom_t atom);
} MOVParseTableEntry;
+static const MOVParseTableEntry mov_default_parse_table[];
+
static int mov_read_default(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
int64_t total_size = 0;
atom.size = INT64_MAX;
while(((total_size + 8) < atom.size) && !url_feof(pb) && !err) {
a.size = atom.size;
- a.type=0L;
+ a.type=0;
if(atom.size >= 8) {
a.size = get_be32(pb);
a.type = get_le32(pb);
}
total_size += 8;
a.offset += 8;
- dprintf(c->fc, "type: %08x %.4s sz: %"PRIx64" %"PRIx64" %"PRIx64"\n", a.type, (char*)&a.type, a.size, atom.size, total_size);
+ dprintf(c->fc, "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;
break;
}
a.size -= 8;
- if(a.size < 0 || a.size > atom.size - total_size)
+ if(a.size < 0)
break;
+ a.size = FFMIN(a.size, atom.size - total_size);
- for (i = 0; c->parse_table[i].type != 0L
- && c->parse_table[i].type != a.type; i++)
+ for (i = 0; mov_default_parse_table[i].type != 0
+ && mov_default_parse_table[i].type != a.type; i++)
/* empty */;
- if (c->parse_table[i].type == 0) { /* skip leaf atoms data */
+ if (mov_default_parse_table[i].type == 0) { /* skip leaf atoms data */
url_fskip(pb, a.size);
} else {
offset_t start_pos = url_ftell(pb);
int64_t left;
- err = (c->parse_table[i].func)(c, pb, a);
+ err = mov_default_parse_table[i].parse(c, pb, a);
+ if (c->found_moov && c->found_mdat)
+ break;
left = a.size - url_ftell(pb) + start_pos;
if (left > 0) /* skip garbage at atom end */
url_fskip(pb, left);
ctype = get_le32(pb);
type = get_le32(pb); /* component subtype */
- dprintf(c->fc, "ctype= %c%c%c%c (0x%08lx)\n", *((char *)&ctype), ((char *)&ctype)[1], ((char *)&ctype)[2], ((char *)&ctype)[3], (long) ctype);
- dprintf(c->fc, "stype= %c%c%c%c\n", *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
+ dprintf(c->fc, "ctype= %c%c%c%c (0x%08x)\n", *((char *)&ctype), ((char *)&ctype)[1],
+ ((char *)&ctype)[2], ((char *)&ctype)[3], (int) ctype);
+ dprintf(c->fc, "stype= %c%c%c%c\n",
+ *((char *)&type), ((char *)&type)[1], ((char *)&type)[2], ((char *)&type)[3]);
if(!ctype)
c->isom = 1;
if(type == MKTAG('v', 'i', 'd', 'e'))
st->codec->codec_id = CODEC_ID_MP2;
else if(type == MKTAG('s', 'u', 'b', 'p')) {
st->codec->codec_type = CODEC_TYPE_SUBTITLE;
- st->codec->codec_id = CODEC_ID_DVD_SUBTITLE;
}
get_be32(pb); /* component manufacture */
get_be32(pb); /* component flags */
return 0;
}
-static int mov_mp4_read_descr_len(ByteIOContext *pb)
+static int mp4_read_descr_len(ByteIOContext *pb)
{
int len = 0;
int count = 4;
return len;
}
-static int mov_mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
+static int mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
{
int len;
*tag = get_byte(pb);
- len = mov_mp4_read_descr_len(pb);
+ len = mp4_read_descr_len(pb);
dprintf(c->fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
return len;
}
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
int tag, len;
- /* Well, broken but suffisant for some MP4 streams */
get_be32(pb); /* version + flags */
- len = mov_mp4_read_descr(c, pb, &tag);
+ len = mp4_read_descr(c, pb, &tag);
if (tag == MP4ESDescrTag) {
get_be16(pb); /* ID */
get_byte(pb); /* priority */
} else
get_be16(pb); /* ID */
- len = mov_mp4_read_descr(c, pb, &tag);
+ len = mp4_read_descr(c, pb, &tag);
if (tag == MP4DecConfigDescrTag) {
int object_type_id = get_byte(pb);
get_byte(pb); /* stream type */
st->codec->codec_id= codec_get_id(ff_mp4_obj_type, object_type_id);
dprintf(c->fc, "esds object type id %d\n", object_type_id);
- len = mov_mp4_read_descr(c, pb, &tag);
+ len = mp4_read_descr(c, pb, &tag);
if (tag == MP4DecSpecificDescrTag) {
dprintf(c->fc, "Specific MPEG4 header len=%d\n", len);
st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);
c->mdat_list[c->mdat_count].size = atom.size;
c->mdat_count++;
c->found_mdat=1;
- c->mdat_offset = atom.offset;
if(c->found_moov)
return 1; /* found both, just go */
url_fskip(pb, atom.size);
/* this atom should contain all header atoms */
static int mov_read_moov(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
- int err;
-
- err = mov_read_default(c, pb, atom);
+ if (mov_read_default(c, pb, atom) < 0)
+ return -1;
/* 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 */
c->found_moov=1;
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
+
+ dprintf(c->fc, "time scale = %i\n", c->time_scale);
+
c->duration = (version == 1) ? get_be64(pb) : get_be32(pb); /* duration */
get_be32(pb); /* preferred scale */
static int mov_read_extradata(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))
+ uint64_t size= (uint64_t)st->codec->extradata_size + atom.size + 8 + FF_INPUT_BUFFER_PADDING_SIZE;
+ uint8_t *buf;
+ if(size > INT_MAX || (uint64_t)atom.size > INT_MAX)
return -1;
- av_free(st->codec->extradata);
- st->codec->extradata_size = atom.size + 8;
- st->codec->extradata = av_mallocz(st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (st->codec->extradata) {
- AV_WL32(st->codec->extradata + 4, atom.type);
- get_buffer(pb, st->codec->extradata + 8, atom.size);
- } else
- url_fskip(pb, atom.size);
+ buf= av_realloc(st->codec->extradata, size);
+ if(!buf)
+ return -1;
+ st->codec->extradata= buf;
+ buf+= st->codec->extradata_size;
+ st->codec->extradata_size= size - FF_INPUT_BUFFER_PADDING_SIZE;
+ AV_WB32( buf , atom.size + 8);
+ AV_WL32( buf + 4, atom.type);
+ get_buffer(pb, buf + 8, atom.size);
return 0;
}
} else
url_fskip(pb, atom.size);
} else if (atom.size > 8) { /* to read frma, esds atoms */
- mov_read_default(c, pb, atom);
+ if (mov_read_default(c, pb, atom) < 0)
+ return -1;
} else
url_fskip(pb, atom.size);
return 0;
}
-static int mov_read_avcC(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+/**
+ * This function reads atom content and puts data in extradata without tag
+ * nor size unlike mov_read_extradata.
+ */
+static int mov_read_glbl(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
uint8_t codec_name[32];
/* for palette traversal */
- int color_depth;
- int color_start;
- int color_count;
- int color_end;
+ unsigned int color_depth;
+ unsigned int color_start;
+ unsigned int color_count;
+ unsigned int color_end;
int color_index;
int color_dec;
int color_greyscale;
- unsigned char *color_table;
- int j;
+ const uint8_t *color_table;
+ int j, pseudo_stream_id;
unsigned char r, g, b;
get_byte(pb); /* version */
entries = get_be32(pb);
- while(entries--) { //Parsing Sample description table
+ for(pseudo_stream_id=0; pseudo_stream_id<entries; pseudo_stream_id++) { //Parsing Sample description table
enum CodecID id;
MOV_atom_t a = { 0, 0, 0 };
offset_t start_pos = url_ftell(pb);
get_be16(pb); /* reserved */
get_be16(pb); /* index */
- if (st->codec->codec_tag) {
- /* multiple fourcc, just skip for now */
+ if (st->codec->codec_tag && st->codec->codec_tag != MKTAG('j', 'p', 'e', 'g')) {
+ /* multiple fourcc, we skip jpeg, this isnt correct, we should export it as
+ seperate AVStream but this needs a few changes in the mov demuxer, patch
+ welcome */
url_fskip(pb, size - (url_ftell(pb) - start_pos));
continue;
}
+ sc->pseudo_stream_id= pseudo_stream_id;
st->codec->codec_tag = format;
id = codec_get_id(codec_movaudio_tags, format);
+ if (id<=0 && (format&0xFFFF) == 'm' + ('s'<<8))
+ id = codec_get_id(codec_wav_tags, bswap_32(format)&0xFFFF);
+
if (st->codec->codec_type != CODEC_TYPE_VIDEO && id > 0) {
st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if (st->codec->codec_type != CODEC_TYPE_AUDIO && /* do not overwrite codec type */
id = codec_get_id(codec_bmp_tags, format);
if (id > 0)
st->codec->codec_type = CODEC_TYPE_VIDEO;
+ else if(st->codec->codec_type == CODEC_TYPE_DATA){
+ id = codec_get_id(ff_codec_movsubtitle_tags, format);
+ if(id > 0)
+ st->codec->codec_type = CODEC_TYPE_SUBTITLE;
+ }
}
- dprintf(c->fc, "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);
+ dprintf(c->fc, "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);
if(st->codec->codec_type==CODEC_TYPE_VIDEO) {
st->codec->codec_id = id;
get_be16(pb); /* revision level */
get_be32(pb); /* vendor */
get_be32(pb); /* temporal quality */
- get_be32(pb); /* spacial quality */
+ get_be32(pb); /* spatial quality */
st->codec->width = get_be16(pb); /* width */
st->codec->height = get_be16(pb); /* height */
get_be32(pb); /* vert resolution */
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);
-#endif
+
+ dprintf(c->fc, "frames/samples = %d\n", frames_per_sample);
+
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]);
/* if the depth is 2, 4, or 8 bpp, file is palettized */
if ((color_depth == 2) || (color_depth == 4) ||
(color_depth == 8)) {
-
if (color_greyscale) {
-
/* compute the greyscale palette */
color_count = 1 << color_depth;
color_index = 255;
if (color_index < 0)
color_index = 0;
}
-
} else if (st->codec->color_table_id & 0x08) {
-
/* if flag bit 3 is set, use the default palette */
color_count = 1 << color_depth;
if (color_depth == 2)
c->palette_control.palette[j] =
(r << 16) | (g << 8) | (b);
}
-
} else {
-
/* load the palette from the file */
color_start = get_be32(pb);
color_count = get_be16(pb);
color_end = get_be16(pb);
- for (j = color_start; j <= color_end; j++) {
- /* each R, G, or B component is 16 bits;
- * only use the top 8 bits; skip alpha bytes
- * up front */
- get_byte(pb);
- get_byte(pb);
- r = get_byte(pb);
- get_byte(pb);
- g = get_byte(pb);
- get_byte(pb);
- b = get_byte(pb);
- get_byte(pb);
- c->palette_control.palette[j] =
- (r << 16) | (g << 8) | (b);
+ if ((color_start <= 255) &&
+ (color_end <= 255)) {
+ for (j = color_start; j <= color_end; j++) {
+ /* each R, G, or B component is 16 bits;
+ * only use the top 8 bits; skip alpha bytes
+ * up front */
+ get_byte(pb);
+ get_byte(pb);
+ r = get_byte(pb);
+ get_byte(pb);
+ g = get_byte(pb);
+ get_byte(pb);
+ b = get_byte(pb);
+ get_byte(pb);
+ c->palette_control.palette[j] =
+ (r << 16) | (g << 8) | (b);
+ }
}
}
-
st->codec->palctrl = &c->palette_control;
st->codec->palctrl->palette_changed = 1;
} else
break;
}
- //Read QT version 1 fields. In version 0 theese dont exist
+ //Read QT version 1 fields. In version 0 these do not exist.
dprintf(c->fc, "version =%d, isom =%d\n",version,c->isom);
if(!c->isom) {
if(version==1) {
st->codec->bits_per_sample = bits_per_sample;
sc->sample_size = (bits_per_sample >> 3) * st->codec->channels;
}
+ } else if(st->codec->codec_type==CODEC_TYPE_SUBTITLE){
+ st->codec->codec_id= id;
} 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)
+ if (a.size > 8) {
+ if (mov_read_default(c, pb, a) < 0)
+ return -1;
+ } else if (a.size > 0)
url_fskip(pb, a.size);
}
st->codec->codec_type = CODEC_TYPE_AUDIO; /* force type after stsd for m1a hdlr */
st->need_parsing = AVSTREAM_PARSE_FULL;
break;
+ case CODEC_ID_ADPCM_MS:
+ case CODEC_ID_ADPCM_IMA_WAV:
+ st->codec->block_align = sc->bytes_per_frame;
+ break;
default:
break;
}
entries = get_be32(pb);
- if(entries >= UINT_MAX / sizeof(MOV_sample_to_chunk_tbl))
+ if(entries >= UINT_MAX / sizeof(MOV_stsc_t))
return -1;
-#ifdef DEBUG
-av_log(NULL, AV_LOG_DEBUG, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries);
-#endif
+ dprintf(c->fc, "track[%i].stsc.entries = %i\n", c->fc->nb_streams-1, entries);
+
sc->sample_to_chunk_sz = entries;
- sc->sample_to_chunk = av_malloc(entries * sizeof(MOV_sample_to_chunk_tbl));
+ sc->sample_to_chunk = av_malloc(entries * sizeof(MOV_stsc_t));
if (!sc->sample_to_chunk)
return -1;
for(i=0; i<entries; i++) {
entries = get_be32(pb);
- if(entries >= UINT_MAX / sizeof(long))
+ if(entries >= UINT_MAX / sizeof(int))
return -1;
sc->keyframe_count = entries;
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "keyframe_count = %d\n", sc->keyframe_count);
-#endif
- sc->keyframes = av_malloc(entries * sizeof(long));
+
+ dprintf(c->fc, "keyframe_count = %d\n", sc->keyframe_count);
+
+ sc->keyframes = av_malloc(entries * sizeof(int));
if (!sc->keyframes)
return -1;
for(i=0; i<entries; i++) {
sc->keyframes[i] = get_be32(pb);
-#ifdef DEBUG
-/* av_log(NULL, AV_LOG_DEBUG, "keyframes[]=%ld\n", sc->keyframes[i]); */
-#endif
+ //dprintf(c->fc, "keyframes[]=%d\n", sc->keyframes[i]);
}
return 0;
}
if (!sc->sample_size) /* do not overwrite value computed in stsd */
sc->sample_size = sample_size;
entries = get_be32(pb);
- if(entries >= UINT_MAX / sizeof(long))
+ if(entries >= UINT_MAX / sizeof(int))
return -1;
sc->sample_count = entries;
if (sample_size)
return 0;
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "sample_size = %d sample_count = %d\n", sc->sample_size, sc->sample_count);
-#endif
- sc->sample_sizes = av_malloc(entries * sizeof(long));
+ dprintf(c->fc, "sample_size = %d sample_count = %d\n", sc->sample_size, sc->sample_count);
+
+ sc->sample_sizes = av_malloc(entries * sizeof(int));
if (!sc->sample_sizes)
return -1;
for(i=0; i<entries; i++) {
sc->sample_sizes[i] = get_be32(pb);
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "sample_sizes[]=%ld\n", sc->sample_sizes[i]);
-#endif
+ dprintf(c->fc, "sample_sizes[]=%d\n", sc->sample_sizes[i]);
}
return 0;
}
get_byte(pb); /* version */
get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
entries = get_be32(pb);
- if(entries >= UINT_MAX / sizeof(Time2Sample))
+ if(entries >= UINT_MAX / sizeof(MOV_stts_t))
return -1;
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->stts_data = av_malloc(entries * sizeof(MOV_stts_t));
+ if (!sc->stts_data)
+ return -1;
+ dprintf(c->fc, "track[%i].stts.entries = %i\n", c->fc->nb_streams-1, entries);
sc->time_rate=0;
get_byte(pb); /* version */
get_byte(pb); get_byte(pb); get_byte(pb); /* flags */
entries = get_be32(pb);
- if(entries >= UINT_MAX / sizeof(Time2Sample))
+ if(entries >= UINT_MAX / sizeof(MOV_stts_t))
return -1;
sc->ctts_count = entries;
- sc->ctts_data = av_malloc(entries * sizeof(Time2Sample));
-
+ sc->ctts_data = av_malloc(entries * sizeof(MOV_stts_t));
+ if (!sc->ctts_data)
+ return -1;
dprintf(c->fc, "track[%i].ctts.entries = %i\n", c->fc->nb_streams-1, entries);
for(i=0; i<entries; i++) {
st->priv_data = sc;
st->codec->codec_type = CODEC_TYPE_DATA;
st->start_time = 0; /* XXX: check */
- c->streams[c->fc->nb_streams-1] = sc;
return mov_read_default(c, pb, atom);
}
+static void mov_parse_udta_string(ByteIOContext *pb, char *str, int size)
+{
+ uint16_t str_size = get_be16(pb); /* string length */;
+
+ get_be16(pb); /* skip language */
+ get_buffer(pb, str, FFMIN(size, str_size));
+}
+
+static int mov_read_udta(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
+{
+ uint64_t end = url_ftell(pb) + atom.size;
+
+ while (url_ftell(pb) + 8 < end) {
+ uint32_t tag_size = get_be32(pb);
+ uint32_t tag = get_le32(pb);
+ uint64_t next = url_ftell(pb) + tag_size - 8;
+
+ if (next > end) // stop if tag_size is wrong
+ break;
+
+ switch (tag) {
+ case MKTAG(0xa9,'n','a','m'):
+ mov_parse_udta_string(pb, c->fc->title, sizeof(c->fc->title));
+ break;
+ case MKTAG(0xa9,'w','r','t'):
+ mov_parse_udta_string(pb, c->fc->author, sizeof(c->fc->author));
+ break;
+ case MKTAG(0xa9,'c','p','y'):
+ mov_parse_udta_string(pb, c->fc->copyright, sizeof(c->fc->copyright));
+ break;
+ case MKTAG(0xa9,'i','n','f'):
+ mov_parse_udta_string(pb, c->fc->comment, sizeof(c->fc->comment));
+ break;
+ default:
+ break;
+ }
+
+ url_fseek(pb, next, SEEK_SET);
+ }
+
+ return 0;
+}
+
static int mov_read_tkhd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
/* edit list atom */
static int mov_read_elst(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
+ MOVStreamContext *sc = c->fc->streams[c->fc->nb_streams-1]->priv_data;
int i, edit_count;
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 */
+ edit_count= sc->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 */
}
- dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, c->streams[c->fc->nb_streams-1]->edit_count);
+ dprintf(c->fc, "track[%i].edit_count = %i\n", c->fc->nb_streams-1, sc->edit_count);
return 0;
}
{ MKTAG( 'e', 'n', 'd', 'a' ), mov_read_enda },
{ MKTAG( 'f', 'i', 'e', 'l' ), mov_read_extradata },
{ MKTAG( 'f', 't', 'y', 'p' ), mov_read_ftyp },
+{ MKTAG( 'g', 'l', 'b', 'l' ), mov_read_glbl },
{ MKTAG( 'h', 'd', 'l', 'r' ), mov_read_hdlr },
{ MKTAG( 'j', 'p', '2', 'h' ), mov_read_extradata },
{ MKTAG( 'm', 'd', 'a', 't' ), mov_read_mdat },
{ MKTAG( 'm', 'v', 'h', 'd' ), mov_read_mvhd },
{ MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */
{ MKTAG( 'a', 'l', 'a', 'c' ), mov_read_extradata }, /* alac specific atom */
-{ MKTAG( 'a', 'v', 'c', 'C' ), mov_read_avcC },
+{ MKTAG( 'a', 'v', 'c', 'C' ), mov_read_glbl },
{ MKTAG( 's', 't', 'b', 'l' ), mov_read_default },
{ MKTAG( 's', 't', 'c', 'o' ), mov_read_stco },
{ MKTAG( 's', 't', 's', 'c' ), mov_read_stsc },
{ MKTAG( 's', 't', 't', 's' ), mov_read_stts },
{ MKTAG( 't', 'k', 'h', 'd' ), mov_read_tkhd }, /* track header */
{ MKTAG( 't', 'r', 'a', 'k' ), mov_read_trak },
+{ MKTAG( 'u', 'd', 't', 'a' ), mov_read_udta },
{ MKTAG( 'w', 'a', 'v', 'e' ), mov_read_wave },
{ MKTAG( 'e', 's', 'd', 's' ), mov_read_esds },
{ MKTAG( 'w', 'i', 'd', 'e' ), mov_read_wide }, /* place holder */
{ MKTAG( 'c', 'm', 'o', 'v' ), mov_read_cmov },
-{ 0L, NULL }
+{ 0, NULL }
};
-static void mov_free_stream_context(MOVStreamContext *sc)
-{
- if(sc) {
- av_freep(&sc->ctts_data);
- av_freep(&sc);
- }
-}
-
/* XXX: is it sufficient ? */
static int mov_probe(AVProbeData *p)
{
case MKTAG( 'u', 'd', 't', 'a' ): /* Packet Video PVAuthor adds this and a lot of more junk */
return AVPROBE_SCORE_MAX;
/* those are more common words, so rate then a bit less */
+ case MKTAG( 'e', 'd', 'i', 'w' ): /* xdcam files have reverted first tags */
case MKTAG( 'w', 'i', 'd', 'e' ):
case MKTAG( 'f', 'r', 'e', 'e' ):
case MKTAG( 'j', 'u', 'n', 'k' ):
st->nb_frames = sc->sample_count;
for (i = 0; i < sc->chunk_count; i++) {
current_offset = sc->chunk_offsets[i];
- if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
+ if (stsc_index + 1 < sc->sample_to_chunk_sz &&
+ i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
stsc_index++;
for (j = 0; j < sc->sample_to_chunk[stsc_index].count; j++) {
if (current_sample >= sc->sample_count) {
stss_index++;
}
sample_size = sc->sample_size > 0 ? sc->sample_size : sc->sample_sizes[current_sample];
- dprintf(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", size %d, distance %d, keyframe %d\n",
- st->index, current_sample, current_offset, current_dts, sample_size, distance, keyframe);
- av_add_index_entry(st, current_offset, current_dts, sample_size, distance, keyframe ? AVINDEX_KEYFRAME : 0);
+ dprintf(mov->fc, "AVIndex stream %d, sample %d, offset %"PRIx64", dts %"PRId64", "
+ "size %d, distance %d, keyframe %d\n", st->index, current_sample,
+ current_offset, current_dts, sample_size, distance, keyframe);
+ if(sc->sample_to_chunk[stsc_index].id - 1 == sc->pseudo_stream_id)
+ av_add_index_entry(st, current_offset, current_dts, sample_size, distance,
+ keyframe ? AVINDEX_KEYFRAME : 0);
current_offset += sample_size;
assert(sc->stts_data[stts_index].duration % sc->time_rate == 0);
current_dts += sc->stts_data[stts_index].duration / sc->time_rate;
}
} else { /* read whole chunk */
unsigned int chunk_samples, chunk_size, chunk_duration;
-
for (i = 0; i < sc->chunk_count; i++) {
current_offset = sc->chunk_offsets[i];
- if (stsc_index + 1 < sc->sample_to_chunk_sz && i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
+ if (stsc_index + 1 < sc->sample_to_chunk_sz &&
+ i + 1 == sc->sample_to_chunk[stsc_index + 1].first)
stsc_index++;
chunk_samples = sc->sample_to_chunk[stsc_index].count;
/* get chunk size */
- if (sc->sample_size > 1 || st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
+ if (sc->sample_size > 1 ||
+ st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
chunk_size = chunk_samples * sc->sample_size;
- else if (sc->samples_per_frame > 0 && (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0))
+ else if (sc->samples_per_frame > 0 &&
+ (chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0))
chunk_size = chunk_samples * sc->bytes_per_frame / sc->samples_per_frame;
else { /* workaround to find nearest next chunk offset */
chunk_size = INT_MAX;
- for (j = 0; j < mov->total_streams; j++) {
- MOVStreamContext *msc = mov->streams[j];
-
+ for (j = 0; j < mov->fc->nb_streams; j++) {
+ MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
for (k = msc->next_chunk; k < msc->chunk_count; k++) {
- if (msc->chunk_offsets[k] > current_offset && msc->chunk_offsets[k] - current_offset < chunk_size) {
+ if (msc->chunk_offsets[k] > current_offset &&
+ msc->chunk_offsets[k] - current_offset < chunk_size) {
chunk_size = msc->chunk_offsets[k] - current_offset;
msc->next_chunk = k;
break;
for (j = 0; j < mov->mdat_count; j++) {
dprintf(mov->fc, "mdat %d, offset %"PRIx64", size %"PRId64", current offset %"PRIx64"\n",
j, mov->mdat_list[j].offset, mov->mdat_list[j].size, current_offset);
- if (mov->mdat_list[j].offset <= current_offset && mov->mdat_list[j].offset + mov->mdat_list[j].size > current_offset)
+ if (mov->mdat_list[j].offset <= current_offset &&
+ mov->mdat_list[j].offset + mov->mdat_list[j].size > current_offset)
chunk_size = mov->mdat_list[j].offset + mov->mdat_list[j].size - current_offset;
}
assert(chunk_size != INT_MAX);
- for (j = 0; j < mov->total_streams; j++) {
- mov->streams[j]->next_chunk = 0;
+ for (j = 0; j < mov->fc->nb_streams; j++) {
+ MOVStreamContext *msc = mov->fc->streams[j]->priv_data;
+ msc->next_chunk = 0;
}
}
av_add_index_entry(st, current_offset, current_dts, chunk_size, 0, AVINDEX_KEYFRAME);
}
}
}
- dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, duration %d\n",
- st->index, i, current_offset, current_dts, chunk_size, chunk_duration);
+ dprintf(mov->fc, "AVIndex stream %d, chunk %d, offset %"PRIx64", dts %"PRId64", size %d, "
+ "duration %d\n", st->index, i, current_offset, current_dts, chunk_size, chunk_duration);
assert(chunk_duration % sc->time_rate == 0);
current_dts += chunk_duration / sc->time_rate;
}
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
{
MOVContext *mov = s->priv_data;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int i, err;
MOV_atom_t atom = { 0, 0, 0 };
mov->fc = s;
- mov->parse_table = mov_default_parse_table;
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);
}
dprintf(mov->fc, "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->total_streams = s->nb_streams;
-
- for(i=0; i<mov->total_streams; i++) {
- MOVStreamContext *sc = mov->streams[i];
+ for(i=0; i<s->nb_streams; i++) {
AVStream *st = s->streams[i];
+ MOVStreamContext *sc = st->priv_data;
/* sanity checks */
if(!sc->stts_count || !sc->chunk_count || !sc->sample_to_chunk_sz ||
(!sc->sample_size && !sc->sample_count)){
mov_build_index(mov, st);
}
- for(i=0; i<mov->total_streams; i++) {
- /* dont need those anymore */
- av_freep(&mov->streams[i]->chunk_offsets);
- av_freep(&mov->streams[i]->sample_to_chunk);
- av_freep(&mov->streams[i]->sample_sizes);
- av_freep(&mov->streams[i]->keyframes);
- av_freep(&mov->streams[i]->stts_data);
+ for(i=0; i<s->nb_streams; i++) {
+ MOVStreamContext *sc = s->streams[i]->priv_data;
+ /* Do not need those anymore. */
+ av_freep(&sc->chunk_offsets);
+ av_freep(&sc->sample_to_chunk);
+ av_freep(&sc->sample_sizes);
+ av_freep(&sc->keyframes);
+ av_freep(&sc->stts_data);
}
av_freep(&mov->mdat_list);
return 0;
int64_t best_dts = INT64_MAX;
int i;
- for (i = 0; i < mov->total_streams; i++) {
- MOVStreamContext *msc = mov->streams[i];
-
- if (s->streams[i]->discard != AVDISCARD_ALL && msc->current_sample < msc->sample_count) {
- AVIndexEntry *current_sample = &s->streams[i]->index_entries[msc->current_sample];
- int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate, AV_TIME_BASE, msc->time_scale);
-
- dprintf(s, "stream %d, sample %ld, dts %"PRId64"\n", i, msc->current_sample, dts);
- if (dts < best_dts) {
+ for (i = 0; i < s->nb_streams; i++) {
+ AVStream *st = s->streams[i];
+ MOVStreamContext *msc = st->priv_data;
+ if (st->discard != AVDISCARD_ALL && msc->current_sample < msc->sample_count) {
+ AVIndexEntry *current_sample = &st->index_entries[msc->current_sample];
+ int64_t dts = av_rescale(current_sample->timestamp * (int64_t)msc->time_rate,
+ AV_TIME_BASE, msc->time_scale);
+ dprintf(s, "stream %d, sample %d, dts %"PRId64"\n", i, msc->current_sample, dts);
+ if (!sample || (url_is_streamed(s->pb) && current_sample->pos < sample->pos) ||
+ (!url_is_streamed(s->pb) &&
+ ((FFABS(best_dts - dts) <= AV_TIME_BASE && current_sample->pos < sample->pos) ||
+ (FFABS(best_dts - dts) > AV_TIME_BASE && dts < best_dts)))) {
sample = current_sample;
best_dts = dts;
sc = msc;
return -1;
/* must be done just before reading, to avoid infinite loop on sample */
sc->current_sample++;
- if (sample->pos >= url_fsize(&s->pb)) {
- av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n", sc->ffindex, sample->pos);
+ if (url_fseek(s->pb, sample->pos, SEEK_SET) != sample->pos) {
+ av_log(mov->fc, AV_LOG_ERROR, "stream %d, offset 0x%"PRIx64": partial file\n",
+ sc->ffindex, sample->pos);
return -1;
}
#ifdef CONFIG_DV_DEMUXER
dprintf(s, "dv audio pkt size %d\n", pkt->size);
} else {
#endif
- url_fseek(&s->pb, sample->pos, SEEK_SET);
- av_get_packet(&s->pb, pkt, sample->size);
+ av_get_packet(s->pb, pkt, sample->size);
#ifdef CONFIG_DV_DEMUXER
if (mov->dv_demux) {
void *pkt_destruct_func = pkt->destruct;
pkt->pts = pkt->dts + sc->ctts_data[sc->sample_to_ctime_index].duration / sc->time_rate;
/* update ctts context */
sc->sample_to_ctime_sample++;
- if (sc->sample_to_ctime_index < sc->ctts_count && sc->ctts_data[sc->sample_to_ctime_index].count == sc->sample_to_ctime_sample) {
+ if (sc->sample_to_ctime_index < sc->ctts_count &&
+ sc->ctts_data[sc->sample_to_ctime_index].count == sc->sample_to_ctime_sample) {
sc->sample_to_ctime_index++;
sc->sample_to_ctime_sample = 0;
}
}
pkt->flags |= sample->flags & AVINDEX_KEYFRAME ? PKT_FLAG_KEY : 0;
pkt->pos = sample->pos;
- dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n", pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration);
+ dprintf(s, "stream %d, pts %"PRId64", dts %"PRId64", pos 0x%"PRIx64", duration %d\n",
+ pkt->stream_index, pkt->pts, pkt->dts, pkt->pos, pkt->duration);
return 0;
}
if (sample < 0) /* not sure what to do */
return -1;
sc->current_sample = sample;
- dprintf(st->codec, "stream %d, found sample %ld\n", st->index, sc->current_sample);
+ dprintf(st->codec, "stream %d, found sample %d\n", st->index, sc->current_sample);
/* adjust ctts index */
if (sc->ctts_data) {
time_sample = 0;
for (i = 0; i < sc->ctts_count; i++) {
- time_sample += sc->ctts_data[i].count;
- if (time_sample >= sc->current_sample) {
+ int next = time_sample + sc->ctts_data[i].count;
+ if (next > sc->current_sample) {
sc->sample_to_ctime_index = i;
- sc->sample_to_ctime_sample = time_sample - sc->current_sample;
+ sc->sample_to_ctime_sample = sc->current_sample - time_sample;
break;
}
+ time_sample = next;
}
}
return sample;
{
int i;
MOVContext *mov = s->priv_data;
- for(i=0; i<mov->total_streams; i++)
- mov_free_stream_context(mov->streams[i]);
+ for(i=0; i<s->nb_streams; i++) {
+ MOVStreamContext *sc = s->streams[i]->priv_data;
+ av_freep(&sc->ctts_data);
+ }
if(mov->dv_demux){
for(i=0; i<mov->dv_fctx->nb_streams; i++){
av_freep(&mov->dv_fctx->streams[i]->codec);