* http://www.geocities.com/xhelmboyx/quicktime/formats/qtm-layout.txt
* Apple:
* http://developer.apple.com/documentation/QuickTime/QTFF/
- * http://developer.apple.com/documentation/QuickTime/PDF/QTFileFormat.pdf
+ * http://developer.apple.com/documentation/QuickTime/QTFF/qtff.pdf
* QuickTime is a trademark of Apple (AFAIK :))
*/
{ CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
{ CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
{ CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
+ { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */
/* { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
{ CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
{ CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
{ CODEC_ID_8BPS, MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */
{ CODEC_ID_SMC, MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */
{ CODEC_ID_QTRLE, MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */
+ { 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_NONE, 0 },
};
{ CODEC_ID_MP2, 0x5500736D }, /* MPEG layer 3 *//* XXX: check endianness */
/* { CODEC_ID_OGG_VORBIS, MKTAG('O', 'g', 'g', 'S') }, *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
/* MP4 tags */
- { CODEC_ID_MPEG4AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */
+ { CODEC_ID_AAC, MKTAG('m', 'p', '4', 'a') }, /* MPEG-4 AAC */
/* The standard for mpeg4 audio is still not normalised AFAIK anyway */
{ CODEC_ID_AMR_NB, MKTAG('s', 'a', 'm', 'r') }, /* AMR-NB 3gp */
{ 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 },
};
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 next_chunk;
long chunk_count;
int64_t *chunk_offsets;
- int32_t stts_count;
- uint64_t *stts_data; /* concatenated data from the time-to-sample atom (count|duration) */
- int32_t edit_count; /* number of 'edit' (elst atom) */
+ int stts_count;
+ Time2Sample *stts_data;
+ int ctts_count;
+ Time2Sample *ctts_data;
+ int edit_count; /* number of 'edit' (elst atom) */
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_ctime_index;
+ int sample_to_ctime_sample;
long sample_size;
long sample_count;
long *sample_sizes;
int time_scale;
long current_sample;
long left_in_chunk; /* how many samples before next chunk */
- /* specific MPEG4 header which is added at the beginning of the stream */
- int header_len;
- uint8_t *header_data;
MOV_esds_t esds;
} MOVStreamContext;
int found_mdat; /* we suppose we have enough data to read the file */
int64_t mdat_size;
int64_t mdat_offset;
+ int ni; ///< non interleaved mode
int total_streams;
/* some streams listed here aren't presented to the ffmpeg API, since they aren't either video nor audio
* but we need the info to be able to skip data from those streams in the 'mdat' section
/* empty */;
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);
static int mov_read_ctab(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
{
+#if 1
+ url_fskip(pb, atom.size); // for now
+#else
+ VERY VERY BROKEN, NEVER execute this, needs rewrite
unsigned int len;
MOV_ctab_t *t;
- //url_fskip(pb, atom.size); // for now
c->ctab = av_realloc(c->ctab, ++c->ctab_size);
t = c->ctab[c->ctab_size];
t->seed = get_be32(pb);
if (t->clrs)
get_buffer(pb, t->clrs, len);
}
+#endif
return 0;
}
/* helps parsing the string hereafter... */
c->mp4 = 0;
if(type == MKTAG('v', 'i', 'd', 'e'))
- st->codec.codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
else if(type == MKTAG('s', 'o', 'u', 'n'))
- st->codec.codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
} else if(ctype == 0) { /* MP4 */
/* helps parsing the string hereafter... */
c->mp4 = 1;
if(type == MKTAG('v', 'i', 'd', 'e'))
- st->codec.codec_type = CODEC_TYPE_VIDEO;
+ st->codec->codec_type = CODEC_TYPE_VIDEO;
else if(type == MKTAG('s', 'o', 'u', 'n'))
- st->codec.codec_type = CODEC_TYPE_AUDIO;
+ st->codec->codec_type = CODEC_TYPE_AUDIO;
}
get_be32(pb); /* component manufacture */
get_be32(pb); /* component flags */
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];
#ifdef DEBUG
av_log(NULL, AV_LOG_DEBUG, "Specific MPEG4 header len=%d\n", len);
#endif
- st->codec.extradata = (uint8_t*) av_mallocz(len);
- if (st->codec.extradata) {
- get_buffer(pb, st->codec.extradata, len);
- st->codec.extradata_size = 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;
}
}
}
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
- get_be32(pb); /* duration */
+ c->fc->streams[c->fc->nb_streams-1]->duration= get_be32(pb); /* duration */
get_be16(pb); /* language */
get_be16(pb); /* quality */
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
+ 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);
- st->codec.extradata_size = 0x5a + atom.size;
- st->codec.extradata = (uint8_t*) av_mallocz(st->codec.extradata_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);
+ av_free(st->codec->extradata);
+ st->codec->extradata_size = 0x5a + atom.size;
+ 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);
+ } else
+ 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;
+
+ // 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);
+ //av_log(NULL, AV_LOG_DEBUG, "Reading frma %Ld %s\n", atom.size, (char*)st->codec->extradata);
+ } else
+ url_fskip(pb, atom.size);
+
+ return 0;
+}
+
+static int mov_read_avcC(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;
+
+ 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);
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
- int entries, i;
+ unsigned int i, entries;
print_atom("stco", atom);
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)
}
} 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){
+ int64_t first= sc2->chunk_offsets[0];
+ int64_t last= sc2->chunk_offsets[sc2->chunk_count-1];
+ if(first >= sc->chunk_offsets[entries-1] || last <= sc->chunk_offsets[0])
+ c->ni=1;
+ }
+ }
#ifdef DEBUG
/*
for(i=0; i<entries; i++) {
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];
/* for palette traversal */
int color_depth;
AVCodec *codec;
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",
(format >> 8) & 0xff,
(format >> 16) & 0xff,
(format >> 24) & 0xff,
- st->codec.codec_type);
+ st->codec->codec_type);
#endif
- st->codec.codec_tag = format;
- if(st->codec.codec_type==CODEC_TYPE_VIDEO) {
+ 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;
+ st->codec->codec_id = id;
get_be16(pb); /* version */
get_be16(pb); /* revision level */
get_be32(pb); /* vendor */
get_be32(pb); /* temporal quality */
get_be32(pb); /* spacial quality */
- st->codec.width = get_be16(pb); /* width */
- st->codec.height = get_be16(pb); /* height */
-#if 1
- if (st->codec.codec_id == CODEC_ID_MPEG4) {
- /* in some MPEG4 the width/height are not correct, so
- we ignore this info */
- st->codec.width = 0;
- st->codec.height = 0;
+ if(st->codec->codec_id == CODEC_ID_MPEG4){ //FIXME this is silly
+ get_be16(pb);
+ get_be16(pb);
+ }else{
+ st->codec->width = get_be16(pb); /* width */
+ st->codec->height = get_be16(pb); /* height */
}
-#endif
get_be32(pb); /* horiz resolution */
get_be32(pb); /* vert resolution */
get_be32(pb); /* data size, always 0 */
#ifdef DEBUG
av_log(NULL, AV_LOG_DEBUG, "frames/samples = %d\n", frames_per_sample);
#endif
- get_buffer(pb, (uint8_t *)st->codec.codec_name, 32); /* codec name */
+ 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->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.frame_rate = 25;
- st->codec.frame_rate_base = 1;
+ st->codec->time_base.den = 25;
+ st->codec->time_base.num = 1;
*/
size -= (16+8*4+2+32+2*2);
#if 0
#else
/* figure out the palette situation */
- color_depth = st->codec.bits_per_sample & 0x1F;
- color_greyscale = st->codec.bits_per_sample & 0x20;
+ 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) ||
color_index = 0;
}
- } else if (st->codec.color_table_id & 0x08) {
+ } else if (st->codec->color_table_id & 0x08) {
/* if flag bit 3 is set, use the default palette */
color_count = 1 << color_depth;
}
}
- st->codec.palctrl = &c->palette_control;
- st->codec.palctrl->palette_changed = 1;
+ st->codec->palctrl = &c->palette_control;
+ st->codec->palctrl->palette_changed = 1;
} else
- st->codec.palctrl = NULL;
+ st->codec->palctrl = NULL;
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
+ 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");
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)
+ if(st->codec->codec_id==CODEC_ID_AMR_NB)
{
- st->codec.sample_rate=8000;
- st->codec.channels=1;
+ st->codec->sample_rate=8000;
+ st->codec->channels=1;
}
else //AMR-WB
{
- st->codec.sample_rate=16000;
- st->codec.channels=1;
+ 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
+ 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' ))
+ 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.
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' ))
+ else if( st->codec->codec_tag == MKTAG( 'm', 'p', '4', 'a' ))
{
+ MOV_atom_t a;
+ int mp4_version;
+
/* Handle mp4 audio tag */
- get_be32(pb); /* version */
+ 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 */
+ 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 */
+ 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;
- {
- MOV_atom_t a = { format, url_ftell(pb), size - (20 + 20 + 8) };
+
+ 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) {
+ 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;
+ 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->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);
+
+ /* 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
- uint16_t version = get_be16(pb); /* version */
+ 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);
+ 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) {
+ 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;
+ 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;
+ st->codec->bit_rate = st->codec->sample_rate * 8;
break;
default:
;
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 >> 16) & 0xff,
(format >> 24) & 0xff);
#endif
- MOV_atom_t a = { format, url_ftell(pb), size - (16 + 20 + 16 + 8) };
mov_read_default(c, pb, a);
}
}
}
}
}
+
+ 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;
}
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
- int entries, i;
+ unsigned int i, entries;
print_atom("stsc", atom);
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
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
- int entries, i;
+ unsigned int i, entries;
print_atom("stss", atom);
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);
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
- int entries, i;
+ unsigned int i, entries;
print_atom("stsz", atom);
sc->sample_size = get_be32(pb);
entries = get_be32(pb);
+ if(entries >= UINT_MAX / sizeof(long))
+ return -1;
+
sc->sample_count = entries;
#ifdef DEBUG
av_log(NULL, AV_LOG_DEBUG, "sample_size = %ld sample_count = %ld\n", sc->sample_size, sc->sample_count);
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]); */
+ av_log(NULL, AV_LOG_DEBUG, "sample_sizes[]=%ld\n", sc->sample_sizes[i]);
#endif
}
return 0;
{
AVStream *st = c->fc->streams[c->fc->nb_streams-1];
//MOVStreamContext *sc = (MOVStreamContext *)st->priv_data;
- int entries, i;
+ unsigned int i, entries;
int64_t duration=0;
int64_t total_sample_count=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))
+ return -1;
c->streams[c->fc->nb_streams-1]->stts_count = entries;
- c->streams[c->fc->nb_streams-1]->stts_data = (uint64_t*) av_malloc(entries * sizeof(uint64_t));
+ c->streams[c->fc->nb_streams-1]->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
for(i=0; i<entries; i++) {
- int32_t sample_duration;
- int32_t sample_count;
+ 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] = (uint64_t)sample_count<<32 | (uint64_t)sample_duration;
+ 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;
+
#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;
+ }
-#if 0 //We calculate an average instead, needed by .mp4-files created with nec e606 3g phone
+ st->nb_frames= total_sample_count;
+ if(duration)
+ st->duration= duration;
+ return 0;
+}
- if (!i && st->codec.codec_type==CODEC_TYPE_VIDEO) {
- st->codec.frame_rate_base = sample_duration ? sample_duration : 1;
- st->codec.frame_rate = c->streams[c->fc->nb_streams-1]->time_scale;
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "VIDEO FRAME RATE= %i (sd= %i)\n", st->codec.frame_rate, sample_duration);
-#endif
- }
-#endif
- }
+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;
- /*The stsd atom which contain codec type sometimes comes after the stts so we cannot check for codec_type*/
- if(duration>0)
- {
- av_reduce(
- &st->codec.frame_rate,
- &st->codec.frame_rate_base,
- c->streams[c->fc->nb_streams-1]->time_scale * total_sample_count,
- duration,
- INT_MAX
- );
+ print_atom("ctts", atom);
-#ifdef DEBUG
- av_log(NULL, AV_LOG_DEBUG, "FRAME RATE average (video or audio)= %f (tot sample count= %i ,tot dur= %i timescale=%d)\n", (float)st->codec.frame_rate/st->codec.frame_rate_base,total_sample_count,duration,c->streams[c->fc->nb_streams-1]->time_scale);
-#endif
- }
- else
- {
- st->codec.frame_rate_base = 1;
- st->codec.frame_rate = c->streams[c->fc->nb_streams-1]->time_scale;
+ 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));
+
+// #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);
}
return 0;
}
sc->sample_to_chunk_index = -1;
st->priv_data = sc;
- st->codec.codec_type = CODEC_TYPE_MOV_OTHER;
+ st->codec->codec_type = CODEC_TYPE_MOV_OTHER;
st->start_time = 0; /* XXX: check */
- st->duration = (c->duration * (int64_t)AV_TIME_BASE) / c->time_scale;
c->streams[c->fc->nb_streams-1] = sc;
return mov_read_default(c, pb, atom);
st->id = (int)get_be32(pb); /* track id (NOT 0 !)*/
get_be32(pb); /* reserved */
st->start_time = 0; /* check */
- st->duration = (get_be32(pb) * (int64_t)AV_TIME_BASE) / c->time_scale; /* duration */
+ get_be32(pb); /* highlevel (considering edits) duration in movie timebase */
get_be32(pb); /* reserved */
get_be32(pb); /* reserved */
url_fskip(pb, 36); /* display matrix */
/* those are fixed-point */
- st->codec.width = get_be32(pb) >> 16; /* track width */
- st->codec.height = get_be32(pb) >> 16; /* track height */
+ /*st->codec->width =*/ get_be32(pb) >> 16; /* track width */
+ /*st->codec->height =*/ get_be32(pb) >> 16; /* track height */
return 0;
}
{ MKTAG( 'c', 'o', '6', '4' ), mov_read_stco },
{ MKTAG( 'c', 'p', 'r', 't' ), mov_read_default },
{ MKTAG( 'c', 'r', 'h', 'd' ), mov_read_default },
-{ MKTAG( 'c', 't', 't', 's' ), mov_read_leaf }, /* composition time to sample */
+{ MKTAG( 'c', 't', 't', 's' ), mov_read_ctts }, /* composition time to sample */
{ MKTAG( 'd', 'i', 'n', 'f' ), mov_read_default }, /* data information */
{ MKTAG( 'd', 'p', 'n', 'd' ), mov_read_leaf },
{ MKTAG( 'd', 'r', 'e', 'f' ), mov_read_leaf },
{ MKTAG( 's', 'd', 'h', 'd' ), 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 }, /* Sorrenson extension ??? */
+{ MKTAG( 'S', 'M', 'I', ' ' ), mov_read_smi }, /* Sorenson extension ??? */
+{ 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 },
{ MKTAG( 'u', 'd', 't', 'a' ), mov_read_leaf },
{ MKTAG( 'u', 'r', 'l', ' ' ), mov_read_leaf },
{ MKTAG( 'u', 'r', 'n', ' ' ), mov_read_leaf },
-{ MKTAG( 'u', 'u', 'i', 'd' ), mov_read_default },
+{ 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 */
static void mov_free_stream_context(MOVStreamContext *sc)
{
if(sc) {
- av_free(sc->chunk_offsets);
- av_free(sc->sample_to_chunk);
- av_free(sc->sample_sizes);
- av_free(sc->keyframes);
- av_free(sc->header_data);
- av_free(sc->stts_data);
- av_free(sc);
+ 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(&sc->ctts_data);
+ av_freep(&sc);
}
}
{
unsigned int offset;
uint32_t tag;
+ int score = 0;
/* check file header */
if (p->buf_size <= 12)
for(;;) {
/* ignore invalid offset */
if ((offset + 8) > (unsigned int)p->buf_size)
- return 0;
+ return score;
tag = mov_to_tag(p->buf + offset + 4);
switch(tag) {
+ /* check for obvious tags */
case MKTAG( 'm', 'o', 'o', 'v' ):
- case MKTAG( 'w', 'i', 'd', 'e' ):
- case MKTAG( 'f', 'r', 'e', 'e' ):
case MKTAG( 'm', 'd', 'a', 't' ):
case MKTAG( 'p', 'n', 'o', 't' ): /* detect movs with preview pics like ew.mov and april.mov */
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( 'w', 'i', 'd', 'e' ):
+ case MKTAG( 'f', 'r', 'e', 'e' ):
+ case MKTAG( 'j', 'u', 'n', 'k' ):
+ case MKTAG( 'p', 'i', 'c', 't' ):
+ return AVPROBE_SCORE_MAX - 5;
case MKTAG( 'f', 't', 'y', 'p' ):
case MKTAG( 's', 'k', 'i', 'p' ):
+ case MKTAG( 'u', 'u', 'i', 'd' ):
offset = to_be32(p->buf+offset) + offset;
+ /* if we only find those cause probedata is too small at least rate them */
+ score = AVPROBE_SCORE_MAX - 50;
break;
default:
/* unrecognized tag */
- return 0;
+ return score;
}
}
- return 0;
+ return score;
}
static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
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_filesize(url_fileno(pb));
+ atom.size = url_fsize(pb);
else
atom.size = 0x7FFFFFFFFFFFFFFFLL;
#if 1
for(i=0; i<s->nb_streams;) {
- if(s->streams[i]->codec.codec_type == CODEC_TYPE_MOV_OTHER) {/* not audio, not video, delete */
+ if(s->streams[i]->codec->codec_type == CODEC_TYPE_MOV_OTHER) {/* not audio, not video, delete */
av_free(s->streams[i]);
for(j=i+1; j<s->nb_streams; j++)
s->streams[j-1] = s->streams[j];
{
MOVContext *mov = (MOVContext *) s->priv_data;
MOVStreamContext *sc;
- int64_t offset = 0x0FFFFFFFFFFFFFFFLL;
+ int64_t offset = INT64_MAX;
+ int64_t best_dts = INT64_MAX;
int i, a, b, m;
int size;
+ int idx;
size = 0x0FFFFFFF;
#ifdef MOV_SPLIT_CHUNKS
if (mov->partial) {
-
- int idx;
-
sc = mov->partial;
idx = sc->sample_to_chunk_index;
if (idx < 0) return 0;
- size = sc->sample_sizes[sc->current_sample];
+#ifdef DEBUG
+ fprintf(stderr, "sc[ffid %d]->sample_size = %d\n", sc->ffindex, sc->sample_size);
+#endif
+ //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++;
sc->left_in_chunk--;
again:
sc = 0;
+ if(offset == INT64_MAX)
+ best_dts= INT64_MAX;
for(i=0; i<mov->total_streams; i++) {
MOVStreamContext *msc = mov->streams[i];
- //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->next_chunk < msc->chunk_count) && msc->next_chunk >= 0
- && (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 ((msc->next_chunk < msc->chunk_count) && msc->next_chunk >= 0){
+ if (msc->sample_to_time_index < msc->stts_count && mov->ni) {
+ int64_t dts;
+ int index= msc->sample_to_time_index;
+ int sample= msc->sample_to_time_sample;
+ 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) {
+ sample += count;
+ time += count*duration;
+ index ++;
+ duration = msc->stts_data[index].duration;
+ }
+ 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);
+ 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==0x0FFFFFFFFFFFFFFFLL)
+ if (!sc || offset==INT64_MAX)
return -1;
sc->next_chunk++;
}
//av_log(NULL, AV_LOG_DEBUG, "chunk: [%i] %lli -> %lli\n", st_id, mov->next_chunk_offset, offset);
- if(!sc->is_ff_stream) {
+ 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 = 0x0FFFFFFFFFFFFFFFLL;
+ offset = INT64_MAX;
goto again;
}
for(i=0; i<mov->total_streams; i++) {
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;
}
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) && (sc->sample_size>0) )
+ 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;
+ AVCodecContext* cod = s->streams[sc->ffindex]->codec;
if (sc->sample_size == 1 && (cod->codec_id == CODEC_ID_PCM_S16BE || cod->codec_id == CODEC_ID_PCM_S16LE))
foundsize=(sc->sample_to_chunk[i].count*cod->channels*cod->bits_per_sample)/8;
else
foundsize=sc->sample_to_chunk[i].count*sc->sample_size;
}
#ifdef DEBUG
- /*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);*/
+ 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
}
if( (foundsize>0) && (foundsize<size) )
}
#endif //MOV_MINOLTA_FIX
+ idx = sc->sample_to_chunk_index;
+ 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) {
- int idx = sc->sample_to_chunk_index;
- 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;
+ if (sc->sample_size == 0 || sc->sample_size > 100) {
if (idx >= 0 && sc->sample_to_chunk[idx].count != 1) {
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_sizes[sc->current_sample];
+ 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
readchunk:
-//av_log(NULL, AV_LOG_DEBUG, "chunk: [%i] %lli -> %lli (%i)\n", st_id, offset, offset + size, size);
+#ifdef DEBUG
+ av_log(NULL, AV_LOG_DEBUG, "chunk: %lli -> %lli (%i)\n", offset, offset + size, size);
+#endif
if(size == 0x0FFFFFFF)
size = mov->mdat_size + mov->mdat_offset - offset;
if(size < 0)
return -1;
url_fseek(&s->pb, offset, SEEK_SET);
- //av_log(NULL, AV_LOG_DEBUG, "READCHUNK hlen: %d %d off: %Ld pos:%Ld\n", size, sc->header_len, offset, url_ftell(&s->pb));
- if (sc->header_len > 0) {
- av_new_packet(pkt, size + sc->header_len);
- memcpy(pkt->data, sc->header_data, sc->header_len);
- get_buffer(&s->pb, pkt->data + sc->header_len, size);
- /* free header */
- av_freep(&sc->header_data);
- sc->header_len = 0;
- } else {
- av_new_packet(pkt, size);
- get_buffer(&s->pb, pkt->data, pkt->size);
- }
+ 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.
#ifdef DEBUG
/*
- av_log(NULL, AV_LOG_DEBUG, "Packet (%d, %d, %ld) ", pkt->stream_index, st_id, pkt->size);
+ 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);
- puts("");
+ 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) {
+ 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 ++;
+ 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) {
+ 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) {
+ 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
+ }
return 0;
}
/**
* Seek method based on the one described in the Appendix C of QTFileFormat.pdf
*/
-static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t timestamp)
+static int mov_read_seek(AVFormatContext *s, int stream_index, int64_t sample_time, int flags)
{
MOVContext* mov = (MOVContext *) s->priv_data;
MOVStreamContext* sc;
int32_t i, a, b, m;
- int64_t sample_time;
int64_t start_time;
int32_t seek_sample, sample;
int32_t duration;
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 mov_idx;
// Find the corresponding mov stream
#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
- // convert timestamp from time_base unit to timescale unit
- sample_time = av_rescale( timestamp,
- (int64_t)sc->time_scale * s->streams[stream_index]->time_base.num,
- (int64_t)s->streams[stream_index]->time_base.den);
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 = (uint32_t)(sc->stts_data[i]>>32);
- duration = (uint32_t)(sc->stts_data[i]&0xffff);
+ 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 += (sample_time - start_time) / duration;
break;
}
sample += count;
start_time += count * duration;
}
+ 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 */
// 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--;
seek_sample = sc->keyframes[a];
}
else
}
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++) {
+ 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;
+ }
+ sample = 0;
+ for (msc->sample_to_ctime_index = 0; msc->sample_to_ctime_index < msc->ctts_count; msc->sample_to_ctime_index++) {
+ count = msc->ctts_data[msc->sample_to_ctime_index].count;
+ duration = msc->ctts_data[msc->sample_to_ctime_index].duration;
+ if ((sample + count - 1) > msc->current_sample) {
+ msc->sample_to_ctime_sample = sample;
+ 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
}
static AVInputFormat mov_iformat = {
- "mov,mp4,m4a,3gp",
+ "mov,mp4,m4a,3gp,3g2",
"QuickTime/MPEG4 format",
sizeof(MOVContext),
mov_probe,
projects / ffmpeg / blobdiff