From patchwork Sat May 21 10:37:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35872 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1003928pzb; Sat, 21 May 2022 03:38:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzZA5ySV1XMqmNy4BuZgFw4ViXd+0moH2imj28IVQX/YB04XGTYRmAqSfGq2+69F3DMo7+A X-Received: by 2002:a05:6402:28ac:b0:42a:42d3:7ba0 with SMTP id eg44-20020a05640228ac00b0042a42d37ba0mr15020825edb.289.1653129534175; Sat, 21 May 2022 03:38:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653129534; cv=none; d=google.com; s=arc-20160816; b=H3YH0uWyy8lkcs89TPuloqAxHYlgSbj0HW9ePwQlqcqMMH2/WGhd3zyteeBQv8oBXX uxZTUa4eNVo8VB07e+l6meikAZfoDGfxt2r2K9UdLPO+zuM53XLjJgO3oMiigVlWu9jM J6HMem1wlcgE29NyUftl7dHIziYYjIuZe8djJT+l15kVcRrKQljO3NL+/4f4KxarYMXh ULZ8zLrQvBpI69nCGPh0ktQX/+0foVFBqcKUnZjDxXAZFwTo9yR18pb9hRk0MVIb9Cgy 9SSZD0M7pN7V5yCqJ0n3RwXn1Wjk7Q1QO7TOD768iiAmiquOaO2jZpwFPc+J/bhMiADH wveg== 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=eeW2QI2T9DIEwfTkpELedkJ3QybG5w1X3usVv408BxxsdT6I03+WgECLSyzmWH48F+ Ltzx2J+m8AdKK5ATAbO6IUnoKveSWc2mzGwa5tu4m4BqUmpXLFn66yL403DsJI/eGcg4 H81eZXUdAWQ4+jlft81g0SBUZj+SDp8V6DrrWY97x8VclMZKIBWEa18kRdJzPml05X0Q XJRBkO1Ri+4lR+HpVbUrkcRcf/QIJxBn3agA33pVXZJfd6cyx0fEF+OxKHOYRtOnW9xN EHM4cK5uQb5XoyYcAexstr0CTjtfBqp+XLky9stwqDS4qjpco/igYNikl7ylOqu+rC73 XArg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=0OiFK7eT; 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 g4-20020a1709065d0400b006f3b717f0easi14148243ejt.77.2022.05.21.03.38.53; Sat, 21 May 2022 03:38:54 -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=0OiFK7eT; 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 1C79B68B460; Sat, 21 May 2022 13:38:22 +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 D729E68B457 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 24LAbdnW005140; Sat, 21 May 2022 19:37:45 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-01.nifty.com 24LAbdnW005140 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653129465; bh=R0abeW6nom4kFCYMO103S2/QFFiSSneeSffrXYlOsPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0OiFK7eTKyvcOuttIHuQ9xsDUIapk5NXRbRQNZ6AZOirA9x1ONbUuLG1AnwgAn3p3 Maia1sI04YszaHJqyV+0A52MhQs98HNeYZadBXiYjFOt+AnfyhFZs395lA7v+qBiS4 rU83wfBntAv6zrLJbJLdny3vjx6ybxQ6uOk7LMq4Uz4s9lOneg3Ni0UycC3dPz3nIa EXXpoZhlCH/ElfmT4rSJn4f1x3rWMRkGbv3ANImdEurgD6edDF3xPRNI/kXj2hnTyq 8dKVK/c7wHdtP7mvvF5GYgMjplF/rL/bipu3pUxiO1avwvo6idh0vquxtBrX/o1lx3 V46HAEOaxdZBQ== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 May 2022 19:37:10 +0900 Message-Id: <20220521103711.413481-5-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 4/5] 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: /EvIpM7z8MfD 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); }