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

avformat/mux: return a pointer to the packet in ff_interleaved_peek() 

And make it const, so the caller doesn't attempt to change it.
ff_get_muxer_ts_offset() should be used to get the muxer timestamp offset.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-02-08 19:04:05 -03:00
parent 93e2fa933f
commit d5d6751a55
3 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavformat/internal.h
View File

@ -865,14 +865,10 @@ int ff_bprint_to_codecpar_extradata(AVCodecParameters *par, struct AVBPrint *buf
/**
* Find the next packet in the interleaving queue for the given stream.
* 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).
*
* @return 0 if a packet was found, a negative value if no packet was found
* @return a pointer to a packet if one was found, NULL otherwise.
*/
int ff_interleaved_peek(AVFormatContext *s, int stream,
AVPacket *pkt, int add_offset);
const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream);
int ff_get_muxer_ts_offset(AVFormatContext *s, int stream_index, int64_t *offset);

18
libavformat/movenc.c
View File

@ -5301,15 +5301,19 @@ 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) {
AVPacket pkt;
if (!ff_interleaved_peek(s, i, &pkt, 1)) {
const AVPacket *pkt = ff_interleaved_peek(s, i);
if (pkt) {
int64_t offset, dts, pts;
ff_get_muxer_ts_offset(s, i, &offset);
pts = pkt->pts + offset;
dts = pkt->dts + offset;
if (track->dts_shift != AV_NOPTS_VALUE)
pkt.dts += track->dts_shift;
track->track_duration = pkt.dts - track->start_dts;
if (pkt.pts != AV_NOPTS_VALUE)
track->end_pts = pkt.pts;
dts += track->dts_shift;
track->track_duration = dts - track->start_dts;
if (pts != AV_NOPTS_VALUE)
track->end_pts = pts;
else
track->end_pts = pkt.dts;
track->end_pts = dts;
}
}
}

20
libavformat/mux.c
View File

@ -1062,30 +1062,16 @@ int ff_get_muxer_ts_offset(AVFormatContext *s, int stream_index, int64_t *offset
return 0;
}
int ff_interleaved_peek(AVFormatContext *s, int stream,
AVPacket *pkt, int add_offset)
const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream)
{
AVPacketList *pktl = s->internal->packet_buffer;
while (pktl) {
if (pktl->pkt.stream_index == stream) {
*pkt = pktl->pkt;
if (add_offset) {
AVStream *st = s->streams[pkt->stream_index];
int64_t offset = st->internal->mux_ts_offset;
if (s->output_ts_offset)
offset += av_rescale_q(s->output_ts_offset, AV_TIME_BASE_Q, st->time_base);
if (pkt->dts != AV_NOPTS_VALUE)
pkt->dts += offset;
if (pkt->pts != AV_NOPTS_VALUE)
pkt->pts += offset;
}
return 0;
return &pktl->pkt;
}
pktl = pktl->next;
}
return AVERROR(ENOENT);
return NULL;
}
/**