From patchwork Tue Oct 19 14:52:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31162 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp379945ioa; Tue, 19 Oct 2021 07:52:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxFO5Mf42Dhj1zVkrpaVSZXyHTNENsqVs34modLlkjwVgyUio/VQr/6kx5fumAa+z3eQjCT X-Received: by 2002:aa7:c394:: with SMTP id k20mr5953654edq.286.1634655167788; Tue, 19 Oct 2021 07:52:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634655167; cv=none; d=google.com; s=arc-20160816; b=nmfeLkpXp0Hq72owg65DRrYkpvpmnHR/wcOw0jqiRjAUpTfgnsPfiLE6VMRG8euJyb eOvh30Tqkj2niCUvIlA7DmT+stazxDa3NAIGYOr34/tc9DJsrnKhy+XdlSfs2uFAJwpF b9KO3VC8n2QnKlxfib01iUDNtg2McOgqNOWiiLc2K4LAWz3a4TT3f/7A1+diiIlPrvHr AUBIkvzM8hav06tC5dJ07YPuU4ZxUpRpDCmHJDFYcWnbFirOHWTgB+rGxu48nBNmw77i /+vWZHEXsGgeMJJ00cuh7M1u+FXbiXuEuzfrD+qBh8plKtDdDVG0Nhz6ws4ZDncrXhum RQXQ== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=nB53cJLfBdz79iKKQLuqNc2s9a/E8T4grIiIkH/HYtc=; b=xHix5Mj1W6kpusXdiIsbMJn+HGIHKl/wjBWKm5PgkOq+OJP0DGtkmZvAae6J7ZMKtf 2UtXcUTnMzgaa+XlY8zArwW7cU8E/cyBGxfKdYFQ74AjCpwKhRLyNqlUiQJMVRhWlAen xDgCbXTei2kCy/wG0/FIPlcNPcmi1RH1BWNZsRbyF7VUG7QVrhx3lgw0l08XeYo3khoU vupBZh20AAez6/bqFBPmbCpq7dAwfgoEnPD3Vl7gvpb+CpugqZLgaTfrTcfCkEiV70hC aAQM1CgoXUKxj0WSEcCZljU22RJ4Ic5bOLd4rEj/yl37l7eBWilgBdx6u39ZgbdqVCk2 FcBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=I6cVj0gT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ks8si23100811ejb.360.2021.10.19.07.52.47; Tue, 19 Oct 2021 07:52:47 -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=@gmail.com header.s=20210112 header.b=I6cVj0gT; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB7BB68A4DB; Tue, 19 Oct 2021 17:52:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57E0F68A12D for ; Tue, 19 Oct 2021 17:52:36 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id c4so12535214pgv.11 for ; Tue, 19 Oct 2021 07:52:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id; bh=3pUaKjFvQn3xN26W3FNUs0qH85VYzDimJAZxEwO6HiY=; b=I6cVj0gTTSS3Yt8NEIT6pIckJKXz4su18GUddDetraKpsgi52wlvsZnNkY9YQ/wJoZ N+LSmIGHab3yJG5NPdCJy6qzLXHtpme5V8hvqT8vIhfGib3Wab3hJWxz26xHWG1m6IPL 0ZWUDyAThaersk1xKXlDIXAQXic3eSyyKlJ1O0gwSEU3Lg0Hc9QCVTB6kk65HCdIxnq7 5Tcr365+D7Xrp2wwGIR9wec9Tk1JbPTf7r0rqJ3k/k4rsmjmrAEirATpoorF7pOPKJAq MgMpE6ZwJajXgKO9YAwPyHjsQN6fBdNWALmu0BB36FGyz7fjY6ASjm/1Cs2vFiSlKs4c ZHKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=3pUaKjFvQn3xN26W3FNUs0qH85VYzDimJAZxEwO6HiY=; b=wkYmUzV7VeGG52GzP0liy27TlLutOZVf94nAwH2tKo6ZoK/ELIVAd2YiJmKS/RlENw QDeWs9y985GigN+sUI92b6/sXBfRHoT1435Orv+BD3ByoKSRxZ8iIjzdMf/+cAp3Y2VP XVKzdDQ7hHM2Io76jGYjLW7OVcoeRkCMT3wzPPOz5Zk5ZjsJkDNeWBAF4Wgh53jFtJDF WWBsJZEGlioFOCz8qayDl+CiBdAxDG/DneNplLo7uNCXkS6vCq9Gmt5+LWRF5j9hQCGZ rPDiH53y9aG9vTCPUbkfs2cvBM9aU1clUfnNUix5UQm9K3xsNTQkOy5UKt/TpJRO8v1B zWFA== X-Gm-Message-State: AOAM533CX639LhA7T1uLvKbtgi6f9JWKmQmuyr4bCMIT7aL4o+ndgUfb nCgRAHODfPdBw9DKKfBSGEp1LoYD4QI= X-Received: by 2002:a05:6a00:16cb:b0:44b:bd38:e068 with SMTP id l11-20020a056a0016cb00b0044bbd38e068mr350576pfc.34.1634655154394; Tue, 19 Oct 2021 07:52:34 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x20sm2977888pjp.48.2021.10.19.07.52.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Oct 2021 07:52:34 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Oct 2021 22:52:28 +0800 Message-Id: <1634655149-14972-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/2] configure: add hls demuxer link dependencies X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: mokmwIsP7tW8 From: Limin Wang Fixes building with --disable-everything --enable-demuxer=hls Signed-off-by: Limin Wang --- configure | 1 + 1 file changed, 1 insertion(+) diff --git a/configure b/configure index 92610c7..0fe3937 100755 --- a/configure +++ b/configure @@ -3363,6 +3363,7 @@ flac_demuxer_select="flac_parser" flv_muxer_select="aac_adtstoasc_bsf" gxf_muxer_select="pcm_rechunk_bsf" hds_muxer_select="flv_muxer" +hls_demuxer_select="adts_header ac3_parser" hls_muxer_select="mpegts_muxer" hls_muxer_suggest="gcrypt openssl" image2_alias_pix_demuxer_select="image2_demuxer" From patchwork Tue Oct 19 14:52:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 31161 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2084:0:0:0:0 with SMTP id a4csp380111ioa; Tue, 19 Oct 2021 07:52:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxNfRYVHLC0j4b3xf7M9KEWfW92PJ9+ekfwChyvVX/ALUsyljZrIAXmuj75boiBCHxYwt2c X-Received: by 2002:aa7:dbd2:: with SMTP id v18mr53996998edt.315.1634655178364; Tue, 19 Oct 2021 07:52:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634655178; cv=none; d=google.com; s=arc-20160816; b=B8nWWzht2/ciK0OMMk1RaDZk3utKBaVGZW+oGOeJdUu4uCHUi4nzu+58Vcw6KNYD9u iwQ+fedSnoyAi/i+rx7D6wGegoI85ARflmLLWYfRYWx3ojj7jFZZ/lwB8+p9XAgIR96y PAqR+cbwuwH4iC7Ilpe0l6T0MdIjtPC5JWzc/4NdLzLNnhUbaYAIkwb3brc/Z54GGMbv PIPhk7h0q5n/PDQlHnltCrzwAYR1KcpLTRUhFb5ICEzLmB7loXOjCjGlnuses9hkoqv1 vnaJSakiGpfnIq0rD3n5b5Mc7OSccirjZUnGAZ67S7Wn3F4aBEwt4+0/FCPm55Um1yaJ MVzg== 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; bh=o+qZ7FWvDbowKgq7co1I/LAoitZS+39B7QoApmOS03k=; b=WXlrfS9RL1fXNPYDVviO/xrQJp4cE+b2Z+qruWDTGeWXNEdFNteVx+gTeBQW8LOsuS cb/tHbHqMZAHa7SDutLcI35MFezPK3twk1pguPrAgQRfi07yk0H6zKEWBfOZVWuPEWRj HyYI3sdUZ389umjcD4ch6ub8BHs69rb8x/xZN8t//6ICzRd7Y4Sf4oJQBOgI7NJLyiUl Mq56NmuyJTA4FObLnC0s7moCoOdU+/mfOJi+WF7gJJ5Qe938mg5ZHmPsXs+jOO8Tsabn ONsFEiSWqarQzCCuYaRrBVNnoCDCjAF2t1IgTE/aDCRhEMbVJgj+WQh0aVMUuvc6UcLh uSXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=VPC3NVTI; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id hq30si28450352ejc.490.2021.10.19.07.52.56; Tue, 19 Oct 2021 07:52:58 -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=@gmail.com header.s=20210112 header.b=VPC3NVTI; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1E8B68A59F; Tue, 19 Oct 2021 17:52:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FDC368A12D for ; Tue, 19 Oct 2021 17:52:38 +0300 (EEST) Received: by mail-pj1-f43.google.com with SMTP id ls18-20020a17090b351200b001a00250584aso37618pjb.4 for ; Tue, 19 Oct 2021 07:52:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bxk+iRWqS03LPh/T0ViPDh69mJFvjIieZyApfHaCQt8=; b=VPC3NVTIyGKJik3K3SjTbCi0rGLtKQ+sBUDYsnQO1H6Gxp+N4xJ82wblNBOFLVFN5+ t+RrLCPCDXhHkzoQxFWqdJpLfPBTTN277DRdUxw4HyJbMr/8ZN8CYZ5eWUkijfTcJCKq tUFJszERwuOjXgiUWZG4l+b2IQElo7oKL3N9+HWQUMJhAMJQIduaxPttvnnKr1MCV2n+ thMPaRLydxlp+iPPIuoTDB/uQqMetVX52FhTIYqGvcjdWcQTpF5QasIsmzf07p8Pgnww I84g2/S6HFDBiWhzsrgYq32kKjIsftuyxA7VvCmetD6A0A737rIifSP2cKpdZh8jha17 KrDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bxk+iRWqS03LPh/T0ViPDh69mJFvjIieZyApfHaCQt8=; b=it2x547NZi45oCaTew5t4nhS5jS4ncW3LPxXtVzPz6Ms4yNLLZcLZa3rsYIwaHNMxx ojTrx7C1Qdp/1x1iXcwSCD7Wz3iofJe5/GmwLhoX4uJk6KxCa+Y9s78Whjl8dXDmJjUi 6LU/tmTB3eTtRpaFEVqE9vx9bUB6T5ttlZl4T1OpAmnYcp/q4V2IxQ6N5roWB9w3geMo oHEDqUvLVjTZ47LYRtjiqOsqNk6XXVlYyd55trw1LiQByUoejwZYLL+9ALS51/bve6oS 50LXQ26K/YEBnUhyjRKFs5BSYftWadTV4M0BbdFdgC31+RJQuUE2EayQdCd3QELxGTlO ajsQ== X-Gm-Message-State: AOAM533F/qSZEsjrQ+JZPUqVxGfk7DM2gz3fKsNX2y7Fv8lpwS28hMbb 8z1Vyq5Mlc0LdWMeZ0+04zC/Z+xcQww= X-Received: by 2002:a17:903:22cc:b0:13e:fa73:6fef with SMTP id y12-20020a17090322cc00b0013efa736fefmr34372436plg.25.1634655155701; Tue, 19 Oct 2021 07:52:35 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id x20sm2977888pjp.48.2021.10.19.07.52.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Oct 2021 07:52:35 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Oct 2021 22:52:29 +0800 Message-Id: <1634655149-14972-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1634655149-14972-1-git-send-email-lance.lmwang@gmail.com> References: <1634655149-14972-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/2] avutil/hwcontext_videotoolbox: fix use of unknown builtin '__builtin_available' X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lLf3n/P4mWpg From: Limin Wang OSX version: 10.11.6 Apple LLVM version 8.0.0 (clang-800.0.42.1) Target: x86_64-apple-darwin15.6.0 Signed-off-by: Limin Wang --- libavutil/hwcontext_videotoolbox.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 58095a1..5794cab 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -375,9 +375,11 @@ static int vt_pixbuf_set_colorspace(AVHWFramesContext *hwfc, switch (src->colorspace) { case AVCOL_SPC_BT2020_CL: case AVCOL_SPC_BT2020_NCL: +#if __has_builtin(__builtin_available) if (__builtin_available(macOS 10.11, *)) colormatrix = kCVImageBufferYCbCrMatrix_ITU_R_2020; else +#endif colormatrix = CFSTR("ITU_R_2020"); break; case AVCOL_SPC_BT470BG: @@ -398,9 +400,11 @@ static int vt_pixbuf_set_colorspace(AVHWFramesContext *hwfc, switch (src->color_primaries) { case AVCOL_PRI_BT2020: +#if __has_builtin(__builtin_available) if (__builtin_available(macOS 10.11, *)) colorpri = kCVImageBufferColorPrimaries_ITU_R_2020; else +#endif colorpri = CFSTR("ITU_R_2020"); break; case AVCOL_PRI_BT709: @@ -420,16 +424,20 @@ static int vt_pixbuf_set_colorspace(AVHWFramesContext *hwfc, switch (src->color_trc) { case AVCOL_TRC_SMPTE2084: +#if __has_builtin(__builtin_available) if (__builtin_available(macOS 10.13, *)) colortrc = kCVImageBufferTransferFunction_SMPTE_ST_2084_PQ; else +#endif colortrc = CFSTR("SMPTE_ST_2084_PQ"); break; case AVCOL_TRC_BT2020_10: case AVCOL_TRC_BT2020_12: +#if __has_builtin(__builtin_available) if (__builtin_available(macOS 10.11, *)) colortrc = kCVImageBufferTransferFunction_ITU_R_2020; else +#endif colortrc = CFSTR("ITU_R_2020"); break; case AVCOL_TRC_BT709: @@ -439,15 +447,19 @@ static int vt_pixbuf_set_colorspace(AVHWFramesContext *hwfc, colortrc = kCVImageBufferTransferFunction_SMPTE_240M_1995; break; case AVCOL_TRC_SMPTE428: +#if __has_builtin(__builtin_available) if (__builtin_available(macOS 10.12, *)) colortrc = kCVImageBufferTransferFunction_SMPTE_ST_428_1; else +#endif colortrc = CFSTR("SMPTE_ST_428_1"); break; case AVCOL_TRC_ARIB_STD_B67: +#if __has_builtin(__builtin_available) if (__builtin_available(macOS 10.13, *)) colortrc = kCVImageBufferTransferFunction_ITU_R_2100_HLG; else +#endif colortrc = CFSTR("ITU_R_2100_HLG"); break; case AVCOL_TRC_GAMMA22: