ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avformat/mux: Store pointer to interleavement func in FFFormatContext

Browse Source 
It avoids branches lateron and will allow to easily avoid the overhead
of the linked list currently in use in case there is only one stream.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2021-10-09 16:13:32 +02:00
parent 3188b606d7
commit c03e53aea7
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/internal.h
View File

@ -81,6 +81,12 @@ typedef struct FFFormatContext {
*/
int nb_interleaved_streams;
/**
* The interleavement function in use. Always set for muxers.
*/
int (*interleave_packet)(struct AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet);
/**
* This buffer is only needed when packets were already buffered but
* not decoded, for example to get the codec parameters in MPEG

19
libavformat/mux.c
View File

@ -334,6 +334,9 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
if (par->codec_type != AVMEDIA_TYPE_ATTACHMENT)
si->nb_interleaved_streams++;
}
si->interleave_packet = of->interleave_packet;
if (!si->interleave_packet)
si->interleave_packet = ff_interleave_packet_per_dts;
if (!s->priv_data && of->priv_data_size > 0) {
s->priv_data = av_mallocz(of->priv_data_size);
@ -1054,19 +1057,6 @@ const AVPacket *ff_interleaved_peek(AVFormatContext *s, int stream)
return NULL;
}
/**
* A wrapper around AVOutputFormat.interleave_packet.
* See its documentation for details.
*/
static int interleave_packet(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
{
if (s->oformat->interleave_packet) {
return s->oformat->interleave_packet(s, pkt, flush, has_packet);
} else
return ff_interleave_packet_per_dts(s, pkt, flush, has_packet);
}
static int check_bitstream(AVFormatContext *s, FFStream *sti, AVPacket *pkt)
{
int ret;
@ -1089,8 +1079,9 @@ static int check_bitstream(AVFormatContext *s, FFStream *sti, AVPacket *pkt)
static int interleaved_write_packet(AVFormatContext *s, AVPacket *pkt,
int flush, int has_packet)
{
FFFormatContext *const si = ffformatcontext(s);
for (;; ) {
int ret = interleave_packet(s, pkt, flush, has_packet);
int ret = si->interleave_packet(s, pkt, flush, has_packet);
if (ret <= 0)
return ret;