RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-26 01:03:07 +00:00
Code Issues Projects Releases Wiki Activity

fftools/ffmpeg_mux: return errors from of_submit_packet()

Browse Source 
Do not call exit_program(), as that would conflict with moving this code
into a separate thread.
This commit is contained in:
Anton Khirnov 2022-04-01 10:03:46 +02:00
parent ff593c6c88
commit 52bc8a842e
3 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
fftools/ffmpeg.c
View File

@ -713,6 +713,7 @@ static void close_output_stream(OutputStream *ost)
static void output_packet(OutputFile *of, AVPacket *pkt, static void output_packet(OutputFile *of, AVPacket *pkt,
OutputStream *ost, int eof) OutputStream *ost, int eof)
{ {
const char *err_msg;
int ret = 0; int ret = 0;
if (!eof && pkt->dts != AV_NOPTS_VALUE) if (!eof && pkt->dts != AV_NOPTS_VALUE)
@ -720,28 +721,49 @@ static void output_packet(OutputFile *of, AVPacket *pkt,
/* apply the output bitstream filters */ /* apply the output bitstream filters */
if (ost->bsf_ctx) { if (ost->bsf_ctx) {
int bsf_eof = 0;
ret = av_bsf_send_packet(ost->bsf_ctx, eof ? NULL : pkt); ret = av_bsf_send_packet(ost->bsf_ctx, eof ? NULL : pkt);
if (ret < 0) {
err_msg = "submitting a packet for bitstream filtering";
goto fail;
}
while (!bsf_eof) {
ret = av_bsf_receive_packet(ost->bsf_ctx, pkt);
if (ret == AVERROR(EAGAIN))
return;
else if (ret == AVERROR_EOF)
bsf_eof = 1;
else if (ret < 0) {
err_msg = "applying bitstream filters to a packet";
goto fail;
}
ret = of_submit_packet(of, bsf_eof ? NULL : pkt, ost);
if (ret < 0)
goto mux_fail;
}
} else {
ret = of_submit_packet(of, eof ? NULL : pkt, ost);
if (ret < 0) if (ret < 0)
goto finish; goto mux_fail;
while ((ret = av_bsf_receive_packet(ost->bsf_ctx, pkt)) >= 0) }
of_submit_packet(of, pkt, ost);
if (ret == AVERROR_EOF)
of_submit_packet(of, NULL, ost);
if (ret == AVERROR(EAGAIN))
ret = 0;
} else
of_submit_packet(of, eof ? NULL : pkt, ost);
if (eof) if (eof)
ost->finished |= MUXER_FINISHED; ost->finished |= MUXER_FINISHED;
finish: return;
if (ret < 0 && ret != AVERROR_EOF) {
av_log(NULL, AV_LOG_ERROR, "Error applying bitstream filters to an output " mux_fail:
"packet for stream #%d:%d.\n", ost->file_index, ost->index); err_msg = "submitting a packet to the muxer";
if(exit_on_error)
exit_program(1); fail:
} av_log(NULL, AV_LOG_ERROR, "Error %s for output stream #%d:%d.\n",
err_msg, ost->file_index, ost->index);
if (exit_on_error)
exit_program(1);
} }
static int check_recording_time(OutputStream *ost) static int check_recording_time(OutputStream *ost)

2
fftools/ffmpeg.h
View File

@ -707,7 +707,7 @@ int of_check_init(OutputFile *of);
int of_write_trailer(OutputFile *of); int of_write_trailer(OutputFile *of);
void of_close(OutputFile **pof); void of_close(OutputFile **pof);
void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost); int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost);
int of_finished(OutputFile *of); int of_finished(OutputFile *of);
int64_t of_filesize(OutputFile *of); int64_t of_filesize(OutputFile *of);
AVChapter * const * AVChapter * const *

6
fftools/ffmpeg_mux.c
View File

@ -232,7 +232,7 @@ static void submit_packet(OutputFile *of, OutputStream *ost, AVPacket *pkt)
} }
} }
void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost) int of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
{ {
int ret; int ret;
@ -243,9 +243,11 @@ void of_submit_packet(OutputFile *of, AVPacket *pkt, OutputStream *ost)
ret = queue_packet(of, ost, pkt); ret = queue_packet(of, ost, pkt);
if (ret < 0) { if (ret < 0) {
av_packet_unref(pkt); av_packet_unref(pkt);
exit_program(1); return ret;
} }
} }
return 0;
} }
static int print_sdp(void) static int print_sdp(void)