virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat: Fix ff_interleaved_peek()

Browse Source 
Fixes assertion failures in movenc

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-06-25 02:54:43 +02:00
parent f573acc424
commit 46a60fe184
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/internal.h
View File

@@ -625,9 +625,11 @@ int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint *buf
* The packet is not removed from the interleaving queue, but only * The packet is not removed from the interleaving queue, but only
* a pointer to it is returned. * a pointer to it is returned.
* *
* @param ts_offset the ts difference between packet in the que and the muxer.
*
* @return a pointer to the next packet, or NULL if no packet is queued * @return a pointer to the next packet, or NULL if no packet is queued
* for this stream. * for this stream.
*/ */
const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream); const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream, int64_t *ts_offset);
#endif /* AVFORMAT_INTERNAL_H */ #endif /* AVFORMAT_INTERNAL_H */

6
libavformat/movenc.c
View File

@@ -4314,13 +4314,15 @@ static int mov_flush_fragment(AVFormatContext *s, int force)
for (i = 0; i < s->nb_streams; i++) { for (i = 0; i < s->nb_streams; i++) {
MOVTrack *track = &mov->tracks[i]; MOVTrack *track = &mov->tracks[i];
if (!track->end_reliable) { if (!track->end_reliable) {
const AVPacket *next = ff_interleaved_peek(s, i); int64_t ts_offset;
const AVPacket *next = ff_interleaved_peek(s, i, &ts_offset);
if (next) { if (next) {
track->track_duration = next->dts - track->start_dts; track->track_duration = next->dts - track->start_dts + ts_offset;
if (next->pts != AV_NOPTS_VALUE) if (next->pts != AV_NOPTS_VALUE)
track->end_pts = next->pts; track->end_pts = next->pts;
else else
track->end_pts = next->dts; track->end_pts = next->dts;
track->end_pts += ts_offset;
} }
} }
} }

14
libavformat/mux.c
View File

@@ -1041,12 +1041,20 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
} }
} }
const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream) const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream, int64_t *ts_offset)
{ {
AVPacketList *pktl = s->internal->packet_buffer; AVPacketList *pktl = s->internal->packet_buffer;
while (pktl) { while (pktl) {
if (pktl->pkt.stream_index == stream) if (pktl->pkt.stream_index == stream) {
return &pktl->pkt; AVPacket *pkt = &pktl->pkt;
AVStream *st = s->streams[pkt->stream_index];
*ts_offset = st->mux_ts_offset;
if (s->output_ts_offset)
*ts_offset += av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, st->time_base);
return pkt;
}
pktl = pktl->next; pktl = pktl->next;
} }
return NULL; return NULL;