From patchwork Sat May 21 17:21:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35884 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1150857pzb; Sat, 21 May 2022 10:21:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx74tfifsJWFqQw2L7wPDhFwqE58jZoamSOZcmPduhAmdmv97O0Nes0F2NBZclMMyGzccfM X-Received: by 2002:a17:907:1ca2:b0:6f7:f64:2788 with SMTP id nb34-20020a1709071ca200b006f70f642788mr13304668ejc.97.1653153712303; Sat, 21 May 2022 10:21:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653153712; cv=none; d=google.com; s=arc-20160816; b=nMBVRTEgDfggBUHtMzQQQcF0AozhH6GwwcBf2O2xJW/3ACE72Tox+RqSH52k+SQiu0 jm7hKnjkPc0nqoM2+8iZugAnFN3WmliYVOri7UW19RSNtOXCNHW1lqgBdIqnDZAFuLHr jP/W6iMp0CRnJ/lcplslTJZfWuXEUeIhRIjBEYQ9KqHsTiEtkdFcxP7sERgW8raw0dXR noc3S+ysM6KLxH5YsnII6tYLh5fPk/5vMNMoAqxetjgRroG+2V22LK9L2ETcobf50Flz 88Az79CuZfdiM+eFjp3uFAeVvPW52Cg5/u9RVS0mtkwnmYnHeJRyHBienMI4T7WrF7N5 nIDw== 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=W0/84j/+Hy2A/bHXWfOeTOreDVGg8zk+bDbhCBFfAQY6icDXwhr/CQYTHyNnEtMtT9 C/ki21QD+JQ0Ll7XB3pt0GGl5TE5C4SvTJpJDEODM8KfV7+JU+HxMEzxq//jD3cdYxLi LKggMzZ1xOk1eLYXrRjCeBFqvbmAQg51xhCpovnIEEHmZZTm/sCEcJCj75yt0g6/MSsX Y6Rk8hmqqTWTQok+ofygf3eB2IGpWn6nEuNmUgIu0yefmrTzQyjUwKJRrsvr0JNnw6rw +eTTMniQXEMaimQrZ8xsyk6eelUNBuwCdZTKI2djFVyPdpoLNAO+HZ+i8LHpBeOXj/eZ GPmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=tw6dqDD4; 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 s1-20020a17090699c100b006df76385ec8si10928963ejn.872.2022.05.21.10.21.51; Sat, 21 May 2022 10:21:52 -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=tw6dqDD4; 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 8A4EB68B4A3; Sat, 21 May 2022 20:21:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from conssluserg-06.nifty.com (conssluserg-06.nifty.com [210.131.2.91]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A7B5368B0E6 for ; Sat, 21 May 2022 20:21:39 +0300 (EEST) Received: from osamu-pc.kimura.local (M106073025034.v4.enabler.ne.jp [106.73.25.34]) (authenticated) by conssluserg-06.nifty.com with ESMTP id 24LHLUvt028168; Sun, 22 May 2022 02:21:31 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 24LHLUvt028168 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653153691; bh=R0abeW6nom4kFCYMO103S2/QFFiSSneeSffrXYlOsPA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tw6dqDD4W+cjQmiUtuR5G9rLKtc2OJ6aofycg8WSoQpppc/lsfUDETpWz6d7FY1ES GMKL261N3TF+n900h04KocwdbiG8SW8FSFOPIR0gyjMjT7efgdMn3+rVRouyO8COmi t0YGVYimh1SKVW3D2s1nYu2Log5VWT6MCbiFWtFihaIyIvzFw07rXubsaRjztnlK2G LY2k7gpwmAD0VyIZRmcOuVYmXFWZugkIN83tX4usnCefEZWrsy+BIO/+M0VyekZpBk /T5iS47h6JPZHNmV2Xfky32aq0kh/sZd+aGHUwSqohc3O6IHOBRmnG68IUn39XKi8q nvSJMHNdYDfoA== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 May 2022 02:21:27 +0900 Message-Id: <20220521172128.716289-3-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220521172128.716289-1-aimingoff@pc.nifty.jp> References: <20220521172128.716289-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] 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: MwVuMfnHwVBl 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); }