diff options
| author | Marton Balint <cus@passwd.hu> | 2017-06-04 04:19:33 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2017-06-24 18:51:29 +0200 |
| commit | eeeb595c7f1c78764a1a670b763fa837ab3db2bd (patch) | |
| tree | a2788049373b1f35e9b102acf9fdd88bc5eb1eed /libavformat/mux.c | |
| parent | 09891c53916224abfb07c91064654189c46d034c (diff) | |
| download | ffmpeg-eeeb595c7f1c78764a1a670b763fa837ab3db2bd.tar.gz | |
avformat: make flush_packets a tri-state and set it to -1 (auto) by default
If flushing is not disabled, then mux.c will signal the end of the packets with
an AVIO_DATA_MARKER_FLUSH_POINT, and aviobuf will be able to decide to flush or
not based on the preferred minimum packet size set by the used protocol.
Reviewed-by: Michael Niedermayer <michael@niedermayer.cc>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/mux.c')
| -rw-r--r-- | libavformat/mux.c | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/libavformat/mux.c b/libavformat/mux.c index e1e49a81be..53ad46df42 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -468,6 +468,16 @@ static int init_pts(AVFormatContext *s) return 0; } +static void flush_if_needed(AVFormatContext *s) +{ + if (s->pb && s->pb->error >= 0) { + if (s->flush_packets == 1 || s->flags & AVFMT_FLAG_FLUSH_PACKETS) + avio_flush(s->pb); + else if (s->flush_packets && !(s->oformat->flags & AVFMT_NOFILE)) + avio_write_marker(s->pb, AV_NOPTS_VALUE, AVIO_DATA_MARKER_FLUSH_POINT); + } +} + static int write_header_internal(AVFormatContext *s) { if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) @@ -479,8 +489,7 @@ static int write_header_internal(AVFormatContext *s) s->internal->write_header_ret = ret; if (ret < 0) return ret; - if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS) - avio_flush(s->pb); + flush_if_needed(s); } s->internal->header_written = 1; if (!(s->oformat->flags & AVFMT_NOFILE) && s->pb) @@ -772,8 +781,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } if (s->pb && ret >= 0) { - if (s->flush_packets && s->flags & AVFMT_FLAG_FLUSH_PACKETS) - avio_flush(s->pb); + flush_if_needed(s); if (s->pb->error < 0) ret = s->pb->error; } @@ -932,8 +940,7 @@ int av_write_frame(AVFormatContext *s, AVPacket *pkt) return ret; } ret = s->oformat->write_packet(s, NULL); - if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS) - avio_flush(s->pb); + flush_if_needed(s); if (ret >= 0 && s->pb && s->pb->error < 0) ret = s->pb->error; return ret; |