From patchwork Wed Sep 6 09:58:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?Q2zDqW1lbnQgQsWTc2No?= X-Patchwork-Id: 5009 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.15.201 with SMTP id 70csp385447jao; Wed, 6 Sep 2017 02:59:19 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5kHiCOFxBpq/YIVnRWhF4uoitNbkrmzKqZXW99IHI4/jD27RukVoaJxIzSbeL37beGwgxb X-Received: by 10.223.149.35 with SMTP id 32mr1383171wrs.289.1504691958992; Wed, 06 Sep 2017 02:59:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1504691958; cv=none; d=google.com; s=arc-20160816; b=oBq16ZDTPeVUqPPqKUJJpYoqyWixCdsrSriRa+eEWXPs1/9N808qikkpQ8QwbPqQ8j Ia0jztp7TzkB82u8zwzIh9wDDM8emlpLuycbyaM/vtQPQdM3L7nimSOrauvpKXa/S8jZ 5uS8sK/wjWe42HIeeVFBIcX6QKSYh/fVvSJES1lfiwbcHmZuosoAI5FcTdXm3Vl8BW2/ Slnj5yB5XLXlNylM6rXiCg+9B7voyw2t1yIJeIpnvA2BSx5h6sRTzUHRhpeqsQCPWuh8 TGeLPMssBl70c5OPGZXfufleZn28w975gKCQSK6Qt1+x4BE+jxJSZQjPXhIP0pl6PF2O YoIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:domainkey-signature:dkim-signature :delivered-to:arc-authentication-results; bh=doqU6aLtExQacvuZ5Q3ie8XZlTApwc51ldgkgN3dT84=; b=HV/pI8Mdu+C01uXtKCbBZycrU/+pCHC/AazcAWzJvRlIJhCJsOP7MZlssVOVonHlYw 9yYLDg/cI0RjkdrBibkbeYhPqmeZFKvXEE1sKoNNlzy1TZVTjMh0wIsfyOwPXNWJaJFz WmyDi3xBH0ZcO3DZUotfoYXNOtTfiouEGw3D8H1xUNjWT0PyVQMQhvQdGkKdA1bGZ5Yv MPRMQ6hn9b6Dv7q7zkf+EVUX0uDjt53E4ZFslCVwsXJQDo0n9yG/N+Lp8qNssPzgNwSf +57yi/zTP3R4eQqm46IZ90SJW4kQ83OuEVdalHw60qu4DeJg6klxMltEhwMSzkZHuPJM BqwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=pHfEYP1T; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d64si885786wmf.28.2017.09.06.02.59.18; Wed, 06 Sep 2017 02:59:18 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@pkh.me header.s=selector1 header.b=pHfEYP1T; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE24068A3D4; Wed, 6 Sep 2017 12:58:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from golem.pkh.me (LStLambert-657-1-117-164.w92-154.abo.wanadoo.fr [92.154.28.164]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 87876689CEC for ; Wed, 6 Sep 2017 12:58:21 +0300 (EEST) Received: from golem.pkh.me (localhost.localdomain [127.0.0.1]) by golem.pkh.me (OpenSMTPD) with ESMTP id deee1594; Wed, 6 Sep 2017 09:58:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pkh.me; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=selector1; bh=IscaHJo 2Vz0qzZE/xS34wwy5TnY=; b=pHfEYP1TV6uLMFjRAR2zNbOe4PVJwKUGj5FBYJ2 ib9fvd1KmnXLKANYTEqBztvEqQtMy7PJgoecvgIfg9s2Lyjuiu4XgdcTSH0tII7s KUmXYDvnqyLmBRLUSMsQQwe6Vf1jbeXu8CIw1SxM4h0Elb/HGeHy3wLjXhnTZj+Q zIaa8kYvMd4e/ksnrFM6ETdD7uegv6jEii26r5rbrrC/kZVHFDtkX4+huVLh5r9+ rQgBK1eP275Yif/k+csq8GmxArX8kfhXzqguVFT/vSLyE5K3lTxC0enW3nCc71nT NABiWDwoFA+dkMWJzBCVE6o1iPIjVISwdqqlcdi8FT9lrTQ== DomainKey-Signature: a=rsa-sha1; c=nofws; d=pkh.me; h=from:to:cc:subject :date:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; q=dns; s=selector1; b=g qiUGaLpKiyw0uqTiKqwNZem0MJ5m46K3k+2z7dq+jFrQoC9OwwNc4t5ra19/NqEt BdO2JJsL3i0iLTMzZULjLTmrc9ZbIR73Cfpu8EOobaRn2KL6qotBkFbGU3N0KwZr DSRjQ/I2V+OZ5wAZxM15RwNT72kLHujNRIUqvDpdE0oIse0mma/xqHmTFEUxPh/u OSk5SYDmJ9zezH8MvzONf576Vl4jFMIOvAxpuXO6Inimo5jpmcNx33hETPZOyEJK BAVX8tFvX6zE1FNCzC0eknclW+kBEGqI3ssn3WGf6cA+2erIQHCkyf2C+ZKMDCyB kaGblN4c57vv+FocY1lgQ== Received: from localhost (golem.pkh.me [local]) by golem.pkh.me (OpenSMTPD) with ESMTPA id ca9cb20c; Wed, 6 Sep 2017 09:58:09 +0000 (UTC) From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 6 Sep 2017 11:58:06 +0200 Message-Id: <20170906095806.3070-7-u@pkh.me> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170906095806.3070-1-u@pkh.me> References: <20170906095806.3070-1-u@pkh.me> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 7/7] build: cleanup videotoolbox 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: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Clément Bœsch - there is no need for kCVImageBufferColorPrimaries_ITU_R_2020 checks, it's done at runtime - VideoToolbox presence is now checked with check_apple_framework() - link to CoreServices is only done when videotoolbox is enabled --- configure | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/configure b/configure index a91bc9f58a..b52aad49f4 100755 --- a/configure +++ b/configure @@ -1607,7 +1607,6 @@ EXTERNAL_LIBRARY_LIST=" openal opencl opengl - videotoolbox " HWACCEL_AUTODETECT_LIBRARY_LIST=" @@ -1621,7 +1620,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" vaapi vda vdpau - videotoolbox_hwaccel + videotoolbox xvmc " @@ -2178,7 +2177,6 @@ CONFIG_EXTRA=" vp3dsp vp56dsp vp8dsp - vt_bt2020 wma_freqs wmv2dsp " @@ -2936,11 +2934,9 @@ libx265_encoder_deps="libx265" libxavs_encoder_deps="libxavs" libxvid_encoder_deps="libxvid" libzvbi_teletext_decoder_deps="libzvbi" -videotoolbox_deps="VideoToolbox_VideoToolbox_h" videotoolbox_extralibs="-framework CoreFoundation -framework VideoToolbox -framework CoreMedia -framework CoreVideo" videotoolbox_encoder_deps="videotoolbox VTCompressionSessionPrepareToEncodeFrames" -videotoolbox_encoder_suggest="vda_framework vt_bt2020" -vt_bt2020_deps="kCVImageBufferColorPrimaries_ITU_R_2020" +videotoolbox_encoder_suggest="vda_framework" # demuxers / muxers ac3_demuxer_select="ac3_parser" @@ -5737,9 +5733,7 @@ check_header termios.h check_header unistd.h check_header valgrind/valgrind.h check_header VideoDecodeAcceleration/VDADecoder.h -check_header VideoToolbox/VideoToolbox.h check_func_headers VideoToolbox/VTCompressionSession.h VTCompressionSessionPrepareToEncodeFrames -framework VideoToolbox -enabled videotoolbox && check_func_headers CoreVideo/CVImageBuffer.h kCVImageBufferColorPrimaries_ITU_R_2020 -framework CoreVideo check_header windows.h check_header X11/extensions/XvMClib.h check_header asm/types.h @@ -5754,16 +5748,17 @@ check_lib shell32 "windows.h shellapi.h" CommandLineToArgvW -lshell32 check_lib wincrypt "windows.h wincrypt.h" CryptGenRandom -ladvapi32 check_lib psapi "windows.h psapi.h" GetProcessMemoryInfo -lpsapi -check_lib coreservices "CoreServices/CoreServices.h" UTGetOSTypeFromString "-framework CoreServices" - enabled audiotoolbox && check_apple_framework AudioToolbox enabled avfoundation && check_apple_framework AVFoundation enabled coreimage && check_apple_framework CoreImage +enabled videotoolbox && check_apple_framework VideoToolbox enabled avfoundation && { check_lib avfoundation CoreGraphics/CoreGraphics.h CGGetActiveDisplayList "-framework CoreGraphics" || check_lib avfoundation ApplicationServices/ApplicationServices.h CGGetActiveDisplayList "-framework ApplicationServices"; } +enabled videotoolbox && + check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString "-framework CoreServices" check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss