mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-28 20:53:54 +02:00
fftools/ffmpeg: drop free_input_threads()
Stop demuxer threads in ifile_close() instead. Simplifies the demuxer API.
This commit is contained in:
parent
295848bacb
commit
c20977c4e0
@ -555,7 +555,6 @@ static void ffmpeg_cleanup(int ret)
|
||||
for (i = 0; i < nb_output_files; i++)
|
||||
of_close(&output_files[i]);
|
||||
|
||||
free_input_threads();
|
||||
for (i = 0; i < nb_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 */
|
||||
print_report(0, timer_start, cur_time);
|
||||
}
|
||||
free_input_threads();
|
||||
|
||||
/* at the end of stream, we must flush the decoder buffers */
|
||||
for (i = 0; i < nb_input_streams; i++) {
|
||||
@ -3987,8 +3985,6 @@ static int transcode(void)
|
||||
ret = 0;
|
||||
|
||||
fail:
|
||||
free_input_threads();
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -771,7 +771,6 @@ void ifile_close(InputFile **f);
|
||||
* - a negative error code on failure
|
||||
*/
|
||||
int ifile_get_packet(InputFile *f, AVPacket **pkt);
|
||||
void free_input_threads(void);
|
||||
|
||||
#define SPECIFIER_OPT_FMT_str "%s"
|
||||
#define SPECIFIER_OPT_FMT_i "%i"
|
||||
|
@ -322,12 +322,12 @@ finish:
|
||||
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;
|
||||
|
||||
if (!f || !f->in_thread_queue)
|
||||
if (!f->in_thread_queue)
|
||||
return;
|
||||
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)
|
||||
@ -338,14 +338,6 @@ static void free_input_thread(int i)
|
||||
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)
|
||||
{
|
||||
int ret;
|
||||
@ -442,10 +434,13 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt)
|
||||
void ifile_close(InputFile **pf)
|
||||
{
|
||||
InputFile *f = *pf;
|
||||
Demuxer *d = demuxer_from_ifile(f);
|
||||
|
||||
if (!f)
|
||||
return;
|
||||
|
||||
thread_stop(d);
|
||||
|
||||
avformat_close_input(&f->ctx);
|
||||
|
||||
av_freep(pf);
|
||||
|
Loading…
Reference in New Issue
Block a user