From patchwork Mon Mar 2 13:38:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18007 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 125CF44A1C7 for ; Mon, 2 Mar 2020 15:39:36 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E0B4368AF0F; Mon, 2 Mar 2020 15:39:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C57F168AF0F for ; Mon, 2 Mar 2020 15:39:28 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id t11so6226075wrw.5 for ; Mon, 02 Mar 2020 05:39:28 -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 :mime-version:content-transfer-encoding; bh=JlcH0df0bON+jmZCXiJyXTK6AFH1hE/XN+m8CfGHna8=; b=gLt3EKJMwjmQoOyrlhmUSPt/Ry6irL6RrVqNfq61rycfeF7E/vBDgJ1dvU5eSycE/t ZRPDfOk0u3A1MslYK4ntAOlzb6AMACkk+y/lS9Ll5HtdfJOXKkoM0tLEQf7JcNOGYRoV 3VahbYRj1oGGFMr2cd16cQJ54GsfbMoinljJ1BKIy2z08Q4PF1MvKp6gNv2c5CN+DJb0 dm6hPQKZ5afMSXU2MmsKLyMb+jR3oXtyz7SZZeWpbUISLZuCPubCp3FDFuwPCdCxp3jR Aoj/agiHRqP1uChyDhaUl4ZCsURZBnRCyKFYCnlhQSj8VkXdELIAdh39qu/hh9xASMsg yUoQ== 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:mime-version:content-transfer-encoding; bh=JlcH0df0bON+jmZCXiJyXTK6AFH1hE/XN+m8CfGHna8=; b=qJkpEa4gLXDZoKlKNWqvwIZlwkJfSM1oWTEy1jZ23cuz28aoWTHKWJ+YqsjLTOJHfC v38dEwBq5caH3cJ8ISi/d/fZ97JMsHrmEPScHdpHbkiTU5LRGdZ4qDsbT8SgPsbNtTQ+ eqkLUdj400/BY2NQDXRdM2hOIrhcnCrm4IZsh8UqozUrByBQL/kmOBTxEtSS/HDxzM/Q iA3vWkcF+1rk19TTLa1hEH6tnrgqWRUcekgYzpyfU+2iTF0cCeujsyPB/qg3vlWYGrWA t7kYF1PpUuK/IlFy02DOPPCf3F4gXWrFSIlApC0CPDwc12e2tnQXTDEouBd9hr/PdULi d4Zw== X-Gm-Message-State: ANhLgQ2BelaZx6aa/6XCrMpGsjDl2Znj4UDYHA2EggkNt59Pesxeyq7h H9lfrBf6wV+GO3k76OFECFBjZ2MWSmI= X-Google-Smtp-Source: ADFU+vu9n+76JNf+Oo7bcxn7KVqsQlJs/IXgFr8pZxrjL0RM8z+UO/EBmLrnxuq8iy899eZOslAGFg== X-Received: by 2002:a5d:5411:: with SMTP id g17mr2926522wrv.4.1583156368037; Mon, 02 Mar 2020 05:39:28 -0800 (PST) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id b186sm15510537wmb.40.2020.03.02.05.39.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2020 05:39:27 -0800 (PST) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 13:38:57 +0000 Message-Id: <20200302133857.12596-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20200302125229.11771-1-phunkyfish@gmail.com> References: <20200302125229.11771-1-phunkyfish@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/udp: support w32pthreads compat 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: phunkyfish Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- compat/w32pthreads.h | 10 ++++++++++ libavformat/udp.c | 8 +++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 7df33b7da4..64cd40cda4 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -63,6 +63,11 @@ typedef CONDITION_VARIABLE pthread_cond_t; #define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0) #define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE) +#undef PTHREAD_CANCEL_ENABLE +#undef PTHREAD_CANCEL_DISABLE +#define PTHREAD_CANCEL_ENABLE 1 +#define PTHREAD_CANCEL_DISABLE 0 + static av_unused unsigned __stdcall attribute_align_arg win32thread_worker(void *arg) { pthread_t *h = (pthread_t*)arg; @@ -180,4 +185,9 @@ static inline int pthread_cond_signal(pthread_cond_t *cond) return 0; } +static inline int pthread_setcancelstate(int state, int *oldstate) +{ + return 0; +} + #endif /* COMPAT_W32PTHREADS_H */ diff --git a/libavformat/udp.c b/libavformat/udp.c index 23c3773c64..4f42b026cd 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -61,10 +61,16 @@ #define IPPROTO_UDPLITE 136 #endif -#if HAVE_PTHREAD_CANCEL +#if HAVE_PTHREAD_CANCEL && !defined(HAVE_W32THREADS) #include #endif +#if HAVE_W32THREADS +#include "compat/w32pthreads.h" +#undef HAVE_PTHREAD_CANCEL +#define HAVE_PTHREAD_CANCEL 1 +#endif + #ifndef IPV6_ADD_MEMBERSHIP #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP