virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

fftools/ffmpeg: drop free_input_threads()

Browse Source 
Stop demuxer threads in ifile_close() instead. Simplifies the demuxer
API.
This commit is contained in:
Anton Khirnov 2022-10-17 12:35:22 +02:00
parent 295848bacb
commit c20977c4e0
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fftools/ffmpeg.c
View File

@ -555,7 +555,6 @@ static void ffmpeg_cleanup(int ret)
for (i = 0; i < nb_output_files; i++) for (i = 0; i < nb_output_files; i++)
of_close(&output_files[i]); of_close(&output_files[i]);
free_input_threads();
for (i = 0; i < nb_input_files; i++) for (i = 0; i < nb_input_files; i++)
ifile_close(&input_files[i]); ifile_close(&input_files[i]);
@ -3934,7 +3933,6 @@ static int transcode(void)
/* dump report by using the output first video and audio streams */ /* dump report by using the output first video and audio streams */
print_report(0, timer_start, cur_time); print_report(0, timer_start, cur_time);
} }
free_input_threads();
/* at the end of stream, we must flush the decoder buffers */ /* at the end of stream, we must flush the decoder buffers */
for (i = 0; i < nb_input_streams; i++) { for (i = 0; i < nb_input_streams; i++) {
@ -3987,8 +3985,6 @@ static int transcode(void)
ret = 0; ret = 0;
fail: fail:
free_input_threads();
return ret; return ret;
} }

1
fftools/ffmpeg.h
View File

@ -771,7 +771,6 @@ void ifile_close(InputFile **f);
* - a negative error code on failure * - a negative error code on failure
*/ */
int ifile_get_packet(InputFile *f, AVPacket **pkt); int ifile_get_packet(InputFile *f, AVPacket **pkt);
void free_input_threads(void);
#define SPECIFIER_OPT_FMT_str "%s" #define SPECIFIER_OPT_FMT_str "%s"
#define SPECIFIER_OPT_FMT_i "%i" #define SPECIFIER_OPT_FMT_i "%i"

17
fftools/ffmpeg_demux.c
View File

@ -322,12 +322,12 @@ finish:
return NULL; return NULL;
} }
static void free_input_thread(int i) static void thread_stop(Demuxer *d)
{ {
InputFile *f = input_files[i]; InputFile *f = &d->f;
DemuxMsg msg; DemuxMsg msg;
if (!f || !f->in_thread_queue) if (!f->in_thread_queue)
return; return;
av_thread_message_queue_set_err_send(f->in_thread_queue, AVERROR_EOF); av_thread_message_queue_set_err_send(f->in_thread_queue, AVERROR_EOF);
while (av_thread_message_queue_recv(f->in_thread_queue, &msg, 0) >= 0) while (av_thread_message_queue_recv(f->in_thread_queue, &msg, 0) >= 0)
@ -338,14 +338,6 @@ static void free_input_thread(int i)
av_thread_message_queue_free(&f->audio_duration_queue); av_thread_message_queue_free(&f->audio_duration_queue);
} }
void free_input_threads(void)
{
int i;
for (i = 0; i < nb_input_files; i++)
free_input_thread(i);
}
static int thread_start(Demuxer *d) static int thread_start(Demuxer *d)
{ {
int ret; int ret;
@ -442,10 +434,13 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt)
void ifile_close(InputFile **pf) void ifile_close(InputFile **pf)
{ {
InputFile *f = *pf; InputFile *f = *pf;
Demuxer *d = demuxer_from_ifile(f);
if (!f) if (!f)
return; return;
thread_stop(d);
avformat_close_input(&f->ctx); avformat_close_input(&f->ctx);
av_freep(pf); av_freep(pf);