} 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)
av_add_index_entry(s->streams[film->video_stream_index],
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++;