From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id A112A43E73 for ; Tue, 18 Oct 2022 10:41:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29ED368BD00; Tue, 18 Oct 2022 13:41:22 +0300 (EEST) Received: from conssluserg-01.nifty.com (conssluserg-01.nifty.com [210.131.2.80]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 64F3A68BCB9 for ; Tue, 18 Oct 2022 13:41:11 +0300 (EEST) Received: from osamu-pc.. (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-01.nifty.com with ESMTP id 29IAelI1017112; Tue, 18 Oct 2022 19:40:48 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-01.nifty.com 29IAelI1017112 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1666089648; bh=z0CIJ8//uy3fjqWKh8ud3YWtAwINynOzwQYvpoVUopA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i09JT0LDW58mSJ0mMqWmYGLrd8Xh1QPtASF+8M/DCldkedgmfgBwz57y35wzDpSTs Wccv+Wu9/CVqshaOy2EZTD5oOAoFuhK6UAOLnMFkUlEbbHxPhaC/YvZS9MV6lVo497 gL1X8zfYkEqFhQnyXXrO2A+NsVrfQrXfZcHHVQYcNR1I0bBHduuBOw95/tm5/wtReF iQBJVCvGVPY/a/JKeUJvtXScq/oW/cPljcjADtItl3zM+gJi7Z4xc4zmJiCSCPeH/J PXpUA55Xub+SANDUJaOprQ4xtwkGyTfzngrmFT5jl9p9Ffq1ppR/zy8PpAH9txh0eZ 5cMphnWYLcCqg== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Oct 2022 19:40:26 +0900 Message-Id: <20221018104028.34644-3-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221018104028.34644-1-aimingoff@pc.nifty.jp> References: <20221018104028.34644-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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 24a0433dba..5a96924317 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3513,7 +3513,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 f40517e22e..2cc7079c0d 100644 --- a/libavcodec/libaribb24.c +++ b/libavcodec/libaribb24.c @@ -274,6 +274,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); } -- 2.30.2 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".