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

ffmpeg: factorize input thread creation and destruction

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2018-06-27 21:55:38 +02:00
parent 9f0077cc03
commit b181cd359b
1 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
fftools/ffmpeg.c
View File

@@ -4053,49 +4053,63 @@ static void *input_thread(void *arg)
return NULL; return NULL;
} }
static void free_input_thread(int i)
{
InputFile *f = input_files[i];
AVPacket pkt;
if (!f || !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, &pkt, 0) >= 0)
av_packet_unref(&pkt);
pthread_join(f->thread, NULL);
f->joined = 1;
av_thread_message_queue_free(&f->in_thread_queue);
}
static void free_input_threads(void) static void free_input_threads(void)
{ {
int i; int i;
for (i = 0; i < nb_input_files; i++) { for (i = 0; i < nb_input_files; i++)
InputFile *f = input_files[i]; free_input_thread(i);
AVPacket pkt; }
if (!f || !f->in_thread_queue) static int init_input_thread(int i)
continue; {
av_thread_message_queue_set_err_send(f->in_thread_queue, AVERROR_EOF); int ret;
while (av_thread_message_queue_recv(f->in_thread_queue, &pkt, 0) >= 0) InputFile *f = input_files[i];
av_packet_unref(&pkt);
pthread_join(f->thread, NULL); if (nb_input_files == 1)
f->joined = 1; return 0;
if (f->ctx->pb ? !f->ctx->pb->seekable :
strcmp(f->ctx->iformat->name, "lavfi"))
f->non_blocking = 1;
ret = av_thread_message_queue_alloc(&f->in_thread_queue,
f->thread_queue_size, sizeof(AVPacket));
if (ret < 0)
return ret;
if ((ret = pthread_create(&f->thread, NULL, input_thread, f))) {
av_log(NULL, AV_LOG_ERROR, "pthread_create failed: %s. Try to increase `ulimit -v` or decrease `ulimit -s`.\n", strerror(ret));
av_thread_message_queue_free(&f->in_thread_queue); av_thread_message_queue_free(&f->in_thread_queue);
return AVERROR(ret);
} }
return 0;
} }
static int init_input_threads(void) static int init_input_threads(void)
{ {
int i, ret; int i, ret;
if (nb_input_files == 1)
return 0;
for (i = 0; i < nb_input_files; i++) { for (i = 0; i < nb_input_files; i++) {
InputFile *f = input_files[i]; ret = init_input_thread(i);
if (f->ctx->pb ? !f->ctx->pb->seekable :
strcmp(f->ctx->iformat->name, "lavfi"))
f->non_blocking = 1;
ret = av_thread_message_queue_alloc(&f->in_thread_queue,
f->thread_queue_size, sizeof(AVPacket));
if (ret < 0) if (ret < 0)
return ret; return ret;
if ((ret = pthread_create(&f->thread, NULL, input_thread, f))) {
av_log(NULL, AV_LOG_ERROR, "pthread_create failed: %s. Try to increase `ulimit -v` or decrease `ulimit -s`.\n", strerror(ret));
av_thread_message_queue_free(&f->in_thread_queue);
return AVERROR(ret);
}
} }
return 0; return 0;
} }