typedef struct film_sample {
int stream;
- int64_t sample_offset;
unsigned int sample_size;
+ int64_t sample_offset;
int64_t pts;
int keyframe;
} film_sample;
unsigned int version;
} FilmDemuxContext;
-static int film_probe(AVProbeData *p)
+static int film_probe(const AVProbeData *p)
{
if (AV_RB32(&p->buf[0]) != FILM_TAG)
return 0;
film->video_type = AV_CODEC_ID_NONE;
}
+ if (film->video_type == AV_CODEC_ID_NONE && film->audio_type == AV_CODEC_ID_NONE)
+ return AVERROR_INVALIDDATA;
+
/* initialize the decoder streams */
- if (film->video_type) {
+ if (film->video_type != AV_CODEC_ID_NONE) {
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
}
}
- if (film->audio_type) {
+ if (film->audio_type != AV_CODEC_ID_NONE) {
st = avformat_new_stream(s, NULL);
if (!st)
return AVERROR(ENOMEM);
return AVERROR_INVALIDDATA;
film->base_clock = AV_RB32(&scratch[8]);
film->sample_count = AV_RB32(&scratch[12]);
- if(film->sample_count >= UINT_MAX / sizeof(film_sample))
- return -1;
film->sample_table = av_malloc_array(film->sample_count, sizeof(film_sample));
if (!film->sample_table)
return AVERROR(ENOMEM);
} else {
film->sample_table[i].stream = film->video_stream_index;
film->sample_table[i].pts = AV_RB32(&scratch[8]) & 0x7FFFFFFF;
- film->sample_table[i].keyframe = (scratch[8] & 0x80) ? AVINDEX_KEYFRAME : 0;
+ film->sample_table[i].keyframe = (scratch[8] & 0x80) ? 0 : AVINDEX_KEYFRAME;
video_frame_counter++;
- if (film->video_type)
+ if (film->video_type != AV_CODEC_ID_NONE)
av_add_index_entry(s->streams[film->video_stream_index],
film->sample_table[i].sample_offset,
film->sample_table[i].pts,
}
}
- if (film->audio_type)
+ if (film->audio_type != AV_CODEC_ID_NONE)
s->streams[film->audio_stream_index]->duration = audio_frame_counter;
- if (film->video_type)
+ if (film->video_type != AV_CODEC_ID_NONE)
s->streams[film->video_stream_index]->duration = video_frame_counter;
film->current_sample = 0;
FilmDemuxContext *film = s->priv_data;
AVIOContext *pb = s->pb;
film_sample *sample;
+ film_sample *next_sample = NULL;
+ int next_sample_id;
int ret = 0;
if (film->current_sample >= film->sample_count)
sample = &film->sample_table[film->current_sample];
+ /* Find the next sample from the same stream, assuming there is one;
+ * this is used to calculate the duration below */
+ next_sample_id = film->current_sample + 1;
+ while (next_sample == NULL) {
+ if (next_sample_id >= film->sample_count)
+ break;
+
+ next_sample = &film->sample_table[next_sample_id];
+ if (next_sample->stream != sample->stream) {
+ next_sample = NULL;
+ next_sample_id++;
+ }
+ }
+
/* position the stream (will probably be there anyway) */
avio_seek(pb, sample->sample_offset, SEEK_SET);
ret = AVERROR(EIO);
pkt->stream_index = sample->stream;
+ pkt->dts = sample->pts;
pkt->pts = sample->pts;
pkt->flags |= sample->keyframe ? AV_PKT_FLAG_KEY : 0;
+ if (next_sample != NULL)
+ pkt->duration = next_sample->pts - sample->pts;
film->current_sample++;
if (ret < 0)
return ret;
- pos = avio_seek(s->pb, st->index_entries[ret].pos, SEEK_SET);
+ pos = avio_seek(s->pb, st->internal->index_entries[ret].pos, SEEK_SET);
if (pos < 0)
return pos;