From patchwork Sat May 21 16:09:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35880 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1126326pzb; Sat, 21 May 2022 09:11:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsJAYbpxa0AFO5cdryZ1VhjXBSjPIpKA8+aDf3rmFOTJDFmccQ5UtIwtLqkwAjDs+lmq+O X-Received: by 2002:a17:907:1c25:b0:6f4:2d46:52ce with SMTP id nc37-20020a1709071c2500b006f42d4652cemr13162895ejc.25.1653149474500; Sat, 21 May 2022 09:11:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653149474; cv=none; d=google.com; s=arc-20160816; b=R7i8B4Qez4mzp8HgA6Bj9TLjoQpSq9YmJG2Y+xmbNYcc+JuG8cXIws+/0urRL8bYVZ NrRChW7WZ0fvl6Gpdq0GuOMmTTLYZhD9Hh7FNc0kEmOwjx1GuEX99ufvCkY8G3mhiB0c IAocBCwKMporVrLRVBDGxFlOyETiNMKFhNymN4/yydGDPq7fLP2BFsSl0316rb2yPWIA MtJdOd0sxRxr7LMCFiXW2Mii9h157ntdVh+BQVWf3cqXtCvhMIZTzSHhMA9iI/2cB6Zl fgv6jkMy5tnJD9bHBnOTonSB6Pl5VM9qRAjK6kpuizgfSviV07zhOt7INeOxBMhIVxea 15OA== 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=KqiLG1oYQIXh4UOq54wgxVEVUlMZozrRZ52GtMPhcm8=; b=G7DDe4Wpasw29LUCtHVltYim3bvTvioU8W0nRrO2mvLdXQiFX0yKe7kiL6U1vQtz82 vBoO03FpCI4IY3rHxtIckE9hxxJeZqOVkVS4lxRYX4P758W63Q+l8mjEVVZA+9v9hNm+ VN68G4q2Png+fTGZB8DXl6CxI5keZeufJBQ4Mc5pspvB+Gq9rXyCKFMlOGMJDZbmxYgG 48D3EHvyIncL6FLRwslDqZiWep6Ro790RVmRQPqkPdbcn1x8JXWG3/UzcK2Jla+8REv0 fmzXeuCx7VlrmVki+FoNDyQiwboWbJenkmHKhcjeuzNM7wFZgxUQ2mFc6Hc5qChgZN/s tuCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=l1clnLAI; 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 a25-20020a50e719000000b0041d664093e1si10127493edn.482.2022.05.21.09.11.13; Sat, 21 May 2022 09:11:14 -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=l1clnLAI; 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 9F4AC68B4B2; Sat, 21 May 2022 19:11:08 +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 89A9A68B476 for ; Sat, 21 May 2022 19:11:01 +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 24LGAf7c026265; Sun, 22 May 2022 01:10:43 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com 24LGAf7c026265 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653149443; bh=BdWy/cpR4MZOMkRm0eIFMgsqh2uK1XWHkhg7RfnyK9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=l1clnLAIHFiQdOwM2ft9vyfHffn/l1tmxtcJ1xXem6xFLKAV/fDI4101nTSPjgxkU 8/+Um1I3nWAvgiOaCde5jJ9qzbDzxDJuzeYgGeKRJ12HpK+mO12soJx6LYWWs2JUxL RfbOcvqGjpAzEZ0/9b2t95v9k4izWd77ZmN/AiifCMOazv0C3xFK9wLGe8DBjGATEl IP88MM5uYcD78NTAhcRGEOdEOnG0e0dE0/haxLAIn0L/WXkjfoDw17MwP7HB3moccr J9TP7qVWa6fPVGAVysc+wgeYOq4NAAN+8CkHOILgPTmCLiJQWSLic6OPnryFoe4Dxb benv5v5Y/4APg== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sun, 22 May 2022 01:09:44 +0900 Message-Id: <20220521160943.582994-5-aimingoff@pc.nifty.jp> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220521160943.582994-1-aimingoff@pc.nifty.jp> References: <20220521160943.582994-1-aimingoff@pc.nifty.jp> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] lavf/mpegts.c: set some properties for ARIB caption 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: tsTFVpg9Qfs9 Some additional properties are set for ARIB caption. * need_parsing = 0 ARIB caption doesn't require any parser. This avoids "parser not found" warning message. * need_context_update = 1 When any profiles are changed, set this flag to notify. * codecpar->width / codecpar->height Find best video stream and set frame size for ARIB_PROFILE_A type of ARIB caption. Signed-off-by: TADANO Tokumei --- libavformat/mpegts.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 6e761c07f1..ead833c264 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2145,6 +2145,7 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type // Vol. 3, Section 2, 4.2.8.1 int actual_component_tag = sti->stream_identifier - 1; int picked_profile = FF_PROFILE_UNKNOWN; + AVStream *v_st = NULL; int data_component_id = get16(pp, desc_end); if (data_component_id < 0) return AVERROR_INVALIDDATA; @@ -2155,7 +2156,12 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type // non-mobile captioning service ("profile A"). if (actual_component_tag >= 0x30 && actual_component_tag <= 0x37) { + int v_index; picked_profile = FF_PROFILE_ARIB_PROFILE_A; + v_index = av_find_best_stream(fc, AVMEDIA_TYPE_VIDEO, + -1, 1, NULL, 0); + if (v_index >= 0) + v_st = fc->streams[v_index]; } break; case 0x0012: @@ -2174,8 +2180,19 @@ int ff_parse_mpeg2_descriptor(AVFormatContext *fc, AVStream *st, int stream_type st->codecpar->codec_type = AVMEDIA_TYPE_SUBTITLE; st->codecpar->codec_id = AV_CODEC_ID_ARIB_CAPTION; - st->codecpar->profile = picked_profile; + if (st->codecpar->profile != picked_profile) { + st->codecpar->profile = picked_profile; + sti->need_context_update = 1; + } + if (v_st && + (st->codecpar->width != v_st->codecpar->width || + st->codecpar->height != v_st->codecpar->height)) { + st->codecpar->width = v_st->codecpar->width; + st->codecpar->height = v_st->codecpar->height; + sti->need_context_update = 1; + } sti->request_probe = 0; + sti->need_parsing = 0; } break; case 0xb0: /* DOVI video stream descriptor */