From patchwork Thu Apr 30 10:34:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 19393 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 49A27444309 for ; Thu, 30 Apr 2020 13:34:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2D30C68C700; Thu, 30 Apr 2020 13:34:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8F7DD68C34E for ; Thu, 30 Apr 2020 13:34:15 +0300 (EEST) Received: by mail-wr1-f54.google.com with SMTP id x18so6249041wrq.2 for ; Thu, 30 Apr 2020 03:34:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Qg9tIJBz8R9cSqvXH4X+MfdIrG6o4EmAhEQuO/ERkiU=; b=CPZtxsWjDl3KNB+1BfBNfZqvJM1xVPVL3sur2HvmXcKMXWJ4vXGV4mW7SvnEhAP9NZ UkdQTJhVUq8InVJHVhoeuKf1HvJCJ1eiOIqjrXpvNKkXm+hRIUpKQ/j10IJ2w//nnXbG bWpewdAsTP0BiqAxUp5tZY8NdE+AX35IstCDVZzEX0X3zRbwOtS5es7/9HLNHUcEmGu2 4M0vaqIOg4qXG5bDR8o5ni8HFGzIAfsCoFqnHOx/3MYZ12irThLi1QGbxbqt87hlsxil yBnwWbZ5fs5S+dnxabxF4PhJe10MOF8ZkZZcgcHvoQpfMlOTYmn3is2y0hanac0bf9IX 3lEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Qg9tIJBz8R9cSqvXH4X+MfdIrG6o4EmAhEQuO/ERkiU=; b=tI76HvK9tSigb/upmctMUiePE+NSrUs+vOuudei98hqMAyW+gQ1lJnKvhgc+J1GAVj AWDMVMfc8dPscwKk5oekSqdYWaRvoM/0XW0GcQCSdWPMfxR9U9VMfK/DCe4GFGf/s9J6 /CPxbpwAtQzUWryPZk2iSsOOcBBYFYOZ/36ZA3cqINaIHOSRu8OGfkEccQQmdre4eSOT wdPW6qiRxCLBVHVBRLkjlRrgBPmw4x3DMupTX7Mejlkg9n5PH8/+R43+EllIo8pc2CJz XSUi78+AhOQFARz+gdJ1PkQx2/Yw/vLD6YoJLgCeXUAZAg3Tu6iJmeFdWhsGL3Q/RDuo pytg== X-Gm-Message-State: AGi0PuYYfpBjCMbAIsEAm/VGTZHartI0ymDjpYdP4KmAN4BpEFGG8W+/ kPdXb/jd+D5jF625jiG6D6s4UmKEjwk= X-Google-Smtp-Source: APiQypKxoE0BgbpOvWaeMGQMG0SJEkiUAT8LRodhtam5vSeCN8UX0hTURB9wVqPLUMv5eoSBFptBjg== X-Received: by 2002:a5d:658c:: with SMTP id q12mr3543600wru.128.1588242854461; Thu, 30 Apr 2020 03:34:14 -0700 (PDT) Received: from localhost (host-96-177.parnet.fi. [77.234.96.177]) by smtp.gmail.com with ESMTPSA id 17sm11438237wmo.2.2020.04.30.03.34.13 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 30 Apr 2020 03:34:13 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Thu, 30 Apr 2020 13:34:13 +0300 Message-Id: <20200430103413.69715-1-martin@martin.st> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avfoundation: Fix building on iOS 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Apparently the changes from 3c9185bf3a83395d12a987f626dbdb985eac4320 aren't enough; even with that in place, I got errors like this when trying to build for iOS: src/libavdevice/avfoundation.m:135:5: error: 'AVCaptureDeviceTransportControlsPlaybackMode' is unavailable: not available on iOS AVCaptureDeviceTransportControlsPlaybackMode observed_mode; ^ --- libavdevice/avfoundation.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 0b1888693f..59d5b0af4f 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -132,7 +132,9 @@ CMSampleBufferRef current_audio_frame; AVCaptureDevice *observed_device; +#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 AVCaptureDeviceTransportControlsPlaybackMode observed_mode; +#endif int observed_quit; } AVFContext; @@ -200,6 +202,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath change:(NSDictionary *)change context:(void *)context { if (context == _context) { +#if !TARGET_OS_IPHONE && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070 AVCaptureDeviceTransportControlsPlaybackMode mode = [change[NSKeyValueChangeNewKey] integerValue]; @@ -209,6 +212,7 @@ - (void)observeValueForKeyPath:(NSString *)keyPath } _context->observed_mode = mode; } +#endif } else { [super observeValueForKeyPath: keyPath ofObject: object