From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id 36E3F4EF32
for <ffmpegdev@gitmailbox.com>; Wed, 14 May 2025 22:40:48 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 262DA68C0D9;
Thu, 15 May 2025 01:40:46 +0300 (EEST)
Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com
[209.85.208.46])
by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 0658068C056
for <ffmpeg-devel@ffmpeg.org>; Thu, 15 May 2025 01:40:40 +0300 (EEST)
Received: by mail-ed1-f46.google.com with SMTP id
4fb4d7f45d1cf-5f6fb95f431so2621581a12.0
for <ffmpeg-devel@ffmpeg.org>; Wed, 14 May 2025 15:40:40 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1747262439; x=1747867239; darn=ffmpeg.org;
h=to:subject:message-id:date:from:in-reply-to:references:mime-version
:from:to:cc:subject:date:message-id:reply-to;
bh=mfH4GcRPtYeCaVUKmFMMr6K12TfzW8bmHUX5Zulcow4=;
b=jQlAKH1TDtK4MICtdkCu3FUrZTnA+xoGHXZnu34Xmaw8INUnDzQI6vBXBFKKXVpsPD
uCRc3Y8Xh03h0tOuwcMvriOrKSlqaFoPfuBOXwUXjCJ8IrKOntTKB/YS+qGzyTpOsRze
zpd/r4ZWXBFtxCWi+Kdh2l2EMzh+lXPaa5TyEOwZB97VQyTnXeq4E4crWI7v+sHoE0q+
iqum98zk0NLIZ2dU+D2ax8vL5FBznWrcjn6xwHTKX9hSVWk4cuA6vNjO3I48AZ5/1MOG
YeKHRtXKVa8WEA517jDFL/AzAQhniMXhNXtWIJBAX6k7pUXMi82AnSX/QvciZ8LtCppU
C9Qw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1747262439; x=1747867239;
h=to:subject:message-id:date:from:in-reply-to:references:mime-version
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=mfH4GcRPtYeCaVUKmFMMr6K12TfzW8bmHUX5Zulcow4=;
b=dQuBwDaXH+PS8rA5u3Z/hZWvUHI3WlItyK5oD9LWsIBIduoKDjVcEALdMlgvwYr/dm
B/zZy2nbvhTOMiI1mBkitowEdqxYpAuDqayxlZtlmqfMSCBl2M0sQw2+8rDtzSOAMe88
QuL4JqwHSo39DvDWkfSNwy4aouknd18gofNaKDgCW2h2e8rmJT9Ymheh2b2VMn0beRd/
0X86I8JLLhM2//J6LR2NGW4yyByNTZM3d//UtWU7wxPzkiwt1jeqAE1pqW3jMaGXxJSH
WChtOmVTzJU01Dh3Ba0SZyLaoyEpJOvVOWunO5O22cP9KFN0DtzmeXorvyoveS+lAnF9
LlcQ==
X-Gm-Message-State: AOJu0YwdYaB+T5b/yyRZgcR3knRdQGpIcvv6ZfZ2depF4ZzNTrXkL98O
WtmP1CVQrm1oC2WnTwcRIDXKq9DAEL4DfOpDR0N0hyZFXzOGSp02G/dJ/OdM3nyZ77q9/aUQOMk
g4hX7uw5qXTI+u3uX2JC6n/568oANCNSWRlPK
X-Gm-Gg: ASbGncu8L257LKGKwmvSWVBrLsPs4r9x6I6qTJuaC5ghSdovG3KPc8AyYL/DO5xyaTI
ly8B8Mk/5iTAZ0qDMbcKpuOSKJmJo2IBjT+meg8Dn36k+Jusz7OhhepwEprI4jTe4RkEWykPgsY
gy3us97TqxwF17xHmtaNTTlpvJJDE0ZNbIveVWfr0VGSyNCM10n41aFV0TQsL6VLXtJn4=
X-Google-Smtp-Source: AGHT+IEkm16OGMOUKQXIaWw1DJodyJLf/L/ekAi5yVbjE6R/xufJbiFiVrl0lWLFdEXvcx8qIzCwOrgE1na50+9GWrQ=
X-Received: by 2002:a17:907:7d93:b0:acb:a7cc:4102 with SMTP id
a640c23a62f3a-ad50f611f20mr112064366b.4.1747262439105; Wed, 14 May 2025
15:40:39 -0700 (PDT)
MIME-Version: 1.0
References: <20250510000115.27108-1-pkoshevoy@gmail.com>
In-Reply-To: <20250510000115.27108-1-pkoshevoy@gmail.com>
From: Pavel Koshevoy <pkoshevoy@gmail.com>
Date: Wed, 14 May 2025 16:40:28 -0600
X-Gm-Features: AX0GCFtrr6K-Rt73A2L_AB-Z8JAQJYuoCrmTw4PF-Ynd9JwBS0ekwUjsy6ScoLY
Message-ID: <CAJgjuoxgwPFqAKAh1uO1acfyvTpCA=NqeNwdXvF+biPma7W=UA@mail.gmail.com>
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
X-Content-Filtered-By: Mailman/MimeDel 2.1.29
Subject: Re: [FFmpeg-devel] [PATCH] avformat/mpegts: update stream info when
PMT ES stream_type changes
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/CAJgjuoxgwPFqAKAh1uO1acfyvTpCA=NqeNwdXvF+biPma7W=UA@mail.gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
If there are no further comments I'll commit and push this some time during
the weekend.
Pavel.
On Fri, May 9, 2025, 6:01 PM Pavel Koshevoy <pkoshevoy@gmail.com> wrote:
> I have a several .ts captures where video and audio codec changes
> even though the PMT version does not change and the PIDs stay the same.
> This happens during transition to/from slate (mpeg2 video and audio)
> to network broadcast (hevc video and eac3 audio in private PES).
>
> I've updated fate ts-demux expected results.
> ---
> libavformat/mpegts.c | 4 +++-
> tests/ref/fate/ts-demux | 4 ++--
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> index 54594b3a11..deb69a0548 100644
> --- a/libavformat/mpegts.c
> +++ b/libavformat/mpegts.c
> @@ -940,6 +940,8 @@ static int mpegts_set_stream_info(AVStream *st,
> PESContext *pes,
> mpegts_find_stream_type(st, pes->stream_type, ISO_types);
> if (pes->stream_type == STREAM_TYPE_AUDIO_MPEG2 || pes->stream_type
> == STREAM_TYPE_AUDIO_AAC)
> sti->request_probe = 50;
> + if (pes->stream_type == STREAM_TYPE_PRIVATE_DATA)
> + sti->request_probe = AVPROBE_SCORE_STREAM_RETRY;
> if ((prog_reg_desc == AV_RL32("HDMV") ||
> prog_reg_desc == AV_RL32("HDPR")) &&
> st->codecpar->codec_id == AV_CODEC_ID_NONE) {
> @@ -2508,7 +2510,7 @@ static void pmt_cb(MpegTSFilter *filter, const
> uint8_t *section, int section_len
> if (!st)
> goto out;
>
> - if (pes && !pes->stream_type)
> + if (pes && pes->stream_type != stream_type)
> mpegts_set_stream_info(st, pes, stream_type, prog_reg_desc);
>
> add_pid_to_program(prg, pid);
> diff --git a/tests/ref/fate/ts-demux b/tests/ref/fate/ts-demux
> index 6a830d0d99..d56cc27937 100644
> --- a/tests/ref/fate/ts-demux
> +++ b/tests/ref/fate/ts-demux
> @@ -24,6 +24,6 @@
> packet|codec_type=video|stream_index=0|pts=3912686363|pts_time=43474.292922|dts=
>
> packet|codec_type=audio|stream_index=1|pts=3912644825|pts_time=43473.831389|dts=3912644825|dts_time=43473.831389|duration=2880|duration_time=0.032000|size=906|pos=474888|flags=K__|data_hash=CRC32:0893d398
>
> packet|codec_type=audio|stream_index=2|pts=3912645580|pts_time=43473.839778|dts=3912645580|dts_time=43473.839778|duration=2880|duration_time=0.032000|size=354|pos=491808|flags=K__|data_hash=CRC32:f5963fa6
> stream|index=0|codec_name=mpeg2video|profile=4|codec_type=video|codec_tag_string=[2][0][0][0]|codec_tag=0x0002|width=1280|height=720|coded_width=0|coded_height=0|has_b_frames=1|sample_aspect_ratio=1:1|display_aspect_ratio=16:9|pix_fmt=yuv420p|level=4|color_range=tv|color_space=unknown|color_transfer=unknown|color_primaries=unknown|chroma_location=left|field_order=progressive|refs=1|ts_id=32776|ts_packetsize=188|id=0x31|r_frame_rate=60000/1001|avg_frame_rate=60000/1001|time_base=1/90000|start_pts=3912669846|start_time=43474.109400|duration_ts=19519|duration=0.216878|bit_rate=15000000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=15|extradata_size=150|extradata_hash=CRC32:53134fa8|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=
0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0|side_datum/cpb_properties:side_data_type=CPB
> properties|side_datum/cpb_properties:max_bitrate=15000000|side_datum/cpb_properties:min_bitrate=0|side_datum/cpb_properties:avg_bitrate=0|side_datum/cpb_properties:buffer_size=9781248|side_datum/cpb_properties:vbv_delay=-1
>
> -stream|index=1|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[4][0][0][0]|codec_tag=0x0004|sample_fmt=fltp|sample_rate=48000|channels=6|channel_layout=5.1(side)|bits_per_sample=0|initial_padding=0|dmix_mode=0|ltrt_cmixlev=0.000000|ltrt_surmixlev=0.000000|loro_cmixlev=0.000000|loro_surmixlev=0.000000|ts_id=32776|ts_packetsize=188|id=0x34|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912633305|start_time=43473.703389|duration_ts=14400|duration=0.160000|bit_rate=384000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=
0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0|tag:language=eng
>
> -stream|index=2|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[4][0][0][0]|codec_tag=0x0004|sample_fmt=fltp|sample_rate=48000|channels=2|channel_layout=stereo|bits_per_sample=0|initial_padding=0|dmix_mode=0|ltrt_cmixlev=0.000000|ltrt_surmixlev=0.000000|loro_cmixlev=0.000000|loro_surmixlev=0.000000|ts_id=32776|ts_packetsize=188|id=0x35|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912634060|start_time=43473.711778|duration_ts=14400|duration=0.160000|bit_rate=192000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|d
isposition:dependent=0|disposition:still_image=0|disposition:multilayer=0|tag:language=es
>
> +stream|index=1|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[6][0][0][0]|codec_tag=0x0006|sample_fmt=fltp|sample_rate=48000|channels=6|channel_layout=5.1(side)|bits_per_sample=0|initial_padding=0|dmix_mode=0|ltrt_cmixlev=0.000000|ltrt_surmixlev=0.000000|loro_cmixlev=0.000000|loro_surmixlev=0.000000|ts_id=32776|ts_packetsize=188|id=0x34|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912633305|start_time=43473.703389|duration_ts=14400|duration=0.160000|bit_rate=384000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=
0|disposition:dependent=0|disposition:still_image=0|disposition:multilayer=0|tag:language=eng
>
> +stream|index=2|codec_name=ac3|profile=unknown|codec_type=audio|codec_tag_string=[6][0][0][0]|codec_tag=0x0006|sample_fmt=fltp|sample_rate=48000|channels=2|channel_layout=stereo|bits_per_sample=0|initial_padding=0|dmix_mode=0|ltrt_cmixlev=0.000000|ltrt_surmixlev=0.000000|loro_cmixlev=0.000000|loro_surmixlev=0.000000|ts_id=32776|ts_packetsize=188|id=0x35|r_frame_rate=0/0|avg_frame_rate=0/0|time_base=1/90000|start_pts=3912634060|start_time=43473.711778|duration_ts=14400|duration=0.160000|bit_rate=192000|max_bit_rate=N/A|bits_per_raw_sample=N/A|nb_frames=N/A|nb_read_frames=N/A|nb_read_packets=5|disposition:default=0|disposition:dub=0|disposition:original=0|disposition:comment=0|disposition:lyrics=0|disposition:karaoke=0|disposition:forced=0|disposition:hearing_impaired=0|disposition:visual_impaired=0|disposition:clean_effects=0|disposition:attached_pic=0|disposition:timed_thumbnails=0|disposition:non_diegetic=0|disposition:captions=0|disposition:descriptions=0|disposition:metadata=0|d
isposition:dependent=0|disposition:still_image=0|disposition:multilayer=0|tag:language=es
>
> format|filename=mp3ac325-4864-small.ts|nb_streams=3|nb_programs=1|nb_stream_groups=0|format_name=mpegts|start_time=43473.703389|duration=0.622889|size=512000|bit_rate=6575810|probe_score=50
> --
> 2.43.0
>
>
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".