From patchwork Mon May 30 14:55:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35989 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:6914:b0:82:6b11:2509 with SMTP id q20csp2320350pzj; Mon, 30 May 2022 07:57:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwilRWHhEI0lY7ugJx7ddjLtLyif1fTuIg4s5L5Po1u669GqU8/45UPHAvOzZcW+1MDZiVg X-Received: by 2002:a05:6402:3496:b0:42b:dc8:5d87 with SMTP id v22-20020a056402349600b0042b0dc85d87mr53869461edc.23.1653922649189; Mon, 30 May 2022 07:57:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653922649; cv=none; d=google.com; s=arc-20160816; b=nKOBxFyICMN7ZJ8OmPtfxhDub97t6hXAX1hTzLL0IozeL4JCD7uuOMYwr8xHvPBwkI Xow5npaKaC9qRNTLYSEv6uIXOYgqJgESz53snCtBwcbFe5F/EJcLcj1drWwILJlfpNe/ cB3eM0Zzmrei7XjCm0v4jNs7zAexeFLklw+kr6gbgYsAzfvFpZkaDIG/DbVp0SiiILfy gfJd5sJx86LcGG3CwP3v558/HVAbWE2AC9rgtvfPD7ZmeWeNumZorD8k2sJm2HBUV+md XA6AkFmu0Hz4H9FbU5SxvYoPBabcFqpgPqYVT6nA8mrMoXOMuhyiIMcrGMlBwOD1H8F9 exMQ== 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=EkbTcE/ozTpO71zpoKy9aZ87h3lWcJYqnxRI0b/z53oUV65FZz+U9aKxLsRmm/3r0p at2pMT8O36TkYI5AMzbcRcyJeBhsD+nvMedxrRsG31KvB8TI3U1IF7zRrYOLuoUkQ1GI QdfQlOVr8YJxZSFq9gOtC/x81JrCUOFo0/EGHn9DYx3SlP9csdQ0m4bZUbI2ev451rJ6 lzDX/EfC26v8iAxigsGwt8a0o87tbABz/8hJADr/JDyCajSztDvD01MmWL15cVbNmsgV iN4fduQHwRE3X7Xp0CPryDbv+tYjPlbA0aHf0bURBmmLR5+lCcTc3ShvltxIrA+k0Div Gr9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=P0heRbCi; 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 z7-20020a50eb47000000b0042b9c69af1dsi10858892edp.90.2022.05.30.07.57.28; Mon, 30 May 2022 07:57:29 -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=P0heRbCi; 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 909F968B61A; Mon, 30 May 2022 17:56:55 +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 13A2F68B5DB 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 24UEuMFF014185; Mon, 30 May 2022 23:56:23 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-05.nifty.com 24UEuMFF014185 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653922583; bh=BdWy/cpR4MZOMkRm0eIFMgsqh2uK1XWHkhg7RfnyK9U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P0heRbCi+rca1J819B0O3Ngwp1NkhomdjT6rreNah9ZqxdOKA8EFww5MiYNzFFWGT iTceHH5qv67gp3mX15mNUFRQ9Sf4036EkdItSpmvdAxuoNIPhfTpWZhyMvJV3jdLx5 EJHjdJ4Mr/MOa3DJsdfiUzDMnKKR0fLqvU3b1OsBYPOvffZdwIa03253wuRMZwixVc uqQ22wgthZErkSdMMaOiC0WjJw7XhKuIuk/d2oXNUB4fdZzbMblJXHPHI8089NL7Bj bKOY1NxcVlvnzPJufjggDTyWh9hdyQ509FMA6/5PXMDVkDMNerrsEEsSNvVWLXc/y4 2mP+cnGZ06zuQ== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Mon, 30 May 2022 23:55:47 +0900 Message-Id: <20220530145548.211886-4-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 3/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: juMIcfI7TOYV 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 */