har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/mux: factorize interleaved write_packet

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2020-03-27 00:00:53 +01:00
parent 7a8a5c200b
commit c31ba86c37
1 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
libavformat/mux.c
View File

@ -1125,6 +1125,25 @@ static int do_packet_auto_bsf(AVFormatContext *s, AVPacket *pkt) {
return 1; return 1;
} }
static int interleaved_write_packet(AVFormatContext *s, AVPacket *pkt, int flush)
{
for (;; ) {
AVPacket opkt;
int ret = interleave_packet(s, &opkt, pkt, flush);
if (ret <= 0)
return ret;
pkt = NULL;
ret = write_packet(s, &opkt);
av_packet_unref(&opkt);
if (ret < 0)
return ret;
}
}
int av_write_frame(AVFormatContext *s, AVPacket *in) int av_write_frame(AVFormatContext *s, AVPacket *in)
{ {
AVPacket local_pkt, *pkt = &local_pkt; AVPacket local_pkt, *pkt = &local_pkt;
@ -1220,22 +1239,8 @@ int av_interleaved_write_frame(AVFormatContext *s, AVPacket *pkt)
av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame FLUSH\n"); av_log(s, AV_LOG_TRACE, "av_interleaved_write_frame FLUSH\n");
flush = 1; flush = 1;
} }
return interleaved_write_packet(s, pkt, flush);
for (;; ) {
AVPacket opkt;
int ret = interleave_packet(s, &opkt, pkt, flush);
if (ret <= 0)
return ret;
pkt = NULL;
ret = write_packet(s, &opkt);
av_packet_unref(&opkt);
if (ret < 0)
return ret;
}
fail: fail:
av_packet_unref(pkt); av_packet_unref(pkt);
return ret; return ret;
@ -1245,23 +1250,8 @@ int av_write_trailer(AVFormatContext *s)
{ {
int ret, i; int ret, i;
for (;; ) { ret = interleaved_write_packet(s, NULL, 1);
AVPacket pkt;
ret = interleave_packet(s, &pkt, NULL, 1);
if (ret < 0)
goto fail;
if (!ret)
break;
ret = write_packet(s, &pkt);
av_packet_unref(&pkt);
if (ret < 0)
goto fail;
}
fail:
if (s->oformat->write_trailer) { if (s->oformat->write_trailer) {
if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb)
avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER); avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_TRAILER);