From patchwork Sat May 21 16:09:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35882 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1126531pzb; Sat, 21 May 2022 09:11:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXMn9/msioYiEjaInqxD2H0T6018pOspKLzd3fO7CbZmoHyv4wCaniu2674ktYfzeIBsgv X-Received: by 2002:a17:906:4fc6:b0:6f4:da16:4a09 with SMTP id i6-20020a1709064fc600b006f4da164a09mr13137583ejw.599.1653149503666; Sat, 21 May 2022 09:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653149503; cv=none; d=google.com; s=arc-20160816; b=DKQtUlF6OhDx2jzbeomarso2o2BIwJpWiO0qsL43mjgPk7F4Xeh9wAvx+2xu9pxA1f 1QktJY/Ce29UPYkhYxAjp6x7BLOA0Tu85Pk5CdHOQTET1Cq+Dpp/86BiNKMlQzdRmmZw 2YzG4tHxJgVQasGoylZziS0lA+7rnTK60piwLSVT7bqL+WDMoM1l/2gkQmcVipTTRg0p pn20uLos4B0nRomqjT+vX+awXI1VNfDAQSHiDaIJNctIFT2fplr9PztDs52wJX04Lm/J NStzkwMADBZJ5P9MBBusksfGQAquEgRApXFCu15hRvbIrXkRwV944PAuAJKVhdqkdRrI PNhg== 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:dkim-signature:dkim-filter:delivered-to; bh=WRybDIjHbMOO9laZH4+BxCuxgHXc0sQHQOJ2/itlYSQ=; b=tX+hHH+3aUmNIvYPOcl4Weq2yYQCjn9tou9hN9M7KhGg8pYv6sd6yMQh+jzabrl42Z EC3A4+Yn9ecTBRd9ZmW9/36cTuayXCFTI3vmzSi9USw5X3lRoYmi9/uGIlgNSOWREvnG ZkSLvKA6AdDRLJ1TPqe5CDXhxqmnVR8DIun0d6QlWidR7JoJLBMOxN592tbppVMzbsb2 QadhaACP+yz84DAANWQijpQQvfO17SgUkx0ayiWiwiQxs8K8H7BhdPB7TpasAxCXtMS7 FznwduKmuuPySa1u0QSKu9ei3phkb0K55esp3vbsCYnzF883iea+CH96uWLVaJ90UALy NMuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=Iuv4p5Cy; 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 n12-20020a1709062bcc00b006f4da4cbdd8si8876492ejg.896.2022.05.21.09.11.43; Sat, 21 May 2022 09:11:43 -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=@nifty.com header.s=dec2015msa header.b=Iuv4p5Cy; 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 C49C068B4E2; Sat, 21 May 2022 19:11:11 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from conssluserg-06.nifty.com (conssluserg-06.nifty.com [210.131.2.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C76568B47B for ; Sat, 21 May 2022 19:11:01 +0300 (EEST) Received: from osamu-pc.kimura.local (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-06.nifty.com with ESMTP id 24LGAf7Y026265; Sun, 22 May 2022 01:10:42 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 24LGAf7Y026265 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653149442; bh=KkRP5vX77mBSWEGR6vs12errOXhelymU89Zua+HOSaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Iuv4p5Cyp7wlDsOi2OKjQDSODjmO/fGMDYkDv4eAxQl2yNMkBGPaIa7RRkbVjFQZW H5jAi7t5TIBV4rdPorW2OyTGH0LpROedF08t/WGKH6gWWImy84Fv0N2mvwFSDvCCNo O4CeJVTxiF9DEPkIB0IniQDpOzGoZ8XfzOgYweC0EW6wNDF0IsDey65qlXXW1CgiPY BcRmUw5+eItMbzCVGQMyw1vag7VWVB78lw1MGUD2c+8G22AIdn7phT2H7pQUKP3Jtt 24cE0qPE1Ux94E+OrbSDkA+3K5tlTzF1aPAOPA+Tf3c5x6amJ2nv+PC6gcE6/kguNz ULZdFKDCfsOSQ== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 May 2022 01:09:42 +0900 Message-Id: <20220521160943.582994-3-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220521160943.582994-1-aimingoff@pc.nifty.jp> References: <20220521160943.582994-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/4] configure + lavc/Makefile: define build infrastructure for libaribcaption 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: TADANO Tokumei Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Ou9Ec5MNZDoz To compile with this feature: * libaribcaption external library has to be pre-installed. https://github.com/xqq/libaribcaption * configure with `--enable-libaribcaption` option. `--enable-libaribb24` and `--enable-libaribcaption` options are not exclusive. If both enabled, libaribcaption precedes as order listed in `libavcodec/allcodecs.c`. Signed-off-by: TADANO Tokumei --- configure | 4 ++++ libavcodec/Makefile | 1 + 2 files changed, 5 insertions(+) diff --git a/configure b/configure index f115b21064..37ce16e932 100755 --- a/configure +++ b/configure @@ -218,6 +218,7 @@ External library support: --enable-lcms2 enable ICC profile support via LittleCMS 2 [no] --enable-libaom enable AV1 video encoding/decoding via libaom [no] --enable-libaribb24 enable ARIB text and caption decoding via libaribb24 [no] + --enable-libaribcaption enable ARIB text and caption decoding via libaribcaption [no] --enable-libass enable libass subtitles rendering, needed for subtitles and ass filter [no] --enable-libbluray enable BluRay reading using libbluray [no] @@ -1817,6 +1818,7 @@ EXTERNAL_LIBRARY_LIST=" ladspa lcms2 libaom + libaribcaption libass libbluray libbs2b @@ -3319,6 +3321,7 @@ libaom_av1_decoder_deps="libaom" libaom_av1_encoder_deps="libaom" libaom_av1_encoder_select="extract_extradata_bsf" libaribb24_decoder_deps="libaribb24" +aribcaption_decoder_deps="libaribcaption" libcelt_decoder_deps="libcelt" libcodec2_decoder_deps="libcodec2" libcodec2_encoder_deps="libcodec2" @@ -6520,6 +6523,7 @@ enabled libaom && require_pkg_config libaom "aom >= 1.0.0" aom/aom_co enabled libaribb24 && { check_pkg_config libaribb24 "aribb24 > 1.0.3" "aribb24/aribb24.h" arib_instance_new || { enabled gpl && require_pkg_config libaribb24 aribb24 "aribb24/aribb24.h" arib_instance_new; } || die "ERROR: libaribb24 requires version higher than 1.0.3 or --enable-gpl."; } +enabled libaribcaption && require_pkg_config libaribcaption "libaribcaption >= 0.1.0" "aribcaption/aribcaption.h" aribcc_context_alloc enabled lv2 && require_pkg_config lv2 lilv-0 "lilv/lilv.h" lilv_world_new enabled libiec61883 && require libiec61883 libiec61883/iec61883.h iec61883_cmp_connect -lraw1394 -lavc1394 -lrom1394 -liec61883 enabled libass && require_pkg_config libass "libass >= 0.11.0" ass/ass.h ass_library_init diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 38425d2f22..2613fd78a1 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1050,6 +1050,7 @@ OBJS-$(CONFIG_PCM_MULAW_AT_ENCODER) += audiotoolboxenc.o OBJS-$(CONFIG_LIBAOM_AV1_DECODER) += libaomdec.o OBJS-$(CONFIG_LIBAOM_AV1_ENCODER) += libaomenc.o OBJS-$(CONFIG_LIBARIBB24_DECODER) += libaribb24.o ass.o +OBJS-$(CONFIG_ARIBCAPTION_DECODER) += libaribcaption.o ass.o OBJS-$(CONFIG_LIBCELT_DECODER) += libcelt_dec.o OBJS-$(CONFIG_LIBCODEC2_DECODER) += libcodec2.o OBJS-$(CONFIG_LIBCODEC2_ENCODER) += libcodec2.o