From patchwork Mon Feb 8 12:23:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 25503 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 022BF4493E4 for ; Mon, 8 Feb 2021 14:23:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C47F16880FB; Mon, 8 Feb 2021 14:23:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f43.google.com (mail-ed1-f43.google.com [209.85.208.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F1D626880FB for ; Mon, 8 Feb 2021 14:23:39 +0200 (EET) Received: by mail-ed1-f43.google.com with SMTP id s5so17798850edw.8 for ; Mon, 08 Feb 2021 04:23:39 -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:reply-to:mime-version :content-transfer-encoding; bh=et1PRt1S+4vgoaBZ+P/rE+r2XeU6M4PLpHACVOok9WM=; b=bsYQ58RPcv+1q9XoMpn8t7Yqu9660nJkxLcnTO91Ow0PDswxnyoTSB7zDA7XmdUyXA rowihXeEYgSJRdBCLa4zYLLXfzKvhAPkNGgTJLhaZPrYnO7RPK1tplUmOdPWmMJxlRMN WlVU5uKmAnwT1oPUz9rB3YxbNjbkyKJaqgos1euoKETKvArelNLmY7QDOCKfFlFJsTK2 cvuhd2iLScsWzt/ysEQ+jvVOSFCZS3WXNodW+sLexLYuHMKjW3N/HaqaFBFk3xysI7VR Sc9aQ9ZI5uCXQ8j78fwKjMQaHquxpfQdcHjLEmbogDvQL+Tu44eMRsrgjsB4+3n0bOgD fiqQ== 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:reply-to :mime-version:content-transfer-encoding; bh=et1PRt1S+4vgoaBZ+P/rE+r2XeU6M4PLpHACVOok9WM=; b=MjUUsYVKMAdBWm0jLb9o5YdU0s7NHYJ5Yr1z+rh5QjJPLnMfN1lLQ00VwPFjvNfAIL /4kpGv/0M+fm7N0WnVLwKf4SlBh/M8wqUJPoEP3A1LFHAdlCmPR/xDtd8gVL16Hu381p NZCGbgkmbD1BA9rpSZ+bEcpq5H1j6Z0Zpo/VvH5Rg+3qW388u0cLd014cWGTyubZsH8u LE3UzzNg+I+ufWGSCqwbJVwgjPsa69zDezmRLbJ1xLNX9hFP4iXA33+e02VoPxqDXCvl tFcfrTcM6OImH8asqwM9I7HypSzaPpp5Sud5MsWMP1+7VH2G8to8UMUIgy18E2Yvz9Yq oPJg== X-Gm-Message-State: AOAM530JuOlOZscZ+p7/KQ+HVbO22JZfwr/LCM9cRRpRVKz1beuCUT4n r1SJSsFx8ARuZaIPPBqWZhxkNiJebJw= X-Google-Smtp-Source: ABdhPJxSr5+sYcSeijS7oJWsJ/m/3qmo5SUQsoklEszRVqYE2Cs2wc1njzPhGNAX5mnabE2D4Yi8iw== X-Received: by 2002:aa7:dd57:: with SMTP id o23mr16909455edw.252.1612787019219; Mon, 08 Feb 2021 04:23:39 -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.23.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Feb 2021 04:23:38 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Feb 2021 13:23:23 +0100 Message-Id: <20210208122330.555354-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/8] avcodec/frame_thread_encoder: Improve type safety 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" Signed-off-by: Andreas Rheinhardt --- libavcodec/frame_thread_encoder.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/libavcodec/frame_thread_encoder.c b/libavcodec/frame_thread_encoder.c index 83229f620a..ee289c90e3 100644 --- a/libavcodec/frame_thread_encoder.c +++ b/libavcodec/frame_thread_encoder.c @@ -35,8 +35,8 @@ #define BUFFER_SIZE (2*MAX_THREADS) typedef struct{ - void *indata; - void *outdata; + AVFrame *indata; + AVPacket *outdata; int64_t return_code; unsigned index; } Task; @@ -255,19 +255,12 @@ void ff_frame_thread_encoder_free(AVCodecContext *avctx){ while (av_fifo_size(c->task_fifo) > 0) { Task task; - AVFrame *frame; av_fifo_generic_read(c->task_fifo, &task, sizeof(task), NULL); - frame = task.indata; - av_frame_free(&frame); - task.indata = NULL; + av_frame_free(&task.indata); } for (i=0; ifinished_tasks[i].outdata != NULL) { - AVPacket *pkt = c->finished_tasks[i].outdata; - av_packet_free(&pkt); - c->finished_tasks[i].outdata = NULL; - } + av_packet_free(&c->finished_tasks[i].outdata); } pthread_mutex_destroy(&c->task_fifo_mutex);