| Message ID | 20180322024432.98180-2-misty@brew.sh |
|---|---|
| State | Superseded |
| Headers | show |
On 22 March 2018 at 02:44, <misty@brew.sh> wrote: > From: Misty De Meo <mistydemeo@gmail.com> > > --- > Changelog | 1 + > libavformat/segafilm.c | 21 +++++++++++++++++++++ > 2 files changed, 22 insertions(+) > > diff --git a/Changelog b/Changelog > index 7969b414c4..6b3b2bf7fe 100644 > --- a/Changelog > +++ b/Changelog > @@ -47,6 +47,7 @@ version <next>: > - native SBC encoder and decoder > - drmeter audio filter > - hapqa_extract bitstream filter > +- segafilm: set timestamps when demuxing > Changes like these shouldn't be in the changelog. > > > version 3.4: > diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c > index 11768823fc..2237e25dae 100644 > --- a/libavformat/segafilm.c > +++ b/libavformat/segafilm.c > @@ -270,6 +270,8 @@ static int film_read_packet(AVFormatContext *s, > 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) > @@ -277,6 +279,21 @@ static int film_read_packet(AVFormatContext *s, > > 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; > + } > Remove brackets, we don't put them if its a 1 line branch. > + > + 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); > > @@ -287,6 +304,10 @@ static int film_read_packet(AVFormatContext *s, > pkt->stream_index = sample->stream; > pkt->pts = sample->pts; > pkt->flags |= sample->keyframe; > + pkt->dts = sample->pts; > + if (next_sample != NULL) { > + pkt->duration = next_sample->pts - sample->pts; > + } > Same. > > film->current_sample++; > > -- > 2.16.2 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >
From: Misty De Meo <mistydemeo@gmail.com>
OK, requested changes made.
Misty De Meo (1):
Sega FILM: set dts and duration when demuxing
libavformat/segafilm.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/Changelog b/Changelog index 7969b414c4..6b3b2bf7fe 100644 --- a/Changelog +++ b/Changelog @@ -47,6 +47,7 @@ version <next>: - native SBC encoder and decoder - drmeter audio filter - hapqa_extract bitstream filter +- segafilm: set timestamps when demuxing version 3.4: diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 11768823fc..2237e25dae 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -270,6 +270,8 @@ static int film_read_packet(AVFormatContext *s, 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) @@ -277,6 +279,21 @@ static int film_read_packet(AVFormatContext *s, 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); @@ -287,6 +304,10 @@ static int film_read_packet(AVFormatContext *s, pkt->stream_index = sample->stream; pkt->pts = sample->pts; pkt->flags |= sample->keyframe; + pkt->dts = sample->pts; + if (next_sample != NULL) { + pkt->duration = next_sample->pts - sample->pts; + } film->current_sample++;
From: Misty De Meo <mistydemeo@gmail.com> --- Changelog | 1 + libavformat/segafilm.c | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+)