From patchwork Mon Mar 2 20:48:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18011 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 D3A4244BDA5 for ; Mon, 2 Mar 2020 22:49:17 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B001C68B526; Mon, 2 Mar 2020 22:49:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A94BB68B161 for ; Mon, 2 Mar 2020 22:49:11 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id h9so603927wrr.10 for ; Mon, 02 Mar 2020 12:49:11 -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=KwQTXKkF/DBSbdwREYjGCAyxFbyN9FPvfCOXZd+bwF4=; b=Mq5tgeRnx/v0ISjpXmocD0o63vBjI9MVpeC9k/I38fzJ7GuKba9kigr+EYxltPM79j OV9QlaDcsJOaPfaR8N59c/8HtcSyG32fCzXuS0+oQe9Po4QrxSpb0eYiHL3UBXd9iu8J IwoSyayi+2mw8u24IPj6jX1wQ7oJTufaozP2SgkdCHyaNuy1c2IloVz51dpYwcL6orLU 0YSLTcd6VFqOVGnCrUhsD4GLF3joEIf9m1mmfYewDBHvPkPAXJ2MFEh0gHcdunf3Ud83 nSL+/Sfnbrmk5khQ/NWv6oo7sOAsbMxD0g841G5+ap7a75dMji5G56F6gf0kcIxfiob5 IUmw== 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=KwQTXKkF/DBSbdwREYjGCAyxFbyN9FPvfCOXZd+bwF4=; b=mZ+TEw4FdP2AB4MpCCgchAm9ra76+DnXQuwV++U7zLps2DyRSPieZOB6yDj8wsGupn bI8BxgNMUp16taWnPO/uKSDP00jpsjp5CtVZ15n0CJGhWREWF0uWDpjkuymaX5K3BBi0 Df0x32padpFGinyjuu2QU3pzB02JC/mecx+lOrT+jutOyXJhzyoXyZ0qEq8FUQnEgH37 S1EX9jjwLb0fmd41rVJh47jz8qlnBunyZ5hu85f6FseUwhk7T015tcyf1hR6/acpcn7R qYHBUfF4hJKnrJXkyBSB6DFZvYc8Ql1KrVzyzxjZLtCYOj0FIN814jqWurEVmaAiPFro /k4w== X-Gm-Message-State: ANhLgQ2T9Wzj63EW/A4TPuibvYfIDSoUcUfux+7PhNBf5j1ygjawATOC P9AJpmiPSDgoyJFXzso0LOjTcKkY1jI= X-Google-Smtp-Source: ADFU+vuRJs8+Uvp5v7p6aS3kcbYLf3qagWwSzzA4T+h6sjcRBqveoqujkOnkef5ts16UCcaa/OLxSA== X-Received: by 2002:adf:ce8c:: with SMTP id r12mr1336471wrn.189.1583182150866; Mon, 02 Mar 2020 12:49:10 -0800 (PST) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id f17sm9474607wrm.3.2020.03.02.12.49.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2020 12:49:10 -0800 (PST) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 20:48:41 +0000 Message-Id: <20200302204841.17775-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) In-Reply-To: <20200302144518.13717-1-phunkyfish@gmail.com> References: <20200302144518.13717-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 | 7 ++++++- 2 files changed, 14 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..3af6b09ca7 100644 --- a/libavformat/udp.c +++ b/libavformat/udp.c @@ -61,8 +61,13 @@ #define IPPROTO_UDPLITE 136 #endif +#if HAVE_W32THREADS +#undef HAVE_PTHREAD_CANCEL +#define HAVE_PTHREAD_CANCEL 1 +#endif + #if HAVE_PTHREAD_CANCEL -#include +#include "libavutil/thread.h" #endif #ifndef IPV6_ADD_MEMBERSHIP