From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 1B0A14753A for ; Fri, 10 May 2024 08:57:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27A0D68D4F4; Fri, 10 May 2024 11:57:34 +0300 (EEST) Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5D6CA68D38E for ; Fri, 10 May 2024 11:57:27 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1715331438; bh=snOdvKOsx55dbx5X6186uWoskKIxOY2O1Cs9Gghdnxs=; h=From:To:Cc:Subject:Date; b=XaeIHeGddFqIsPh85BXGFoUME4JpdAb87ujLF2oZZBBqgbqLkAwzJ6zsoMNi86zgt Jr7BY9cs7r+EJPsSrTzTexDiStOW2Pv2FIugdejj6TFE0Gc/nCtbBk8IKsdLacNCEa c1Vhon18eg69yc+MoGDYP5qVLfw3s3aGeI+EBfvM= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.200]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id E51B6056; Fri, 10 May 2024 16:57:17 +0800 X-QQ-mid: xmsmtpt1715331437trvbcgc6n Message-ID: X-QQ-XMAILINFO: NDgMZBR9sMmap5x83GE3KufXzcPP5SWiwNos1V909G3n3NUXsLTSucBpO1vs4l eCZASPUv1aRw7711hjctQnskHhDJPzuQC1H/EH6a5JES0a4X2dbP3El7e30yG7D+UU8xRxTPmhMF lsUgeUi8iRB2+c0A3jY8/ZA3rRNN7r8gruCYwMJGe9NdobBqKP/ncUu/8Lv+dJjPZmxEX5N/GuDl hdUcfc6QodJTloYG8z7k4in1ifxrQwT09Vrb7xJ6O52WxrNzgrcw+sNdQJV2OhL1/e7tjWkICY7N Q/gBY7dxEBGJEdzltTILZdK3DCHFeHPJjGD4FVW7+yEBlBvcmGuPKQnA2eUgAYyExs+cHZAxeOHJ r77EzCtYX2Kv6Rh/8kaz0JRImfdHwbmfaxsDvLI4vRD1ivbfCF09E8PL3MuseCP0kLAHr1K8PtCY OImxYtauYWivlBMuhrqjyk1CE0ecNLzYZ1MHON9XiMhVx0WaIn6jgNXvkzyIO8SxNE9/yUQbMgvb 42XZ5u+yAfz9lgIwMU8SplkrQTnN5SsRA3y9L7dQrZtLCnF8XLBezzo0bPTjmHic6qQnoIQw7Pq+ cHujNUm0aPsm5sA12HMsCAChODXYEMkCAm8YJLO43RLIwse8oTB0mEIeX4xRk1x06j3vjGVUP00n 3m1WuPLD3SqjoKXD51JqjfkLTK0CoLmszW27hLHeYWSBZeGQ6a5rFtzWp1p2rIw/tZHeHWMBiThJ 4UN7q+SdIT4jnBIjI66ZZB5GPtMeslZ9EIp8f4d3Eym+Nf+5/LbU+OHt4myNYGLbKpRMffai/JYz Obnw0cWDlAc5RYHGpZ+7nGQd9vOEiV48vLwU4ObwCSMnpUFpo4mVCYDepx9fNzhu/AvLuwUpVkNT yTKwDtPPw/ZoOXbeFpIikzm/whuPeHI6Jw/NLqASsBFQlvbzv3y6kGh+5aR4CclWjApeTeJAinR4 x5rMM53uvfB8q8iWO7GX+jGdQVN2rlLMS/l26xX7CXjKItgFI+qD82hQ6QFkcx X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 10 May 2024 16:57:14 +0800 X-OQ-MSGID: <20240510085714.77066-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [RFC PATCH] avfilter/video: Protect frame_pool from multi-threads access 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 Cc: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili Fix crash with ./ffplay -f lavfi -i movie=foo.mp4,drawtext=text=bar --- libavfilter/avfilter.c | 2 ++ libavfilter/avfilter_internal.h | 2 ++ libavfilter/video.c | 14 ++++++++------ 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 049e4f62ca..44da809c15 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -176,6 +176,7 @@ int avfilter_link(AVFilterContext *src, unsigned srcpad, li = av_mallocz(sizeof(*li)); if (!li) return AVERROR(ENOMEM); + ff_mutex_init(&li->frame_pool_mutex, NULL); link = &li->l; src->outputs[srcpad] = dst->inputs[dstpad] = link; @@ -203,6 +204,7 @@ static void link_free(AVFilterLink **link) ff_framequeue_free(&li->fifo); ff_frame_pool_uninit(&li->frame_pool); + ff_mutex_destroy(&li->frame_pool_mutex); av_channel_layout_uninit(&(*link)->ch_layout); av_freep(link); diff --git a/libavfilter/avfilter_internal.h b/libavfilter/avfilter_internal.h index 2c31c3e7de..eae3a699c3 100644 --- a/libavfilter/avfilter_internal.h +++ b/libavfilter/avfilter_internal.h @@ -27,6 +27,7 @@ #include +#include "libavutil/thread.h" #include "avfilter.h" #include "framequeue.h" @@ -34,6 +35,7 @@ typedef struct FilterLinkInternal { AVFilterLink l; struct FFFramePool *frame_pool; + AVMutex frame_pool_mutex; /** * Queue of frames waiting to be filtered. diff --git a/libavfilter/video.c b/libavfilter/video.c index 89d0797ab5..30eba76cbd 100644 --- a/libavfilter/video.c +++ b/libavfilter/video.c @@ -70,17 +70,17 @@ AVFrame *ff_default_get_video_buffer2(AVFilterLink *link, int w, int h, int alig return frame; } + ff_mutex_lock(&li->frame_pool_mutex); if (!li->frame_pool) { li->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, link->format, align); if (!li->frame_pool) - return NULL; + goto out; } else { if (ff_frame_pool_get_video_config(li->frame_pool, &pool_width, &pool_height, - &pool_format, &pool_align) < 0) { - return NULL; - } + &pool_format, &pool_align) < 0) + goto out; if (pool_width != w || pool_height != h || pool_format != link->format || pool_align != align) { @@ -89,18 +89,20 @@ AVFrame *ff_default_get_video_buffer2(AVFilterLink *link, int w, int h, int alig li->frame_pool = ff_frame_pool_video_init(av_buffer_allocz, w, h, link->format, align); if (!li->frame_pool) - return NULL; + goto out; } } frame = ff_frame_pool_get(li->frame_pool); if (!frame) - return NULL; + goto out; frame->sample_aspect_ratio = link->sample_aspect_ratio; frame->colorspace = link->colorspace; frame->color_range = link->color_range; +out: + ff_mutex_unlock(&li->frame_pool_mutex); return frame; } -- 2.42.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".