From patchwork Mon Feb 19 02:48:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 46359 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dda5:b0:19e:cdac:8cce with SMTP id kw37csp1031359pzb; Sun, 18 Feb 2024 18:49:04 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXPD5Q1qrzeQZSqGp9iA0hzqwjkNsFy8zP/c9HjZLbFJr+9PfghlTowdqyufhnmgQ8SkirOhVCeGGDiGJiHzEw2SidjTpaIc0RNUA== X-Google-Smtp-Source: AGHT+IHihtyBH0G6AOmSLKJw6qK1NT6nz4tvELFN5OWHoWOyseHsf93eOKFiQQvnnlYq1Lk0+dch X-Received: by 2002:aa7:d98d:0:b0:564:5ed7:2851 with SMTP id u13-20020aa7d98d000000b005645ed72851mr1734297eds.35.1708310944099; Sun, 18 Feb 2024 18:49:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708310944; cv=none; d=google.com; s=arc-20160816; b=E++m6hM3SImQDFwHCULHuNypC+2nUGtRutSak6C56zILGOfhdkrLA65pm1MyC6h2n6 o1N8Ba2vqY1HOGxmrD9DoIURA/Ue7l2Y3NsebM6PPMOmsvwhSucml8iIvoeJz6VF0LiA 3i2Cutk9JsZxlU+SZfjWBUHFZ1kqe+0sjvk1o3N7hDUWQkf9Z8npXCd1jDX4LJaf1gXo 4G3eFw2B9nf8YWH74FKauukzY97+QxZPBdXKCMLu5qofx+NXruQVHQIgaUHvGY2RE6yY i2Jo5P0jO2A+SX4Tx7+9y2HquWyG5Ar+51RkECQKnT6U7GBYVc2enprVGj9rarHfIGef Vnmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=fwRk8d+GdNW2q8qMq9qIdv981prRxyEmfFVAb/uqh5c=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=lRlmUeGjYcBJG3lLQZGJcTsBHmi6DVet/gS9grpyrLoMp/HgGvUmSt94In8kB+SnUq mN7dN7TYm2f4qYvsWoI0V35bRTKxmmHTV9fsWEOdaiTFON5yoMe6RpXSrtYettuKkLJ/ VdrHabvivYlhF10z8b+b6cMNRCpF5iLlIndqvAKhI//HVUiPVZyTdcXN+zdMkSyj+2rM kBP+WABuysvnPQTgIu2RRs8k2wXk7uj7DdnFKa3hzYz63xm9ZntTikhINaSjo9Tyz8Qe VoiOcJabyZOFrCfLezHD/Ibx8IzGJOWedyXPzN2+Gcta5k+E2zwMArw270avDFwCvo7p d0Zw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=WFVvXPmp; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a66-20020a509ec8000000b005648b002d91si138782edf.524.2024.02.18.18.49.03; Sun, 18 Feb 2024 18:49:04 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=WFVvXPmp; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3081068D3C1; Mon, 19 Feb 2024 04:49:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2E94268D360 for ; Mon, 19 Feb 2024 04:48:54 +0200 (EET) Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-5cdbc4334edso2774098a12.3 for ; Sun, 18 Feb 2024 18:48:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708310931; x=1708915731; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=+Xk82xvv4AysS4Wl4+1Byem8Kl8vnMKwHHDwtPQqd4s=; b=WFVvXPmpPeuklbVgfeVPyl4v51oRtg/V5SHuQl2S/XReYqMitQqrPiI2NeHBN5sBsT VlTxcQ5abv8soLtEqfdGgHRDNuMF3OhTFj4/vhsPFCZPTq/OYHZDhDJLWy1aQk2yxiIU ilOpYQZ/eohyBoQVE8roU/D1MM6tUuI96O6sd6AazPuWgoyhBFcW7vfsa3b4uzcJg6b3 aEcHz13AgybprjblLlk2rpdFjjBehetH2kqJ9dZp+ppPdsx0AZhUcHEJ+uRVC0YSbEK+ lIqRHzu9gl94OmLF71Hp7BWP024bXOD/30UfqurQfzVq+RUrURCQOBTe3+VpzLw27EVa hpzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708310931; x=1708915731; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+Xk82xvv4AysS4Wl4+1Byem8Kl8vnMKwHHDwtPQqd4s=; b=ZiWwl8ma9z+/YVoZ2VRHAENGvlADHLAmLIG+9WaIRMWCSvv9Qg4RAHqZgwFuS4lY0t 3wlS/tVZzkF4oSuETkTRpd2KaYD81aHtgEpLfPuYQSda7gADXLz+osSm6N708qrRpbIH q8aDCvoSI4V28VacTlgDy5gh+6QlVqJQyy849rYqz7DSiWxtUrmlq1oZwOVCP5qVTakU BRdSl4p9xW82PkLHT7bf+6dA3/AnPlSMDJwIGG898wcrHGTyfIU0AtNKmzPDjeVOWRaU xO0hrYE7QEEPf3fEQUYsWrwPFLwHVCATMoXXsOEPYIBzTnqggovivRS+K6xHv3JsvqdH /CnA== X-Gm-Message-State: AOJu0Yxnzr2hcSL0fQjT8sRTlR8nqyD61sGVl/mHNu1MARqD2hoYzX2Q oyX2PVAsch34UHJgs8FjLjhwdsqd/ha3isL58Ql2IPibcdN0cRC5VUoJ9pXt X-Received: by 2002:a05:6a21:3a87:b0:1a0:70db:43e5 with SMTP id zv7-20020a056a213a8700b001a070db43e5mr11500091pzb.5.1708310930829; Sun, 18 Feb 2024 18:48:50 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id sy8-20020a17090b2d0800b002963cab9e2asm3874012pjb.2.2024.02.18.18.48.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 18:48:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Feb 2024 23:48:37 -0300 Message-ID: <20240219024837.26580-1-jamrial@gmail.com> X-Mailer: git-send-email 2.43.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/mpegts: add a ts_id exported option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rDwKoIqAu4zM Replaces AVFormatContext.ts_id Signed-off-by: James Almer --- To be pushed as part of the bump set. libavformat/avformat.h | 6 ------ libavformat/mpegts.c | 9 +++++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 50bbd1949b..affc5fde07 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -1538,12 +1538,6 @@ typedef struct AVFormatContext { #define AVFMT_AVOID_NEG_TS_MAKE_NON_NEGATIVE 1 ///< Shift timestamps so they are non negative #define AVFMT_AVOID_NEG_TS_MAKE_ZERO 2 ///< Shift timestamps so that they start at 0 - /** - * Transport stream id. - * This will be moved into demuxer private options. Thus no API/ABI compatibility - */ - int ts_id; - /** * Audio preload in microseconds. * Note, not all formats support this and unpredictable things may happen if it is used when not supported. diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 1cf390e98e..36fded8db8 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -167,6 +167,8 @@ struct MpegTSContext { int merge_pmt_versions; int max_packet_size; + int id; + /******************************************/ /* private mpegts data */ /* scan context */ @@ -184,7 +186,10 @@ struct MpegTSContext { }; #define MPEGTS_OPTIONS \ - { "resync_size", "set size limit for looking up a new synchronization", offsetof(MpegTSContext, resync_size), AV_OPT_TYPE_INT, { .i64 = MAX_RESYNC_SIZE}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM } + { "resync_size", "set size limit for looking up a new synchronization", \ + offsetof(MpegTSContext, resync_size), AV_OPT_TYPE_INT, { .i64 = MAX_RESYNC_SIZE}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, \ + { "ts_id", "transport stream id", \ + offsetof(MpegTSContext, id), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, AV_OPT_FLAG_EXPORT|AV_OPT_FLAG_READONLY } static const AVOption options[] = { MPEGTS_OPTIONS, @@ -2554,7 +2559,7 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (skip_identical(h, tssf)) return; - ts->stream->ts_id = h->id; + ts->id = h->id; for (;;) { sid = get16(&p, p_end);