RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05' 

* commit '785c25443b56adb6dbbb78d68cccbd9bd4a42e05':
  movenc: Apply offsets on timestamps when peeking into interleaving queues

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2016-11-13 22:55:34 +01:00
parent fb40daa7f3 785c25443b
commit 8fad4b4e25
3 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavformat/internal.h
View File

@ -657,14 +657,13 @@ int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint *buf
/**
* Find the next packet in the interleaving queue for the given stream.
* The packet is not removed from the interleaving queue, but only
* a pointer to it is returned.
* The pkt parameter is filled in with the queued packet, including
* references to the data (which the caller is not allowed to keep or
* modify).
*
* @param ts_offset the ts difference between packet in the queue and the muxer.
*
* @return a pointer to the next packet, or NULL if no packet is queued
* for this stream.
* @return 0 if a packet was found, a negative value if no packet was found
*/
const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream, int64_t *ts_offset);
int ff_interleaved_peek(AVFormatContext *s, int stream,
AVPacket *pkt, int add_offset);
#endif /* AVFORMAT_INTERNAL_H */

14
libavformat/movenc.c
View File

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

25
libavformat/mux.c
View File

@ -692,6 +692,8 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
pts_backup = pkt->pts;
dts_backup = pkt->dts;
// If the timestamp offsetting below is adjusted, adjust
// ff_interleaved_peek similarly.
if (s->output_ts_offset) {
AVStream *st = s->streams[pkt->stream_index];
int64_t offset = av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, st->time_base);
@ -1180,23 +1182,30 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out,
}
}
const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream, int64_t *ts_offset)
int ff_interleaved_peek(AVFormatContext *s, int stream,
AVPacket *pkt, int add_offset)
{
AVPacketList *pktl = s->internal->packet_buffer;
while (pktl) {
if (pktl->pkt.stream_index == stream) {
AVPacket *pkt = &pktl->pkt;
AVStream *st = s->streams[pkt->stream_index];
*ts_offset = st->mux_ts_offset;
*pkt = pktl->pkt;
if (add_offset) {
AVStream *st = s->streams[pkt->stream_index];
int64_t 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);
if (s->output_ts_offset)
offset += av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, st->time_base);
return pkt;
if (pkt->dts != AV_NOPTS_VALUE)
pkt->dts += offset;
if (pkt->pts != AV_NOPTS_VALUE)
pkt->pts += offset;
}
return 0;
}
pktl = pktl->next;
}
return NULL;
return AVERROR(ENOENT);
}
/**