summaryrefslogtreecommitdiff
path: root/fftools/ffmpeg.c
diff options
context:
space:
mode:
Diffstat (limited to 'fftools/ffmpeg.c')
-rw-r--r--fftools/ffmpeg.c110
1 files changed, 0 insertions, 110 deletions
diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c
index 46de9ce40b..72cba3a525 100644
--- a/fftools/ffmpeg.c
+++ b/fftools/ffmpeg.c
@@ -161,8 +161,6 @@ static struct termios oldtty;
static int restore_tty;
#endif
-static void free_input_threads(void);
-
/* sub2video hack:
Convert subtitles to video with alpha to insert them in filter graphs.
This is a temporary solution until libavfilter gets real subtitles support.
@@ -3636,114 +3634,6 @@ static int check_keyboard_interaction(int64_t cur_time)
return 0;
}
-static void *input_thread(void *arg)
-{
- InputFile *f = arg;
- AVPacket *pkt = f->pkt, *queue_pkt;
- unsigned flags = f->non_blocking ? AV_THREAD_MESSAGE_NONBLOCK : 0;
- int ret = 0;
-
- while (1) {
- ret = av_read_frame(f->ctx, pkt);
-
- if (ret == AVERROR(EAGAIN)) {
- av_usleep(10000);
- continue;
- }
- if (ret < 0) {
- av_thread_message_queue_set_err_recv(f->in_thread_queue, ret);
- break;
- }
- queue_pkt = av_packet_alloc();
- if (!queue_pkt) {
- av_packet_unref(pkt);
- av_thread_message_queue_set_err_recv(f->in_thread_queue, AVERROR(ENOMEM));
- break;
- }
- av_packet_move_ref(queue_pkt, pkt);
- ret = av_thread_message_queue_send(f->in_thread_queue, &queue_pkt, flags);
- if (flags && ret == AVERROR(EAGAIN)) {
- flags = 0;
- ret = av_thread_message_queue_send(f->in_thread_queue, &queue_pkt, flags);
- av_log(f->ctx, AV_LOG_WARNING,
- "Thread message queue blocking; consider raising the "
- "thread_queue_size option (current value: %d)\n",
- f->thread_queue_size);
- }
- if (ret < 0) {
- if (ret != AVERROR_EOF)
- av_log(f->ctx, AV_LOG_ERROR,
- "Unable to send packet to main thread: %s\n",
- av_err2str(ret));
- av_packet_free(&queue_pkt);
- av_thread_message_queue_set_err_recv(f->in_thread_queue, ret);
- break;
- }
- }
-
- 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_free(&pkt);
-
- pthread_join(f->thread, NULL);
- av_thread_message_queue_free(&f->in_thread_queue);
-}
-
-static void free_input_threads(void)
-{
- int i;
-
- for (i = 0; i < nb_input_files; i++)
- free_input_thread(i);
-}
-
-static int init_input_thread(int i)
-{
- int ret;
- InputFile *f = input_files[i];
-
- if (f->thread_queue_size <= 0)
- f->thread_queue_size = (nb_input_files > 1 ? 8 : 1);
-
- 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(f->pkt));
- 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);
- return AVERROR(ret);
- }
-
- return 0;
-}
-
-static int init_input_threads(void)
-{
- int i, ret;
-
- for (i = 0; i < nb_input_files; i++) {
- ret = init_input_thread(i);
- if (ret < 0)
- return ret;
- }
- return 0;
-}
-
static int get_input_packet(InputFile *f, AVPacket **pkt)
{
if (f->readrate || f->rate_emu) {