From patchwork Mon May 30 14:55:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35987 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2320187pzj; Mon, 30 May 2022 07:57:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwoBUSsNqDvq00tPFyuKBPQbiBfTCOeeJC0QFFYJTosvp4H10jDk9pLxX26/9tFKnvmK3uF X-Received: by 2002:a05:6402:1941:b0:413:2b80:b245 with SMTP id f1-20020a056402194100b004132b80b245mr59130742edz.252.1653922629145; Mon, 30 May 2022 07:57:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653922629; cv=none; d=google.com; s=arc-20160816; b=xCu4sSJhNpz+gJIvec4CmY4kqfGCEJYQWpOt3Y7EMKQTyQOicp8Q0UFb2go7zyVY2M Ix1dNqizFlT4CaO6EpDpSNYNAFCrZcjmu6t23jBkbnfG64uuurWZa8AzeAWoOzT1jmo7 64qpT1ccf7Xa1U+QxTwBpstmmKnRyzg/bgc5eU6vGwbVg5wZ64TS6nh8mjyj7NBHlDig tjRTDshR09EpsGDFEeL2GtXhKsbA9xfWJvab1sJE9spa879QVwy7254pz7Yl16ZFTOf5 0OqQerrdfNASl/JwXMIPbA1lvmD0CBSWCTjSRRYG3YWYuHSziQkMzRuiVn2BuLmpoG8z 8AAA== 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=vflG3+7DXvd7hcr7JizJcO9nKWmFM6Mz4shLPeuG7aI=; b=X/4TxiYfziprbFQfGRX1Kko54QDDoPA6f8mOxjRrPitmOwMESDgdMABTWWl+Y9eaQy XQIuE4siMf2d2cKfJ4wE0RZQseKUaiMmgwMlKqokRRsya3IZhEhnATx8CgLFiR5zOSKP /cnATlq1YL7OEwH+ayp6f15L6Qg84ksQiHk2DtZ8v9hDoOXhYgc4LCkSNOvq+ED0cbgz NfjGcJ2RrpNHuleCGSKCnYReBdNhi+ogG93y7vwN2Kpvb0cKT1J23vu7JtAiXSYRbDl+ OBEmf8CrHQCQfAbbFZZLi8EP/3A2Wp/SzTHsQXIjAIlgbl/eiUnI7gRYaCqZB6iKK78r it0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=QRJhqTls; 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 y12-20020a50e60c000000b0042b01d1b95asi11302089edm.363.2022.05.30.07.57.08; Mon, 30 May 2022 07:57:09 -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=QRJhqTls; 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 7CA8168B5DB; Mon, 30 May 2022 17:56:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from conssluserg-05.nifty.com (conssluserg-05.nifty.com [210.131.2.90]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 164C368B5E5 for ; Mon, 30 May 2022 17:56:45 +0300 (EEST) Received: from osamu-pc.kimura.local (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-05.nifty.com with ESMTP id 24UEuMFD014185; Mon, 30 May 2022 23:56:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-05.nifty.com 24UEuMFD014185 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653922583; bh=R0abeW6nom4kFCYMO103S2/QFFiSSneeSffrXYlOsPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QRJhqTls0KFbLKfl9p6xWIwkymEIrPiFCCUmbKaCeFjBfx05kKXSz2xNaGrd9zXMf 8NrcPI6hbHbO4i5MWqE6nM5Y4gTn65YND6FQ01zFNqKS4lXJsL3+iAfYO1bApw7BzH PujK4gCw9feS0LPsBXjCIpI2qPti8sL0WNqlm/PDf1LxoPtz4jV4Ch5dW41+BYfKp+ Phw5OppPpSmoly8WiazcXqQ0zEm5cK6GnfWXgKljV71LNtIUQ15DD+sBRLS37MRqyt LXO9/3G4S8+23Hi3G2yy6iauVrWROuiWcmpoMiZM6SSawUpJKnaCWOBFDAcAu3VDqm FTGkzeAMxSS9Q== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 23:55:46 +0900 Message-Id: <20220530145548.211886-3-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220530145548.211886-1-aimingoff@pc.nifty.jp> References: <20220530145548.211886-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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: YOS0nmm/uIVF 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. Signed-off-by: TADANO Tokumei --- 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 e7f0f6a8d4..d0a31b536b 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3441,7 +3441,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 9658e1d5ac..46c25053b2 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); }