From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id A2D234C6A2
for <ffmpegdev@gitmailbox.com>; Sat, 10 May 2025 00:01:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5465B68C876;
Sat, 10 May 2025 03:01:26 +0300 (EEST)
Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com
[209.85.210.177])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9812D68C488
for <ffmpeg-devel@ffmpeg.org>; Sat, 10 May 2025 03:01:19 +0300 (EEST)
Received: by mail-pf1-f177.google.com with SMTP id
d2e1a72fcca58-741b3e37a1eso2081614b3a.1
for <ffmpeg-devel@ffmpeg.org>; Fri, 09 May 2025 17:01:19 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746835278; x=1747440078; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=zeYYvxf4HXAcvjpmOtuPug51tYnY3xBjogvHa0DRgCo=;
b=hN7gj+RrjgXV1zEpsycPsS943lvgyCdWUfkWGYGOjGUUqG9lYFb+U2TpGEJPTnmI3I
+51/asR0CqpD1e8s5t11DEHt6txnHRQkY0rls9dumsWXxWz9q+PQypZR3Gu8irN33bRU
K5BxGaWlQRFOCrcoqwoxn/DbgjSAdpLzAI3W/Pw9rCSo6K1aNIfJz4o3qZ7S+WCF64LL
ho0hTkPFt+DAF0Ek0/ey/kikrLhqJcGWsY4pADHOu4FJXKWhy3MiXqoeXGDG6Gd3xV2w
iEdUjp0cfD5zjWDgmbvGBW5aS3fRcv8NBkXdnmi3h8F6Myun4VsH73eXml4GtburVJ8m
0KOg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746835278; x=1747440078;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=zeYYvxf4HXAcvjpmOtuPug51tYnY3xBjogvHa0DRgCo=;
b=a3m8+ypxvlpT40pFSCFX9zPegpUbiUznBuT2B5lrUmnzBP6asfQ0VcP9K6CdkCqhu5
mRVZfj8tleB+nRAqgP4XcfHMFFYJgtppA+AK0bDnY/LTjm8ErhGb+/NYhWU9BykCDtKI
pAvTsyBxHcow9p1HomsdgbwXd2/NnLMBb8OpxDhqzXqwf7OQr0LUkzAHQQbrvnEoP/C6
MZJ4Vk0bTtMobB0Ju7RxOxuTstYq8eXBKbooe+GIiNJ2uxIyYH151yHexDmbTQbQLYab
i8yrQ4bL3g3CzQ7p7tpyp34vQWSgNBaRgnySL0wl7xEmiI8AcFuPkF+OF07PproCIN/9
Z2hw==
X-Gm-Message-State: AOJu0YzpHxmGo2vfSr9bUeJkh+zsYsNtMn5se4cu6Xh6F+mPd6xjXEbq
Y77GPIjFxavfgsIVpCVXd8yD1IQhFoy16tholJ74hAdsLixY9uuBJ41cba9Q
X-Gm-Gg: ASbGncuBTN13ZK+wZLG94bIc15TxV1lNK0N7eFyzPXGfWfG/gfFr/0C1/VtxuS1d20F
abDh9GKO72MtsLI4/TG0weMCtJ8t7MLXkA5bLBcXwDNIcMmlLoB3T+MCdQhcPEVolRYh2kC5imX
tJwaH23jADKh2Y4SYRCtz5trWZK2ysL5yRdp04tS+2Rw9moiiRBy15T5UjLhyv8y+WxgRCSiCVn
78YXgbreuoIEZO2bsTw9OwsV9M/h0JqKg5aitx9xp03tV9b+/6nBVNHmJSUbEjcpS/qevNvgQNB
ToNgdbjT1oL2QMbUE0TH5diK1LGAr5NcWZ1C+Bf7Fl3xabQMzGvjnfDSChS2mA0ZpA==
X-Google-Smtp-Source: AGHT+IFsZ8+EUziW+V03a9vrYSKUPN6v5hlDMXffKXqnIxnXiBU0YjENWEHhqR2maj0A6z2s0pD9+g==
X-Received: by 2002:a05:6a00:1d0a:b0:736:a7ec:a366 with SMTP id
d2e1a72fcca58-7423be8695fmr6482352b3a.9.1746835277598;
Fri, 09 May 2025 17:01:17 -0700 (PDT)
Received: from homestead.aragog.com ([2605:a601:a9a2:a100:67c:16ff:fe02:37f0])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-74237a8f668sm2287187b3a.169.2025.05.09.17.01.16
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 09 May 2025 17:01:17 -0700 (PDT)
From: Pavel Koshevoy <pkoshevoy@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 9 May 2025 18:01:15 -0600
Message-ID: <20250510000115.27108-1-pkoshevoy@gmail.com>
X-Mailer: git-send-email 2.43.0
MIME-Version: 1.0
Subject: [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>
Cc: Pavel Koshevoy <pkoshevoy@gmail.com>
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/20250510000115.27108-1-pkoshevoy@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
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|dis
position: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|dis
position: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".