virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

fftools/ffmpeg: split decoding loop out of process_input_packet()

Browse Source 
process_input_packet() contains two non-interacting pieces of nontrivial
size and complexity - decoding and streamcopy. Separating them makes the
code easier to read.
This commit is contained in:
Anton Khirnov
2023-05-17 09:29:30 +02:00
parent b5beff3f15
commit 79c1dde5c3
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
fftools/ffmpeg.c
View File

@@ -1344,18 +1344,10 @@ static int send_filter_eof(InputStream *ist)
return 0; return 0;
} }
/* pkt = NULL means EOF (needed to flush decoder buffers) */ static int dec_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
{ {
InputFile *f = input_files[ist->file_index];
const AVCodecParameters *par = ist->par;
int64_t dts_est = AV_NOPTS_VALUE;
int ret = 0;
int repeating = 0;
int eof_reached = 0;
int duration_exceeded;
AVPacket *avpkt = ist->pkt; AVPacket *avpkt = ist->pkt;
int ret, repeating = 0;
if (pkt) { if (pkt) {
av_packet_unref(avpkt); av_packet_unref(avpkt);
@@ -1365,11 +1357,11 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
} }
// while we have more to decode or while the decoder did output something on EOF // while we have more to decode or while the decoder did output something on EOF
while (ist->decoding_needed) { while (1) {
int got_output = 0; int got_output = 0;
int decode_failed = 0; int decode_failed = 0;
switch (par->codec_type) { switch (ist->par->codec_type) {
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
ret = decode_audio (ist, repeating ? NULL : avpkt, &got_output, ret = decode_audio (ist, repeating ? NULL : avpkt, &got_output,
&decode_failed); &decode_failed);
@@ -1403,8 +1395,7 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
} }
} }
eof_reached = 1; return AVERROR_EOF;
break;
} }
if (ret < 0) { if (ret < 0) {
@@ -1417,16 +1408,28 @@ static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eo
} }
if (!decode_failed || exit_on_error) if (!decode_failed || exit_on_error)
exit_program(1); exit_program(1);
break; return ret;
} }
if (!got_output) if (!got_output)
break; return 0;
repeating = 1; repeating = 1;
} }
}
if (!pkt && !ist->decoding_needed) /* pkt = NULL means EOF (needed to flush decoder buffers) */
static int process_input_packet(InputStream *ist, const AVPacket *pkt, int no_eof)
{
InputFile *f = input_files[ist->file_index];
int64_t dts_est = AV_NOPTS_VALUE;
int ret = 0;
int eof_reached = 0;
int duration_exceeded;
if (ist->decoding_needed)
ret = dec_packet(ist, pkt, no_eof);
if (ret == AVERROR_EOF || (!pkt && !ist->decoding_needed))
eof_reached = 1; eof_reached = 1;
if (pkt && pkt->opaque_ref) { if (pkt && pkt->opaque_ref) {