From patchwork Tue Oct 18 12:36:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 38779 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4a86:b0:9d:28a3:170e with SMTP id fn6csp2083581pzb; Tue, 18 Oct 2022 05:40:46 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5lcrIjJ0nok5uYZ4hOB0KlmIlQppq2zkUrZ1HfYiIA3OmUARKZ2Y7nS2G/cAPrK+3WJ3fw X-Received: by 2002:aa7:c98d:0:b0:45c:6451:320e with SMTP id c13-20020aa7c98d000000b0045c6451320emr2442574edt.172.1666096846084; Tue, 18 Oct 2022 05:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666096846; cv=none; d=google.com; s=arc-20160816; b=EbboGSZftMoOB8p4XIgV+/8YQD7b0hdbzkiMZfvFu8VBMe5c3sYnFjHjkqr/2Zya9X qT24whEdbVXfRclv0kKPMDGa7mkKaPIsRcSE+hvudnkpY7Uds/PWe8tM1QhX9dKUucgc /QMg3ERdtLZvMExYFJ3V/x+gVdKA99+Zm0LNS9TK8REX+LBJjKnZcOsqYETI835Wulhs 5RqP4SRNjYKNTMMokMNjX2BZQJufT+fDdkeKvyKqI/0Qh4KdqwCXlthzpRWfILxBAWyN v485m3dIiUvRdJve5/6rEFT4ALQxy+fearSOHJXbqmAdgZNKyyOhjjyk+o/8n5oaVQYE Wqmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=GSa+oOJk/MHVUzbT2AqpekPzmWpqlLUkxBxNbo6LLpM=; b=M4EZPuqk944tmXEncs2p7x4zt5x22U+qYFKgskX6arOF7XsVgGTrq85PASZ/ucW3dw 1DvXN9ZCksWQzHDrU82xICuh6fM1dgMMFtvzF8BKdTJGUBKozYVkq5KHo4b61USYsqXa DPylFIuDeLZkpNbc5zu0cG9HQYhnSsJx0xsxK9V8lTANSlkuo/bWimMgQeM1lVJ71jgi A0VTzzDvij1tBq1RJm6wLbj0ucffqq+NNuO292EAE9KJHAAmrTQ0le58wJD/FaFXJ1NX aFzmFiYYv3taQPNJ/54qOmYuSMHHMFY8OQLPlGl5bY/Xrls021NGtkXLWy+cSetPScAB /8yA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10-20020a50cc0a000000b00458d94f1a45si10301524edi.413.2022.10.18.05.40.45; Tue, 18 Oct 2022 05:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8C13D68BDC1; Tue, 18 Oct 2022 15:38:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0763568BD36 for ; Tue, 18 Oct 2022 15:38:17 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 85D35240591 for ; Tue, 18 Oct 2022 14:38:16 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id g-MQmZmIUwvp for ; Tue, 18 Oct 2022 14:38:15 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 99C772404F8 for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A9EDD3A168D for ; Tue, 18 Oct 2022 14:38:13 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 14:36:47 +0200 Message-Id: <20221018123701.25002-6-anton@khirnov.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221018123701.25002-1-anton@khirnov.net> References: <20221018123701.25002-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/20] fftools/ffmpeg: move threading fields from InputFile to Demuxer X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: oHzD2CT3CxVM They are private to the demuxer and do not need to be visible outside of it. --- fftools/ffmpeg.h | 5 ----- fftools/ffmpeg_demux.c | 49 +++++++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index 823347f670..8c3effdb05 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -455,11 +455,6 @@ typedef struct InputFile { float readrate; int accurate_seek; - AVThreadMessageQueue *in_thread_queue; - pthread_t thread; /* thread reading from this file */ - int non_blocking; /* reading packets from the thread should not block */ - int thread_queue_size; /* maximum number of queued packets */ - /* when looping the input file, this queue is used by decoders to report * the last frame duration back to the demuxer thread */ AVThreadMessageQueue *audio_duration_queue; diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 5c75dd5b23..90868de7aa 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -50,6 +50,11 @@ typedef struct Demuxer { /* number of times input stream should be looped */ int loop; + + AVThreadMessageQueue *in_thread_queue; + int thread_queue_size; + pthread_t thread; + int non_blocking; } Demuxer; typedef struct DemuxMsg { @@ -211,7 +216,7 @@ static void *input_thread(void *arg) Demuxer *d = arg; InputFile *f = &d->f; AVPacket *pkt; - unsigned flags = f->non_blocking ? AV_THREAD_MESSAGE_NONBLOCK : 0; + unsigned flags = d->non_blocking ? AV_THREAD_MESSAGE_NONBLOCK : 0; int ret = 0; pkt = av_packet_alloc(); @@ -233,7 +238,7 @@ static void *input_thread(void *arg) if (d->loop) { /* signal looping to the consumer thread */ msg.looping = 1; - ret = av_thread_message_queue_send(f->in_thread_queue, &msg, 0); + ret = av_thread_message_queue_send(d->in_thread_queue, &msg, 0); if (ret >= 0) ret = seek_to_start(d); if (ret >= 0) @@ -278,14 +283,14 @@ static void *input_thread(void *arg) break; } av_packet_move_ref(msg.pkt, pkt); - ret = av_thread_message_queue_send(f->in_thread_queue, &msg, flags); + ret = av_thread_message_queue_send(d->in_thread_queue, &msg, flags); if (flags && ret == AVERROR(EAGAIN)) { flags = 0; - ret = av_thread_message_queue_send(f->in_thread_queue, &msg, flags); + ret = av_thread_message_queue_send(d->in_thread_queue, &msg, 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); + d->thread_queue_size); } if (ret < 0) { if (ret != AVERROR_EOF) @@ -299,7 +304,7 @@ static void *input_thread(void *arg) finish: av_assert0(ret < 0); - av_thread_message_queue_set_err_recv(f->in_thread_queue, ret); + av_thread_message_queue_set_err_recv(d->in_thread_queue, ret); av_packet_free(&pkt); @@ -311,14 +316,14 @@ static void thread_stop(Demuxer *d) InputFile *f = &d->f; DemuxMsg msg; - if (!f->in_thread_queue) + if (!d->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) + av_thread_message_queue_set_err_send(d->in_thread_queue, AVERROR_EOF); + while (av_thread_message_queue_recv(d->in_thread_queue, &msg, 0) >= 0) av_packet_free(&msg.pkt); - pthread_join(f->thread, NULL); - av_thread_message_queue_free(&f->in_thread_queue); + pthread_join(d->thread, NULL); + av_thread_message_queue_free(&d->in_thread_queue); av_thread_message_queue_free(&f->audio_duration_queue); } @@ -327,14 +332,14 @@ static int thread_start(Demuxer *d) int ret; InputFile *f = &d->f; - if (f->thread_queue_size <= 0) - f->thread_queue_size = (nb_input_files > 1 ? 8 : 1); + if (d->thread_queue_size <= 0) + d->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(DemuxMsg)); + d->non_blocking = 1; + ret = av_thread_message_queue_alloc(&d->in_thread_queue, + d->thread_queue_size, sizeof(DemuxMsg)); if (ret < 0) return ret; @@ -356,7 +361,7 @@ static int thread_start(Demuxer *d) } } - if ((ret = pthread_create(&f->thread, NULL, input_thread, d))) { + if ((ret = pthread_create(&d->thread, NULL, input_thread, d))) { av_log(NULL, AV_LOG_ERROR, "pthread_create failed: %s. Try to increase `ulimit -v` or decrease `ulimit -s`.\n", strerror(ret)); ret = AVERROR(ret); goto fail; @@ -364,7 +369,7 @@ static int thread_start(Demuxer *d) return 0; fail: - av_thread_message_queue_free(&f->in_thread_queue); + av_thread_message_queue_free(&d->in_thread_queue); return ret; } @@ -375,7 +380,7 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt) DemuxMsg msg; int ret; - if (!f->in_thread_queue) { + if (!d->in_thread_queue) { ret = thread_start(d); if (ret < 0) return ret; @@ -400,8 +405,8 @@ int ifile_get_packet(InputFile *f, AVPacket **pkt) } } - ret = av_thread_message_queue_recv(f->in_thread_queue, &msg, - f->non_blocking ? + ret = av_thread_message_queue_recv(d->in_thread_queue, &msg, + d->non_blocking ? AV_THREAD_MESSAGE_NONBLOCK : 0); if (ret < 0) return ret; @@ -968,7 +973,7 @@ int ifile_open(OptionsContext *o, const char *filename) f->rate_emu = 0; } - f->thread_queue_size = o->thread_queue_size; + d->thread_queue_size = o->thread_queue_size; /* check if all codec options have been used */ unused_opts = strip_specifiers(o->g->codec_opts);