From patchwork Mon Feb 8 12:23:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25508 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1E52F44A631 for ; Mon, 8 Feb 2021 14:24:16 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 05C62689DCF; Mon, 8 Feb 2021 14:24:16 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f49.google.com (mail-ej1-f49.google.com [209.85.218.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B0032689B91 for ; Mon, 8 Feb 2021 14:24:07 +0200 (EET) Received: by mail-ej1-f49.google.com with SMTP id f14so24280975ejc.8 for ; Mon, 08 Feb 2021 04:24:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=v7ssXNBtcuGYkg5JyYIz79NeCxjN/W+ckJFz6eyFloo=; b=s/qCiFs8SOREksGqYx8mtP7XI8relQNJ24lB7wqjHfLdsQJWudGJcvjoiELMXKD8xs K04fMefrFdtml9gx4FuA4z8sZboskkb2lGYewsXOKhQcsHevgZBh/ilZ9SOYvqkJhkdt gUy+Z1EyqklgjFxh9msuPlVeIliwuyAzbR75LtPX3r1h1RllaGL99L+2bEYbT3EARm1z W144wSHR7KVyh6cnmvn5PB3lZiRohR2CpVBeVYSk3iuyuBXjDb2FBq8gKPni6aCQC059 N5pvRw1W91jeHb5tnQGbCrUZco0xDRV6ll1mRuISwJHaORYApHXCk3u17IjWJNXFsYmA W00Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=v7ssXNBtcuGYkg5JyYIz79NeCxjN/W+ckJFz6eyFloo=; b=khgez/CDYxl6wk7KxjUrf/2YH5xgUfRgXaDr+sCrjSd0MkpX0e/5B46zW8PcPweUl5 Im3XiYCdy1m1r8ycuifrZ3a5oWMdeWbdgni8zv8mfyi5hONKnrP/J3jK8PdpBL515x9o CBPXqICyrTVtu1UPdF2TzvTS/LsIqiYuyBNcNKc4Uw+FEJiFBJzjMbd/2UPdGv6T8s5c lLWwny74dXMWSTU/6PJpPhRPxtSY7HNVPdKed4sqFEUb8trLKciCyj9mA2BCA0wbGvF3 PBXM0bak8q7yz850KdsnvXA3hIc1SyaWRVGACGOTAObk1fF1777BJkv/fNgZldxBzs7V LFmQ== X-Gm-Message-State: AOAM530qHvOlwuqPKDvk7r0XEpNiMe4FT8hCmDa/i/FVoIhhWd3/dxqi 5iD/5yMuyzEoN+jvZ0d9AYltsdcXc1c= X-Google-Smtp-Source: ABdhPJz0oJoAvskyXGi+I0I3MLivl0BEzylO8ce2RoWkJFBYKChSjP8lDSgPlmZFjSCYLoyHoRiszw== X-Received: by 2002:a17:906:755:: with SMTP id z21mr17162406ejb.514.1612787046889; Mon, 08 Feb 2021 04:24:06 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id ah20sm8486820ejc.99.2021.02.08.04.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:24:06 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Feb 2021 13:23:28 +0100 Message-Id: <20210208122330.555354-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210208122330.555354-1-andreas.rheinhardt@gmail.com> References: <20210208122330.555354-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/8] avcodec/frame_thread_encoder: Avoid FIFO X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It can be replaced by a simple counter. Signed-off-by: Andreas Rheinhardt --- Should I rename task_fifo_mutex/cond? libavcodec/frame_thread_encoder.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 5fe886aed9..c6323b6246 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -22,7 +22,6 @@ #include "frame_thread_encoder.h" -#include "libavutil/fifo.h" #include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/opt.h" @@ -49,8 +48,7 @@ typedef struct{ AVCodecContext *parent_avctx; pthread_mutex_t buffer_mutex; - AVFifoBuffer *task_fifo; - pthread_mutex_t task_fifo_mutex; + pthread_mutex_t task_fifo_mutex; /* Used to guard (next_)task_index */ pthread_cond_t task_fifo_cond; unsigned max_tasks; @@ -58,6 +56,7 @@ typedef struct{ pthread_mutex_t finished_task_mutex; /* Guards tasks[i].finished */ pthread_cond_t finished_task_cond; + unsigned next_task_index; unsigned task_index; unsigned finished_task_index; @@ -77,14 +76,15 @@ static void * attribute_align_arg worker(void *v){ unsigned task_index; pthread_mutex_lock(&c->task_fifo_mutex); - while (av_fifo_size(c->task_fifo) <= 0 || atomic_load(&c->exit)) { + while (c->next_task_index == c->task_index || atomic_load(&c->exit)) { if (atomic_load(&c->exit)) { pthread_mutex_unlock(&c->task_fifo_mutex); goto end; } pthread_cond_wait(&c->task_fifo_cond, &c->task_fifo_mutex); } - av_fifo_generic_read(c->task_fifo, &task_index, sizeof(task_index), NULL); + task_index = c->next_task_index; + c->next_task_index = (c->next_task_index + 1) % c->max_tasks; pthread_mutex_unlock(&c->task_fifo_mutex); /* The main thread ensures that any two outstanding tasks have * different indices, ergo each worker thread owns its element @@ -187,12 +187,6 @@ int ff_frame_thread_encoder_init(AVCodecContext *avctx, AVDictionary *options){ c->parent_avctx = avctx; - c->task_fifo = av_fifo_alloc_array(BUFFER_SIZE, sizeof(unsigned)); - if (!c->task_fifo) { - av_freep(&avctx->internal->frame_thread_encoder); - return AVERROR(ENOMEM); - } - pthread_mutex_init(&c->task_fifo_mutex, NULL); pthread_mutex_init(&c->finished_task_mutex, NULL); pthread_mutex_init(&c->buffer_mutex, NULL); @@ -278,7 +272,6 @@ void ff_frame_thread_encoder_free(AVCodecContext *avctx){ pthread_mutex_destroy(&c->buffer_mutex); pthread_cond_destroy(&c->task_fifo_cond); pthread_cond_destroy(&c->finished_task_cond); - av_fifo_freep(&c->task_fifo); av_freep(&avctx->internal->frame_thread_encoder); } @@ -294,16 +287,15 @@ int ff_thread_video_encode_frame(AVCodecContext *avctx, AVPacket *pkt, av_frame_move_ref(c->tasks[c->task_index].indata, frame); pthread_mutex_lock(&c->task_fifo_mutex); - av_fifo_generic_write(c->task_fifo, &c->task_index, - sizeof(c->task_index), NULL); + c->task_index = (c->task_index + 1) % c->max_tasks; pthread_cond_signal(&c->task_fifo_cond); pthread_mutex_unlock(&c->task_fifo_mutex); - - c->task_index = (c->task_index + 1) % c->max_tasks; } outtask = &c->tasks[c->finished_task_index]; pthread_mutex_lock(&c->finished_task_mutex); + /* The access to task_index in the following code is ok, + * because it is only ever changed by the main thread. */ if (c->task_index == c->finished_task_index || (frame && !outtask->finished && (c->task_index - c->finished_task_index + c->max_tasks) % c->max_tasks <= avctx->thread_count)) {