From patchwork Mon Mar 2 14:45:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18008 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 41A294499CC for ; Mon, 2 Mar 2020 16:45:55 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 28C1D68B4C3; Mon, 2 Mar 2020 16:45:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A202E68AE63 for ; Mon, 2 Mar 2020 16:45:48 +0200 (EET) Received: by mail-wr1-f44.google.com with SMTP id v2so12841392wrp.12 for ; Mon, 02 Mar 2020 06:45:48 -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=CgjYEutJl4i78RLU45107OPv2F3xuc/sCjc1m5mulaw=; b=gkatdQeZK4SPJkZhN90yRN58DSq5Ve9sEOCNon1JXLxkJz4iRCpqLLPX+nQwc3LrwE rNb0LYypVu25TpIC0RXU1nLJtEBkY4eccJAGh0EqOVXD3rKMCaT4ViFx5/JeeD17kNTF TFzIBnkSbv+Ac4VMYnArOdO3B8PISFYW43z9D4Nx8xEpt6X3XrSy8CLlPRZvfj3OsUsK I+cqf5qcZDxo/aq/zPHpAug0IXgcAC5QwVZvm+wURhWky5Mg4btPMg8QOBxfh4j6wqkm L56Gi2Pd3WZml6cfCfUtg06bdPCwhxNhHL/lnXCdhqzJUv6E1GNJ/pSmZK/Kgm3xQJeP fhJw== 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=CgjYEutJl4i78RLU45107OPv2F3xuc/sCjc1m5mulaw=; b=UjArYC2uHYQwaLvj9wnIHrEh/4/fhb12+1hP1AfZZYHILWMOAZTzPuhSDdfguDFc2n 0GN/ZNgN68ZDta5Yk6US2sSc68uJ8htaar2605PuJlYTXGdez7YQr+4pAVCn0obkGWga sxSueHWmEEdJdRhGDljhPWgvEu6cXJCBfz1bz1722eEneyZDnDpzicfVEgkz6TkespMB dypoXogALcNblCr315UhumwOltz0Li8xVwyx1nrqq4tSEqCrnkK6Wd26BfCGcjCG7Ru2 uGu4exOMNqIIzo9gqpW1VuJq8yHyfgjhZ6MU8jsBQKeKIZIv2sdp+q9u6Fh13zhGE414 +2kw== X-Gm-Message-State: ANhLgQ0KGliDUanyOxQ+OaXuldaDZNoxdh5V1giPM3LYgHdzkaXiNMwn 1BdAPYXud7DRMbCcVnsEVH7r8Wiq1M8= X-Google-Smtp-Source: ADFU+vtn2OAkco4iOZOqoLn2HBTboRRh6w/7Dxs1wFUlmRGjdmWURY04s6Xk7WFIj7Xohs5pacaGyQ== X-Received: by 2002:a5d:66cc:: with SMTP id k12mr3117wrw.72.1583160346791; Mon, 02 Mar 2020 06:45:46 -0800 (PST) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id p16sm28132926wrw.15.2020.03.02.06.45.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2020 06:45:46 -0800 (PST) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 14:45:18 +0000 Message-Id: <20200302144518.13717-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20200302133857.12596-1-phunkyfish@gmail.com> References: <20200302133857.12596-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 | 8 ++++++++ libavformat/udp.c | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/compat/w32pthreads.h b/compat/w32pthreads.h index 7df33b7da4..6405e72b64 100644 --- a/compat/w32pthreads.h +++ b/compat/w32pthreads.h @@ -63,6 +63,9 @@ typedef CONDITION_VARIABLE pthread_cond_t; #define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0) #define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE) +#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 +183,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..692ff07cec 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -61,7 +61,11 @@ #define IPPROTO_UDPLITE 136 #endif -#if HAVE_PTHREAD_CANCEL +#if HAVE_W32THREADS +#include "compat/w32pthreads.h" +#undef HAVE_PTHREAD_CANCEL +#define HAVE_PTHREAD_CANCEL 1 +#elif HAVE_PTHREAD_CANCEL #include #endif