From patchwork Wed Sep 27 22:19:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 5318 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp60308jaa; Wed, 27 Sep 2017 15:19:41 -0700 (PDT) X-Received: by 10.223.166.196 with SMTP id t62mr2622155wrc.251.1506550781701; Wed, 27 Sep 2017 15:19:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506550781; cv=none; d=google.com; s=arc-20160816; b=Mvls20ARn6pMztikBXJpVcAPHtTIaejxe46oFjcImzXDruHqKlyctHWTCXHkMBLfjh lCgEsN5VEuv26FRZcMPvHxp9cf7fapqKx77xSHELnmRs7iinZThiMkTilXRgQQqHVG/O TOdK4EqLtrVmKkJ43jDcI5++hrPZJpg+AW7CODlEZD+F6TMC7fm6yrs7/5UEo/fVmroB 3UvcXwJ2AwU5tAY1wXbbZLW/UMxWuIABRo4UhkYa4Sq57k1A1Yewau2LLPYzIGgh/41t eBzlQEvqwFEFRnmqUl2HTYcYJdDAxI7/WgqxUUFGB92PdHslEnJPS2B/VWMeN6SQIlFd LIqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=uqSvvOmuyI67yFpvSHog6FxlGdxwicfWh/+3jQENKOk=; b=zXSfjmrwj++YYOpYnIub/2Uv4rM4JaICq96XreE5JoLbF2X4IBR6fyONUpXANJ5MMw RfIJiN+oRNlL2Z3AdL1RhbV2wxutbB7ec2EGkJNyPO1QFT3mT5zoOuDCyQl3JznVG3b8 +QeRRhNcYW9nC6TzD/8QMGKXhjDhDKd3tJRuhzPcwtzHOKnQIP1HnxoYxRNb3xcEGOk7 Zaqt70Fk48t90h9t+edf+gsiGHjlBBcA2RFdWNzqa+DkVqjxXPT+KrT05oXcQmaKfxti dzIKSRrerMQx1nki5zMsZ7BsvshBIdlCeh12vMRB0WJQK21UnzXrIahnjvXOEzu4Ye3u n4kQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=H9FbSSmr; 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 133si286763wmg.10.2017.09.27.15.19.41; Wed, 27 Sep 2017 15:19:41 -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=@tmm1-net.20150623.gappssmtp.com header.s=20150623 header.b=H9FbSSmr; 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 8DBD36897FF; Thu, 28 Sep 2017 01:19:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f179.google.com (mail-pf0-f179.google.com [209.85.192.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 88782689221 for ; Thu, 28 Sep 2017 01:19:15 +0300 (EEST) Received: by mail-pf0-f179.google.com with SMTP id r71so7939906pfe.12 for ; Wed, 27 Sep 2017 15:19:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tmm1-net.20150623.gappssmtp.com; s=20150623; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=d/jcqezs4vud9XUQo5i+ZbTNTKA+CvBPjavfqidvRQc=; b=H9FbSSmrmiu+aZh5xZLFBlVATscLTEduK9joUXzMjiL7lio2GzqkLe+Mnqk9k/ZChX C/uSiQTwiPsHg53dirRj2R9cbwRPjFC7Gz4Qm5c5KMsdoi218pDXlXk0rOT+NzjULAS6 jvRtn3dfcy3U93eVC2Z+owk8hyeVn+cW01In+wffwXnc9CbL0oodXlXS86DIXUNzXNNe KKh6KKNJ0BgNY/xv88T9Yf6lEHPvKFhwhoGdBqg/aoMnRzRFGdedqhSO9DaBrUo7DROz rCU2crGopOocDaJuX1t+Ls16AcdkW/W1VgL+RHUtCPdqr1uYxNDYCSypDeGklV6NNa6U vhPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=d/jcqezs4vud9XUQo5i+ZbTNTKA+CvBPjavfqidvRQc=; b=qoCLCV9wUP/b3wWjsGmEoI9/SlCNmyddVbCCXJ8Cm5+uPFsYBfwNMpEmB9/xPxppLI LfdqjCuNKNBBStG80B280oOp+wmzhJZocJjjoEvzgh1tpDuuL6L59DCKNmd0VGi4SXLw 3xn2R0Vw+IFmICMqsQ/KfLjFScd+WekS4SRg6XYc1CIXTC9CyFtUhfuR8DqyaldZncmE Js9LKV9JnR35LD/uRY34lvlKfOP5cIMOMPfGG/hBP/2U5ZB85pmG7MyjzNiop5RSlTpA 2LT4DQF6HLVYNbiEaQi/Tf+rbv3R0vcAtDknPN5az5sTHFUobQfYSp6OuyKAuYQ6QPW1 kEcg== X-Gm-Message-State: AHPjjUi6g2AglW/4g7Ey0rg7jTYQ6CSb4xOgKyjXJTuTTtgTh5JWq5OB /F5RUFJICgIr28LZI7nFOtcqASWR X-Google-Smtp-Source: AOwi7QDTTHEhxy89OVf1YQKe0x+ipIN7PFVtYIEJ6U9jEzORgqchvIrIM9TvQQhMBc9yAb8uYvMLlQ== X-Received: by 10.98.112.68 with SMTP id l65mr2475469pfc.292.1506550766443; Wed, 27 Sep 2017 15:19:26 -0700 (PDT) Received: from tmm1-macbook.local.net (c-73-252-174-83.hsd1.ca.comcast.net. [73.252.174.83]) by smtp.gmail.com with ESMTPSA id x8sm8149pff.104.2017.09.27.15.19.25 (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 27 Sep 2017 15:19:25 -0700 (PDT) From: Aman Gupta To: ffmpeg-devel@ffmpeg.org Date: Wed, 27 Sep 2017 15:19:20 -0700 Message-Id: <20170927221920.46302-2-ffmpeg@tmm1.net> X-Mailer: git-send-email 2.13.5 (Apple Git-94) In-Reply-To: <20170927221920.46302-1-ffmpeg@tmm1.net> References: <20170927221920.46302-1-ffmpeg@tmm1.net> Subject: [FFmpeg-devel] [PATCH v2 2/2] avcodec/videotoolbox: fix hevc hwaccel build on older macOS 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: Aman Gupta MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Aman Gupta --- configure | 5 ++++- libavcodec/videotoolbox.c | 4 ++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/configure b/configure index d353e9d824..aae23bf38f 100755 --- a/configure +++ b/configure @@ -2073,6 +2073,7 @@ TOOLCHAIN_FEATURES=" TYPES_LIST=" CONDITION_VARIABLE_Ptr + kCMVideoCodecType_HEVC socklen_t struct_addrinfo struct_group_source_req @@ -5809,8 +5810,10 @@ enabled avfoundation && { check_lib avfoundation CoreGraphics/CoreGraphics.h CGGetActiveDisplayList "-framework CoreGraphics" || check_lib avfoundation ApplicationServices/ApplicationServices.h CGGetActiveDisplayList "-framework ApplicationServices"; } -enabled videotoolbox && +enabled videotoolbox && { check_lib coreservices CoreServices/CoreServices.h UTGetOSTypeFromString "-framework CoreServices" + check_func_headers CoreMedia/CMFormatDescription.h kCMVideoCodecType_HEVC "-framework CoreMedia" +} check_struct "sys/time.h sys/resource.h" "struct rusage" ru_maxrss diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index c96200cbdb..e62452c078 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -40,6 +40,10 @@ # define kVTVideoDecoderSpecification_RequireHardwareAcceleratedVideoDecoder CFSTR("RequireHardwareAcceleratedVideoDecoder") #endif +#if !HAVE_KCMVIDEOCODECTYPE_HEVC +enum { kCMVideoCodecType_HEVC = 'hvc1' }; +#endif + #define VIDEOTOOLBOX_ESDS_EXTRADATA_PADDING 12 static void videotoolbox_buffer_release(void *opaque, uint8_t *data)