From patchwork Mon Mar 2 12:52:29 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Nicholson X-Patchwork-Id: 18006 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 96CB244B3EA for ; Mon, 2 Mar 2020 15:01:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 717F568B073; Mon, 2 Mar 2020 15:01:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f67.google.com (mail-ed1-f67.google.com [209.85.208.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 803AB68AF8E for ; Mon, 2 Mar 2020 15:01:22 +0200 (EET) Received: by mail-ed1-f67.google.com with SMTP id p3so13194508edx.7 for ; Mon, 02 Mar 2020 05:01:22 -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:mime-version :content-transfer-encoding; bh=zPZj84ZgqT3uGucrJJDLP0FE3ZYGtNOttYgJx5Fb8zg=; b=L7Q8Zx1j5QI7YhBuGdjJRII0vE35Y/FeXYBsPqpup2VtX0/Oxy3ra7CsLEoehFfD55 ad03oLbwDSx0v5esAp8zXOHE9PJKLMlpkYgixJoEgEqzfdCw+pQ+OaOzqAY1Rg5WulsH Wr4kvp4CWPDNkD7GgNOyiRk7saveRxIGztsLn7IbgrdOyBWg55ym8F1HTZIDgahIoH5c C3UgBWzG+QYWD5s2K3C4snV32egw+reEAdVGTfo7NxaLsRznQFLl7ohQN6ZU6k3bbwQQ ggQYjXWqdYO8++Rdk+dlevVtFRNUothwrEcCk6nUpo3ABH1Jd5NjZN7Ca03KA+8RLSbu Y00g== 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:mime-version :content-transfer-encoding; bh=zPZj84ZgqT3uGucrJJDLP0FE3ZYGtNOttYgJx5Fb8zg=; b=j4FJGlilQ7RF9jIMvt31/hP/hXMEGty9u8s3+iXQMcXuZoWxuDXT+0I1S+tIHHmJ9w Sl4YHdgMDS3FeCk7xjsQceaaWtZtkwxOgHzGwj9zDchSIINzkVx8+DH8edRV2MRX8vU/ nQ1II3qcyTsVwA41utj42w2Mr/NUnk5gy3fzoKB70MF0+UB6CNf+1r+LkeX+PwG2+aoA nH+mvzo5XR83haGHxgps+2VvxD4yfTuMjOe043haXfLgpJxlkp+xKiCD7+8kjs++3tZc oubFbmHWIy13NSfzz1saz9QfkNWfTPQ3iIrtB51lWWhgLlgTfiHPpuxF0k8MG+iPgb7t 1IMg== X-Gm-Message-State: APjAAAUfGPQ8X4bnNwygcQOROlqQ2Mb8oDSEWzmZlhkHnv+JB+fkpC0C DmfU7bd2HXNyCrQ+WLdTDTPgxshh9Cc= X-Google-Smtp-Source: APXvYqwAc+9Maqf3bpt4LkTpVFBz8uN2Y/3jAcQbQLVAqwxcsSTfOUjlTZXvQwFyxTeBVzbXzHdo4A== X-Received: by 2002:a5d:4484:: with SMTP id j4mr23949121wrq.153.1583153583549; Mon, 02 Mar 2020 04:53:03 -0800 (PST) Received: from Rosss-MacBook.localdomain ([89.101.86.58]) by smtp.gmail.com with ESMTPSA id w22sm15327148wmk.34.2020.03.02.04.53.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 Mar 2020 04:53:02 -0800 (PST) From: phunkyfish To: ffmpeg-devel@ffmpeg.org Date: Mon, 2 Mar 2020 12:52:29 +0000 Message-Id: <20200302125229.11771-1-phunkyfish@gmail.com> X-Mailer: git-send-email 2.20.1 (Apple Git-117) 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 | 8 +++++++- 2 files changed, 15 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..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