[FFmpeg-devel] [PATCH 21/33] fftools/ffmpeg_mux: return errors from of_streamcopy() instead of aborting
Anton Khirnov
anton at khirnov.net
Thu Jul 13 13:55:41 EEST 2023
---
fftools/ffmpeg.h | 2 +-
fftools/ffmpeg_mux.c | 20 ++++++++++++--------
2 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h
index 30020cd0f8..fdee20d6b2 100644
--- a/fftools/ffmpeg.h
+++ b/fftools/ffmpeg.h
@@ -826,7 +826,7 @@ void of_output_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt);
/**
* @param dts predicted packet dts in AV_TIME_BASE_Q
*/
-void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts);
+int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts);
int64_t of_filesize(OutputFile *of);
diff --git a/fftools/ffmpeg_mux.c b/fftools/ffmpeg_mux.c
index 026796f7e6..168e4ec799 100644
--- a/fftools/ffmpeg_mux.c
+++ b/fftools/ffmpeg_mux.c
@@ -383,13 +383,14 @@ fail:
}
-void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
+int of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
{
OutputFile *of = output_files[ost->file_index];
MuxStream *ms = ms_from_ost(ost);
int64_t start_time = (of->start_time == AV_NOPTS_VALUE) ? 0 : of->start_time;
int64_t ost_tb_start_time = av_rescale_q(start_time, AV_TIME_BASE_Q, ost->mux_timebase);
AVPacket *opkt = ms->pkt;
+ int ret;
av_packet_unref(opkt);
@@ -400,26 +401,27 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
// EOF: flush output bitstream filters.
if (!pkt) {
of_output_packet(of, ost, NULL);
- return;
+ return 0;
}
if (!ms->streamcopy_started && !(pkt->flags & AV_PKT_FLAG_KEY) &&
!ms->copy_initial_nonkeyframes)
- return;
+ return 0;
if (!ms->streamcopy_started) {
if (!ms->copy_prior_start &&
(pkt->pts == AV_NOPTS_VALUE ?
dts < ms->ts_copy_start :
pkt->pts < av_rescale_q(ms->ts_copy_start, AV_TIME_BASE_Q, pkt->time_base)))
- return;
+ return 0;
if (of->start_time != AV_NOPTS_VALUE && dts < of->start_time)
- return;
+ return 0;
}
- if (av_packet_ref(opkt, pkt) < 0)
- exit_program(1);
+ ret = av_packet_ref(opkt, pkt);
+ if (ret < 0)
+ return ret;
opkt->time_base = ost->mux_timebase;
@@ -449,13 +451,15 @@ void of_streamcopy(OutputStream *ost, const AVPacket *pkt, int64_t dts)
av_log(NULL, AV_LOG_ERROR,
"Subtitle heartbeat logic failed in %s! (%s)\n",
__func__, av_err2str(ret));
- exit_program(1);
+ return ret;
}
}
of_output_packet(of, ost, opkt);
ms->streamcopy_started = 1;
+
+ return 0;
}
static int thread_stop(Muxer *mux)
--
2.40.1
More information about the ffmpeg-devel
mailing list