From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 3BF9E4FA1F for ; Tue, 24 Jun 2025 18:02:42 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id C95A668CFBF; Tue, 24 Jun 2025 21:02:19 +0300 (EEST) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E002D68CF69 for ; Tue, 24 Jun 2025 21:02:11 +0300 (EEST) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-450dd065828so6983325e9.2 for ; Tue, 24 Jun 2025 11:02:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750788131; x=1751392931; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=oulPCN/s1EAjcMuAhz8nnYId1fu6cj0tvwFVqTgluJ4=; b=Dw6taXYMpRZygHBAKcD5cK07OSNjx6Z4K5aaIiFzNk9Tpft4soubN+MUM+6EnuDUhU e4ZhMwLZzncQTLPSMWOYyfpwWqJrNWqI1j+yc/fXD2m1RP6Ux/CGaliMgtASETMoSFYM ZZFZdH1i8AK6XeFy1hxkNucUE4x/BxKVfRo+sEYBq/cUwuNWE2rJ1BLjvknUlBfhO6K/ fOGzmf1ByUphuOmcJbwMoQNux8PCobBZgvf6IA2Sckd4dgmoMM/r3x7eUArdg+t7yQuX oPMwI9FwyMNuD7SUJCRtrKFHc5NiCmRgeXP/vbSqDSS0r//Hwy7eGP0JDKSynT7kS/rp nMSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750788131; x=1751392931; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oulPCN/s1EAjcMuAhz8nnYId1fu6cj0tvwFVqTgluJ4=; b=gqQMt/4OCKhcTWXTVQ8D0ZgdH2JDgRIp6KIF2djwKWcY+ly5aPBrYwKHnhkAcP9bXb AlzFjMug6ahPRXxPqX4dbQSW/EfhdqDFt5BDJF7FLtiwnqfARZg/g/zet+nP4Wr4cvPC EUGl4OxLo554mhgp4YSKgSLwJJKf2tJ0t6Dc/dZtcThrhjbV0Qcym72dEV/zJE8wGPPZ ja4vvUSu0sARV2MfMhy7KtRBC2tokcTBhCTKDrsbHjY7o6hiTMkuVfk83qGdVukExnMn MsRh7VxoQBv1W9ZXmr9ENNKY0BuZTOR72/bo22ioQc4JBUqVCAz1K/PC/wJZQNnzd40c qVzw== X-Gm-Message-State: AOJu0YwCnO/fHAC3KehPPuLyBwJ/3f5LDPEuU7eY6ozZf+ZXM8qK5qeB 5sjFLTIcA1YgEx5jj4o2Hpr/6vNIrSdlVH82PftMs39LCqCOOwPvo+Grmkcjxg== X-Gm-Gg: ASbGncsrimucFk042K/Fuj2pUBvR+87qoBPPwG8gAHV0apDU47irSPS/u6nyLDCdf9a eJFGPavkDdeWj5pYJ3dOJSRT+5d6N3cLUZtqr+4fD+ybJ2TJUTzx33gNedvR3tQKJ6SEk48UACE vkcWzNQmac9Mk6Q+39WTkg8Q6MIaCtmw0rpLzqu3nLMS6xxz9nwefqlm2itxY8QaVT+5aRdhh8E dkPRukxYzLjVGVNvDKD6C3u7tRqQ2yai+7nLXgfD39OXwxVfk2AzfAxcGF1uIz69+C73VgYIkZy dJIfHEvAzMBJ3tpq+VopzvsIW2wk0r/BtxsbAGcM1LPbYlRwi8GJe3Mc+cnENr2A8HJ12/CUpah 9mM1wIHXb53DHZwpsOx1jN4eRD234Oxy58VEPJnxdy8oAfNU5d4SzIuHqaMnbMvq+M5yoxv6Qzm hvnzI= X-Google-Smtp-Source: AGHT+IGgQt02nfBW/Bqltv9aSZP7zsoBzVb46Yvgfd8spqAHpgPMc3xfP5cTWrKBVfyPNWdK8Fvuig== X-Received: by 2002:a05:600c:4454:b0:453:483b:6272 with SMTP id 5b1f17b1804b1-45381ab98cfmr67585e9.7.1750788130520; Tue, 24 Jun 2025 11:02:10 -0700 (PDT) Received: from ArmedBeast.fritz.box (p20030102370045006de90db78179531b.dip0.t-ipconnect.de. [2003:102:3700:4500:6de9:db7:8179:531b]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-453803fe596sm14228255e9.24.2025.06.24.11.02.09 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 24 Jun 2025 11:02:09 -0700 (PDT) From: Marvin Scholz To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jun 2025 20:02:02 +0200 Message-Id: <20250624180202.15430-3-epirat07@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250624180202.15430-1-epirat07@gmail.com> References: <20250624180202.15430-1-epirat07@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] lavf: add AV_PKT_DATA_RTCP_SR side data type 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: --- libavcodec/packet.c | 1 + libavcodec/packet.h | 6 ++++++ libavformat/rtpdec.c | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+) diff --git a/libavcodec/packet.c b/libavcodec/packet.c index 5104eb98b1..2aace71c7d 100644 --- a/libavcodec/packet.c +++ b/libavcodec/packet.c @@ -308,6 +308,7 @@ const char *av_packet_side_data_name(enum AVPacketSideDataType type) case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: return "IAMF Recon Gain Info Parameter Data"; case AV_PKT_DATA_FRAME_CROPPING: return "Frame Cropping"; case AV_PKT_DATA_LCEVC: return "LCEVC NAL data"; + case AV_PKT_DATA_RTCP_SR: return "RTCP Sender Report"; } return NULL; } diff --git a/libavcodec/packet.h b/libavcodec/packet.h index 71bc2e0575..8ac4ef54ca 100644 --- a/libavcodec/packet.h +++ b/libavcodec/packet.h @@ -345,6 +345,12 @@ enum AVPacketSideDataType { */ AV_PKT_DATA_LCEVC, + /** + * Contains the last received RTCP SR (Sender Report) information + * in the form of the AVRTCPSenderReport struct. + */ + AV_PKT_DATA_RTCP_SR, + /** * The number of side data types. * This is not part of the public API/ABI in the sense that it may diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 9c9d66f33d..9d93e9023a 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -611,12 +611,30 @@ static int rtp_set_prft(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) { return 0; } +static int rtp_add_sr_sidedata(RTPDemuxContext *s, AVPacket *pkt) { + AVRTCPSenderReport *sr = + (AVRTCPSenderReport *) av_packet_new_side_data( + pkt, AV_PKT_DATA_RTCP_SR, sizeof(AVRTCPSenderReport)); + if (!sr) + return AVERROR(ENOMEM); + + memcpy(sr, &s->last_sr, sizeof(AVRTCPSenderReport)); + s->pending_sr = 0; + return 0; +} + /** * This was the second switch in rtp_parse packet. * Normalizes time, if required, sets stream_index, etc. */ static void finalize_packet(RTPDemuxContext *s, AVPacket *pkt, uint32_t timestamp) { + if (s->pending_sr) { + int ret = rtp_add_sr_sidedata(s, pkt); + if (ret < 0) + av_log(s->ic, AV_LOG_WARNING, "rtpdec: failed to add SR sidedata\n"); + } + if (pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE) return; /* Timestamp already set by depacketizer */ if (timestamp == RTP_NOTS_VALUE) -- 2.39.5 (Apple Git-154) _______________________________________________ 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".