highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mux: Remove pointless timestamp backups

Browse Source 
write_packet() currently saves the original timestamps of the packet it
got and restores them in case writing fails. This is unnecessary as we
are no longer working directly with the user-supplied AVPacket here; and
it is also pointless because the timestamps may already have been
altered before write_packet().

So remove this and add a general comment to the function that timestamps
may be modified; also remove a long outdated comment about side data.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
This commit is contained in:
Andreas Rheinhardt 2019-08-13 04:47:26 +02:00
parent fe251f77c8
commit 148bcc0bc5
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/mux.c
View File

@ -664,8 +664,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
/** /**
* Make timestamps non negative, move side data from payload to internal struct, call muxer, and restore * Shift timestamps and call muxer; the original pts/dts are not kept.
* sidedata.
* *
* FIXME: this function should NEVER get undefined pts/dts beside when the * FIXME: this function should NEVER get undefined pts/dts beside when the
* AVFMT_NOTIMESTAMPS is set. * AVFMT_NOTIMESTAMPS is set.
@ -675,10 +674,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
static int write_packet(AVFormatContext *s, AVPacket *pkt) static int write_packet(AVFormatContext *s, AVPacket *pkt)
{ {
int ret; int ret;
int64_t pts_backup, dts_backup;
pts_backup = pkt->pts;
dts_backup = pkt->dts;
// If the timestamp offsetting below is adjusted, adjust // If the timestamp offsetting below is adjusted, adjust
// ff_interleaved_peek similarly. // ff_interleaved_peek similarly.
@ -753,10 +748,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
ret = s->pb->error; ret = s->pb->error;
} }
if (ret < 0) { if (ret >= 0)
pkt->pts = pts_backup;
pkt->dts = dts_backup;
} else
s->streams[pkt->stream_index]->nb_frames++; s->streams[pkt->stream_index]->nb_frames++;
return ret; return ret;