From patchwork Sat May 21 10:37:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: TADANO Tokumei X-Patchwork-Id: 35871 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1003866pzb; Sat, 21 May 2022 03:38:44 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/Ka46RtljCQOm8jyu2JlGGGEFFU+llSGWf92+ntYOmVdFLBCmMb5TPLuOY7mmAiqLIrok X-Received: by 2002:a05:6402:1d4c:b0:42b:394e:38ab with SMTP id dz12-20020a0564021d4c00b0042b394e38abmr3954890edb.228.1653129524724; Sat, 21 May 2022 03:38:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653129524; cv=none; d=google.com; s=arc-20160816; b=qHqsy8pTJKdHqLiV5dhxwKjb5tASn6iujZ2Vk+GF/POf8DXYxt6BhQrDFCkEV3AVKw zCVCTXedGKfnwYkBZ97Ve6V8EtAnD1NuSfVqUtitiTcDKD+DNhP1mlHjfLz6yCvn4mH7 uowhP60J835kU03a1vOFqKBapYLSzTApcvNtB44o4sIhlHvaKFLezb3LRbadt16arp4v pXtXIzwz2L/WxKZJvki7eb7tWuGvhajGd+YKlE9i7BqeAStgWqWJWFrrEK47kGp/mVEG FCJ2HDIbEMQJ27M8qUVBp+hQxM1LC5NVLmlPyo3xmIbM5ZcErTUSaZAGNqtwKcdXsSdy AYOw== 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=ujd3jeU4CaYfT/SjWqLogRMxU9QdFwmLjZn2Fu+BVYM=; b=ooGMz9IfVxMDlnT8iwjl36di6ddwiz2tSMaQIRDEteKb4vCjZogn4uZz6ga4Z9UgaO 8tHUOReoER4SWxtZ8vq1ZdgsRPjj3d4qC7j495Sj9VfXffvlgQXNp1fZx0det+QxrRlW jSnyjenMJRGZ/9i/QeoDYWFWYItOHQkS0JQlnnyvqv34H2pj342oFM/Dj/0Za3u+59cl WQQj2KZLhYUvE+EkWO8GY+mUt6BiTj9cXY0h5MKcfAEOv4dJE3vMERDfoQgprL4c45aQ PVtG49qZyNnA+qm/EXKd2vnVBegVuxfjFXQRHtwiPW2v/+uL1AAAE+g7c9uwglX6h38c bXZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@nifty.com header.s=dec2015msa header.b=z62lUvGV; 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 k14-20020aa7c04e000000b00427b097c73dsi10091640edo.75.2022.05.21.03.38.43; Sat, 21 May 2022 03:38:44 -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=z62lUvGV; 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 3021F68B4D0; Sat, 21 May 2022 13:38:21 +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 CB9CE68B42E 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 24LAbdnY005140; Sat, 21 May 2022 19:37:46 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-01.nifty.com 24LAbdnY005140 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1653129466; bh=4QJgzUZgvWFTUES4hXNRzpXRnAnER2hXC45ff6jkkCw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=z62lUvGV8GQ8D+q+yuRi0hMdmqJDyoo/bOlrqQvbiAlBN28/1+iijlXvVuPkKsDld BesAOH93D11XbARe3GZdxqxNqdhsXHFHbrNleMqZ2thr2cg7hfUaCtzgX/6ctVKwhR ywUxstB5fRBJ20px5KmRRVu+q7zjOPztYqzb4w8eVdQbF6EpLAdfdXhuxGugGNrFHn Kv5KnaUJkIduilZD4iyfky6OjQ7ZTA68oXK/DWyuELIVTkvKQrDjCmtC2zBuIEsFCz PdTmyvQb3S43Zb9M1nDImmhJzqcsqjpjD8EVs1596NXgTU4RsnB/u76vqAKUzp6v6a uYbkUKWTOr5uw== X-Nifty-SrcIP: [106.73.25.34] From: TADANO Tokumei To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 May 2022 19:37:11 +0900 Message-Id: <20220521103711.413481-6-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 5/5] 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: yl+M+DqPO8/+ Some additional properties are set for ARIB caption. * need_parsing = 0 ARIB caption doesn't require any decoder. 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 */