From patchwork Sat May 21 10:37:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35873 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1003997pzb; Sat, 21 May 2022 03:39:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwBhd3CmFiu/P+DJ7olwLYWrFf3lNlqEprHQ50jQUrKbL3Uh3rgNnEoekNBf19asqZYDjp5 X-Received: by 2002:a17:906:dc8a:b0:6f9:13e9:4c87 with SMTP id cs10-20020a170906dc8a00b006f913e94c87mr12066736ejc.729.1653129543457; Sat, 21 May 2022 03:39:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653129543; cv=none; d=google.com; s=arc-20160816; b=bqdxZzJ1JdcM/8Faru8x7h89xN7FRka/BV4tvpCi5RKxDnuB5i8o1isstlTQseL+jL Oxn2cd9Yq0cAXUNuK0TuC0LLOSft1I1vhbg1apOxUy6aBdB96sifdb+oj+cIn+/6QG2B WGQioCzm4FUC8kKzJwZNp0bt/7Lv2j1O/l2DUpUZknhAwQhMXrVuoLUeTP85sOwUGZF2 y/eaWwHrNkot60qQXNdEMov8SyHsjkPf8bsYnjy3jCZzIRtPKoiJ1iSvaj1V5+d12QD7 VchpDzn3ObbhfFW7BWb5Nx4g03ScQ74MAMsd38sPBWBFL2pCFYh73nmP6InR/QIZzmWJ R5Wg== 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=6+hPb51wF9zE5OgrZ7yEM6zAAEdRGxCVvx6TznJ0EJs=; b=k0jdeH6nA3Y4vFcnHAK04bAl/J/KL92uEYpY6/isleMhG34bpjdYqmb5dKZH1O7XCf uvxCE7gUlOlT7YzpTFikmOhWtEsQxKsAWbF3E4uXxlLH3CPsqwIDDnS6eQ9HtawD68Db x0R0IN1ryQgWo2ouKUYdGCtNqL7dRERMEbTx0O3iXdaMOO3Mxl4Kb85m7DKPcdaCu4jY 9pjzXvXZIO3NRfodkbJ52oUXOmm5mh6Pu8e2uRgwtx5jgCFZo4l3H/r4mZWuFpyRqN40 X1NECS0MbNbrZdRKVPZ8918JHYeFoYckoI8fU8EZkG62o7B3p0a1LsBvNh11GAza3xL2 Nm2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=ojscAmlh; 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 u6-20020aa7d546000000b0042aa9beb66dsi9179736edr.417.2022.05.21.03.39.03; Sat, 21 May 2022 03:39:03 -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=ojscAmlh; 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 0E6AF68B462; Sat, 21 May 2022 13:38:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from conssluserg-01.nifty.com (conssluserg-01.nifty.com [210.131.2.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 03DF768B460 for ; Sat, 21 May 2022 13:38:11 +0300 (EEST) Received: from osamu-pc.kimura.local (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-01.nifty.com with ESMTP id 24LAbdnU005140; Sat, 21 May 2022 19:37:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-01.nifty.com 24LAbdnU005140 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653129465; bh=u/+aLoMuw5sL3QXeTVMBub72q6lA420llpknffWpIiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ojscAmlhD0DlipbcRD8plA05D0Z1KdbSHv2IsJD40XLuK4uSsJmrcN4fHg8W0cP4F yyUledX1QXfc2cvwVw0pCb20kNxBf8swGbHDvvba6j41OYGPkpJBv+eeIOaLYDwqEX 5SAK04nCg9fcfht6mz2RVg9je+x4r9c05Vw3vqN7fW2VcBCbIPmvtGBxUzvX8ccB7Y 451Fw3Kkn6wQ75vpP9uigmmNZyD61HUrpBDGoCRx+x1q96EY40S/BCM9WDfjELQ1iM eHM1mv0o+UcMgxUctFwbOzFJFCu6j5gJ0f3/bkxLKY0xUnA44JHGKh+9S0kqngLkic sPkU+NaQ2m7Ig== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 May 2022 19:37:09 +0900 Message-Id: <20220521103711.413481-4-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220521103711.413481-1-aimingoff@pc.nifty.jp> References: <20220521103711.413481-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/5] 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: Woic0/3Y3APs 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 | 5 +++++ libavcodec/Makefile | 1 + 2 files changed, 6 insertions(+) diff --git a/configure b/configure index f115b21064..d7222f724b 100755 --- a/configure +++ b/configure @@ -218,6 +218,8 @@ 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 libaribcap +tion [no] --enable-libass enable libass subtitles rendering, needed for subtitles and ass filter [no] --enable-libbluray enable BluRay reading using libbluray [no] @@ -1817,6 +1819,7 @@ EXTERNAL_LIBRARY_LIST=" ladspa lcms2 libaom + libaribcaption libass libbluray libbs2b @@ -3319,6 +3322,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 +6524,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