From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id EC560497B2 for ; Mon, 19 Feb 2024 14:10:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6796868D395; Mon, 19 Feb 2024 16:10:35 +0200 (EET) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D77D568D2FB for ; Mon, 19 Feb 2024 16:10:28 +0200 (EET) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1d7393de183so34165775ad.3 for ; Mon, 19 Feb 2024 06:10:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1708351826; x=1708956626; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=e9azxkvvs3VdXtpoAyvbzph+FZIJ/JS013yVFTtRhS4=; b=fzkR4EOt4QrCYU0u9ifx3Q+wls8PRAIsnwDBSlRle9/nLAOxsjS848TMcepqHjJVNu JdAQql+K4MT2QiK85bcjq0Od6a7NmUrM0lrItMDTZqcRqZaQ2D7h7ckO73NLQtBC/4tX dVJIRvl26PUbDO0m8DCkiolf1pBylE4VnOd8mBtIVd/pylY8w/dFOyNOYdXmAH/SddVU pTxsDGnU3HDf0oyBbfPDIjIHjnwcjfeIgsXZa4jlh1pZAsFYSMPvQqWy37Mqr5pga3SW O024TXdhO/cavFd8CqWtihTTWJT8LlAUbHRwLpFpOIrYmXEEg60KY7hhqt0d8pAsTZSw rH5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708351826; x=1708956626; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=e9azxkvvs3VdXtpoAyvbzph+FZIJ/JS013yVFTtRhS4=; b=YAZq2u3LMzFOtgpBASS5UwrhCDRLS11LeDImLJFxacShoOPFfXLjAB3pV/CLreB5co smifl+wMaRzqf9JFrouhbr2Msxtfv+5oygbImA2tyKaVORZzk20VVqgCzPGwGiHiVSO5 Rq8AVU88q2xWH5o8rvSIn13yA6T5mkBl/hkiTZYE+ZY9/cSqoq8uZbMfUGBxt10DrJdJ tKIPpaFgKSJ+BUphupxmn7QKwQSFoouvqKP6fwmTsM/fiJ8QYRvkVXTXFobG47WZM/f6 QiSgtQcN4bHdw/F4M0FKMONMhAcF8bqvVzG3b2CkZ8FRNJgvs/EjA8axNAvW1N4mk85X ytQg== X-Gm-Message-State: AOJu0YyLK4sflNd3XCfpbnno+dZR9vd5uwNUKkNspE5TPN4wQO4/8ap1 tn77vSwKq5FVRhhiWbdFbSlSmEMKVVhsKSjZpopQhafF5a6yosBXBdI14wSS X-Google-Smtp-Source: AGHT+IHYGzJy8omoRvin6qK2Begydua3yNzuF7A7y0SzmuTC/gOSsR9dlfunaHxyDcupoLwppd9eQQ== X-Received: by 2002:a17:902:db06:b0:1d9:c86c:39c2 with SMTP id m6-20020a170902db0600b001d9c86c39c2mr14148311plx.14.1708351825970; Mon, 19 Feb 2024 06:10:25 -0800 (PST) Received: from [192.168.0.16] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id q2-20020a170902e30200b001db2d598eedsm4383328plc.77.2024.02.19.06.10.24 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 Feb 2024 06:10:25 -0800 (PST) Message-ID: <0c53579d-c5f2-43a7-b9a9-3323ed287cdb@gmail.com> Date: Mon, 19 Feb 2024 11:10:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240219024837.26580-1-jamrial@gmail.com> Content-Language: en-US From: James Almer In-Reply-To: Subject: Re: [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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 2/19/2024 8:20 AM, Andreas Rheinhardt wrote: > James Almer: >> 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); > > Patchwork shows that several ts fate tests fail with this patch, > presumably because ffprobe prints exported options (see > print_private_data()). Amended locally with the updated refs. > Anyway, I don't see why you not add the option now and remove the public > field with the bump. Ok, will do that and apply now. Thanks. _______________________________________________ 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".