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 774B840E24 for ; Tue, 8 Feb 2022 18:27:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BB7E568B1F2; Tue, 8 Feb 2022 20:26:59 +0200 (EET) Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6C86968B195 for ; Tue, 8 Feb 2022 20:26:53 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0AFF5240175 for ; Tue, 8 Feb 2022 19:26:53 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id H2AUKh_ftamy for ; Tue, 8 Feb 2022 19:26:52 +0100 (CET) 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 6EB21240179 for ; Tue, 8 Feb 2022 19:26:52 +0100 (CET) Received: by libav.khirnov.net (Postfix, from userid 1000) id 69F5B3A06EC; Tue, 8 Feb 2022 19:26:52 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Feb 2022 19:26:39 +0100 Message-Id: <20220208182639.25696-2-anton@khirnov.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220208182639.25696-1-anton@khirnov.net> References: <20220208182639.25696-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavu/hwcontext_qsv: fix a potential infinite loop 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 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: Current code will loop forever if MFXVideoVPP_Init() fails. Also, simplify the code. --- libavutil/hwcontext_qsv.c | 80 +++++++++++++++------------------------ 1 file changed, 31 insertions(+), 49 deletions(-) diff --git a/libavutil/hwcontext_qsv.c b/libavutil/hwcontext_qsv.c index d3d8f42c99..95f8071abe 100644 --- a/libavutil/hwcontext_qsv.c +++ b/libavutil/hwcontext_qsv.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #include #include @@ -71,12 +72,11 @@ typedef struct QSVDeviceContext { typedef struct QSVFramesContext { mfxSession session_download; - int session_download_init; + atomic_int session_download_init; mfxSession session_upload; - int session_upload_init; + atomic_int session_upload_init; #if HAVE_PTHREADS pthread_mutex_t session_lock; - pthread_cond_t session_cond; #endif AVBufferRef *child_frames_ref; @@ -297,7 +297,6 @@ static void qsv_frames_uninit(AVHWFramesContext *ctx) #if HAVE_PTHREADS pthread_mutex_destroy(&s->session_lock); - pthread_cond_destroy(&s->session_cond); #endif av_freep(&s->mem_ids); @@ -744,7 +743,6 @@ static int qsv_frames_init(AVHWFramesContext *ctx) #if HAVE_PTHREADS pthread_mutex_init(&s->session_lock, NULL); - pthread_cond_init(&s->session_cond, NULL); #endif return 0; @@ -1024,6 +1022,32 @@ static int map_frame_to_surface(const AVFrame *frame, mfxFrameSurface1 *surface) return 0; } +static int qsv_internal_session_check_init(AVHWFramesContext *ctx, int upload) +{ + QSVFramesContext *s = ctx->internal->priv; + atomic_int *inited = upload ? &s->session_upload_init : &s->session_download_init; + mfxSession *session = upload ? &s->session_upload : &s->session_download; + int ret = 0; + + if (atomic_load(inited)) + return 0; + +#if HAVE_PTHREADS + pthread_mutex_lock(&s->session_lock); +#endif + + if (!atomic_load(inited)) { + ret = qsv_init_internal_session(ctx, session, upload); + atomic_store(inited, 1); + } + +#if HAVE_PTHREADS + pthread_mutex_unlock(&s->session_lock); +#endif + + return ret; +} + static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src) { @@ -1035,28 +1059,7 @@ static int qsv_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst, mfxStatus err; int ret = 0; - while (!s->session_download_init && !s->session_download && !ret) { -#if HAVE_PTHREADS - if (pthread_mutex_trylock(&s->session_lock) == 0) { -#endif - if (!s->session_download_init) { - ret = qsv_init_internal_session(ctx, &s->session_download, 0); - if (s->session_download) - s->session_download_init = 1; - } -#if HAVE_PTHREADS - pthread_mutex_unlock(&s->session_lock); - pthread_cond_signal(&s->session_cond); - } else { - pthread_mutex_lock(&s->session_lock); - while (!s->session_download_init && !s->session_download) { - pthread_cond_wait(&s->session_cond, &s->session_lock); - } - pthread_mutex_unlock(&s->session_lock); - } -#endif - } - + ret = qsv_internal_session_check_init(ctx, 0); if (ret < 0) return ret; @@ -1109,28 +1112,7 @@ static int qsv_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst, const AVFrame *src_frame; int realigned = 0; - - while (!s->session_upload_init && !s->session_upload && !ret) { -#if HAVE_PTHREADS - if (pthread_mutex_trylock(&s->session_lock) == 0) { -#endif - if (!s->session_upload_init) { - ret = qsv_init_internal_session(ctx, &s->session_upload, 1); - if (s->session_upload) - s->session_upload_init = 1; - } -#if HAVE_PTHREADS - pthread_mutex_unlock(&s->session_lock); - pthread_cond_signal(&s->session_cond); - } else { - pthread_mutex_lock(&s->session_lock); - while (!s->session_upload_init && !s->session_upload) { - pthread_cond_wait(&s->session_cond, &s->session_lock); - } - pthread_mutex_unlock(&s->session_lock); - } -#endif - } + ret = qsv_internal_session_check_init(ctx, 1); if (ret < 0) return ret; -- 2.34.1 _______________________________________________ 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".