From patchwork Sun Jul 3 10:26:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 36623 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp2138483pzh; Sun, 3 Jul 2022 03:27:02 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sXfH7LckmFFOjll2D8c/PGKu22CD74RvTRdzYN59M+fHbbbltC5mqogwWeLEq/zeuttfn3 X-Received: by 2002:aa7:d542:0:b0:43a:875:64d3 with SMTP id u2-20020aa7d542000000b0043a087564d3mr6591827edr.139.1656844022135; Sun, 03 Jul 2022 03:27:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656844022; cv=none; d=google.com; s=arc-20160816; b=aNsShEOEqizpf52yrAdmnemuV/ih5+MKaJ3ZiLeChfCGteL2V/6m6/EhS5AY/paHTG MXdwEK8DGJHdvO4w9PLqbB7Nn8A7eZbxfkg7tPymKRBYRPANZ/E/NHkd+ACXeL9WC7BE /tQ+h2UjgHFC3ac2W3wuU3vrmYNQBgjB74VcWzjNtRkIZhoC06pYJ2GY+gjXpXpajOQ1 MJzR01RjDzPanXtVXT88qiTE7v9GY/OXNLhfdnrC12olb9Kd0ffM1gUTXQsce0ugFKCX WU68P8imwIhiQENmOOCNgBeXYJsARqvVVEVltGakLVhi6oqlcvnkL/vdWu6n5gXUbMnh SkKQ== 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=B2ntOnhzGQrVf8SbqYFRZsM6s83Jxr4itPUF5U6TL+w=; b=xRJBDa9ZyOCyTyL5BTeOQS1JVPJoFCpQNi7+6jMC5UBL4I0DhB0ysw5vQT/3CUwkNd jDDgyvuKHzOQVziUgYm3zv11iAqhnqrpOEgwjph8kchMEmpYvJyMWCY46mhx2UMQjjQh j1DMEDTZaGZJ1jsSBNr+Mmau3Zes2Sj/F9tQ1AQXcGulSjLNapp6HjMuR6995wJZZSih 2sLAhjMKACUoAcSU25L2ckjt9qn8yIWQGNB97GF/xOmWbsUE6GKf+W7QVozfJF0hj30S qkWs+oZNpSyEzFp7X70IVmWuHsDsMEYJdJOP6bvu2D7YpUMs0mwqP2DKi0Z8SilBSchz ivaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=wCAhOxQ3; 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 q20-20020a170906b29400b0072a60823affsi11482446ejz.49.2022.07.03.03.27.01; Sun, 03 Jul 2022 03:27:02 -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=wCAhOxQ3; 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 8E08768B993; Sun, 3 Jul 2022 13:26:56 +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 4D7B068B986 for ; Sun, 3 Jul 2022 13:26:49 +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 263AQhZg012696; Sun, 3 Jul 2022 19:26:44 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-05.nifty.com 263AQhZg012696 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1656844004; bh=lURmtNuVysyR5NyeKk9sLQlwJMZz8uDeZYwMv+EljBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wCAhOxQ3j/XqfdBNEgGepf7OSYyVlz+qzpieXB34HyII2cUJZ3PGirR3ueMims3+W YwnTiM7n0Twthh0GdokN0058sNknCs5DI+WI7ipTes82Fau1HsKsuDaybLDoa0bcKh DrPieSEwVqTwtBaYG/xGYblk5O3hD5nkqh8pkIqkeWZdAFzgGT66mQKG6n3S6rLWON B1flsYlpuZX8t1G43bjp+1FReXOQycp+AxtJl6i+UQRSE8xibalo2kF3Kqb1053Bl3 zotCX2kLGAQsdm41gJLra6B7yErytAWvqCphHh0kwIvKhYloOh12JpWyTN+LfAz7eC 3EgI0yQlTNyEQ== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sun, 3 Jul 2022 19:26:25 +0900 Message-Id: <20220703102627.398185-3-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220703102627.398185-1-aimingoff@pc.nifty.jp> References: <20220703102627.398185-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 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: HwctDMJQcYXA 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 e2c1c67f5e..4656d0d139 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -3448,7 +3448,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); }