From patchwork Thu Feb 23 10:17:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 40473 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp265276pzk; Thu, 23 Feb 2023 02:18:43 -0800 (PST) X-Google-Smtp-Source: AK7set8/UnNv5qntu1/zK9v3B5Kw9pvsY7/TgmUpnubJiwwP44H1FzjNcnmSrUUJATnG/g1BAR6p X-Received: by 2002:aa7:d048:0:b0:4ab:554:37ea with SMTP id n8-20020aa7d048000000b004ab055437eamr10673400edo.4.1677147523759; Thu, 23 Feb 2023 02:18:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677147523; cv=none; d=google.com; s=arc-20160816; b=CFbIHTcqxX44zRqkvlPUAC0TUNfup67v3n95A+akaBkrX8PCwqGiL6XWZsno9Qm1jD mSqDzUG1H6UHrGgWBB2x7fyx6/d2b7POBGYOShWiRPKCUkKdLSr2TyoR1oMOlWcfvuzJ DCrvK3svHutVTYTzreV2ODUvtY1kxmCFqOWU1yPQa6coyTYN+FuAgnjS3KiyCiPChy0d eVoKReS2b3DZ7jvhpxD3MD4dldsLTMnqsazvcPOV4JEH2k8/L3md3t6sXYxYiGJwidt5 pN+krF05I2gVVgd71AfaVA63vCRB2DAwjtVmkFHsUQJYb4yNIlBSPot0YDElGO9NqfHy mWFg== 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=fum46+7J0tt36J6wTvbx29An7dmmaoBqXyBXDzcgvXk=; b=O0zQE55N7xDEOP4pUd5xFX1juhA8Bvzwa4bte/nF7jqPjW9ghAd3YUvOFmPzBQppvy s5hR4x3joIF+bsOXiR8RzTKmI1hLf3B7J+bst9kZdf7Fu2LFbRGI5NfPw5AlmrWF0inv LMxd1M81/HBgSEX47FfHaltVw66UajD7KoeGCMEqmPJcvevWTxo+tpQUIt6q6+lo5TxM 44Cy35a4BS5LRcG1zJ4SJAiIy2UgBs8bDQ8V98L0Pkr1FfiO6IHgYuAHFz08JhGWy1Tg YTTMWx9Y+nlrBywcXfzLCF6DOzP3ToPNyT5NurncoG1yk19TYKvi7EaI2AUT6O4HPnZR bOGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=qzcUtfdd; 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 m17-20020aa7c491000000b004aaa653a74asi6277496edq.596.2023.02.23.02.18.43; Thu, 23 Feb 2023 02:18:43 -0800 (PST) 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=qzcUtfdd; 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 7C29168C0E6; Thu, 23 Feb 2023 12:18:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from conssluserg-02.nifty.com (conssluserg-02.nifty.com [210.131.2.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B065D68C0DB for ; Thu, 23 Feb 2023 12:18:25 +0200 (EET) Received: from osamu-pc.. (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-02.nifty.com with ESMTP id 31NAHthv015305; Thu, 23 Feb 2023 19:18:04 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-02.nifty.com 31NAHthv015305 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1677147485; bh=v13cEGOk37dCYVoHQALvruWonxAc4SDVijA0QjjkCNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=qzcUtfdd9YscosywclyQd5cpVc0Iz2Gz8P8fol3ENRHoMm2+vTZp07lkfzW60Mm+n ihaIvcGnfLvzGvjpeQl3QcKMaMRxUGwt750y7pACyGT2ONdi062N0rMJdSDbqYPK7O 0B5Gli3pAy5TLNoiXvJRuAvCCUhbez7B4DwrIkmZ/uTa4uiAz6e8pP8RYi8/tGcng8 mTEeMvvfPdErOlxyB50ofuAaIaw4+5UvSU4ZOjrdLvjc9EtMU0C8cCKn0BtOjfqUoA nAhJFW+w4i3MfG6GhqBrSNeOEWwEAxn3PZ73uqoYjpUTBWTUhTaSCb26EwO6KveqVw e9M6d1xSaY3eg== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Thu, 23 Feb 2023 19:17:16 +0900 Message-Id: <20230223101718.562202-3-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230223101718.562202-1-aimingoff@pc.nifty.jp> References: <20230223101718.562202-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 2/4] lavc/codec_desc.c: remove AV_CODEC_PROP_TEXT_SUB property 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: ERIdIU5Vp9vC To support bitmap type of subtitles, remove AV_CODEC_PROP_TEXT_SUB property from codec descriptor for AV_CODEC_ID_ARIB_CAPTION. It is similar way to `libavcodec/libzvbi-teletextdec.c` (AV_CODEC_ID_DVB_TELETEXT). Instead, each subtitle decoder has to specify subtitile format. `libavcodec/libaribb24.c` uses same AV_CODEC_ID_ARIB_CAPTION and expects AV_CODEC_PROP_TEXT_SUB is defined. Thus add a line to specify text format subtitle. --- libavcodec/codec_desc.c | 1 - libavcodec/libaribb24.c | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 199f62df15..22b7f3c7f9 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3548,7 +3548,6 @@ static const AVCodecDescriptor codec_descriptors[] = { .type = AVMEDIA_TYPE_SUBTITLE, .name = "arib_caption", .long_name = NULL_IF_CONFIG_SMALL("ARIB STD-B24 caption"), - .props = AV_CODEC_PROP_TEXT_SUB, .profiles = NULL_IF_CONFIG_SMALL(ff_arib_caption_profiles), }, diff --git a/libavcodec/libaribb24.c b/libavcodec/libaribb24.c index 8ccf3c4b5d..e3e244be99 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -291,6 +291,7 @@ next_region: av_log(avctx, AV_LOG_DEBUG, "Styled ASS line: %s\n", buf.str); + sub->format = 1; /* text */ ret = ff_ass_add_rect(sub, buf.str, b24->read_order++, 0, NULL, NULL); }