08f83ec6fa
We cherry-picked this in bug 1948818 Upstream commit: https://webrtc.googlesource.com/src/+/a705b2d73ae6822b2c70ad43be94a885a056c499 assert unreachable code in simulcast config and IWYU BUG=webrtc:398218412 Change-Id: I6adba61fe9f14f31035f0ff142b51cd991dff2a1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379280 Commit-Queue: Erik Språng <sprang@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Erik Språng <sprang@webrtc.org> Cr-Commit-Position: refs/heads/main@{#44012} Differential Revision: https://phabricator.services.mozilla.com/D244023
24 lines
957 B
Diff
24 lines
957 B
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Fri, 7 Mar 2025 17:43:00 -0600
|
|
Subject: Bug 1952339 - (fix-68e7b00928) add default param to emplace() to fix
|
|
compile issue
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/26c916591791b13a3d8888066c22c5ba49c86c47
|
|
---
|
|
call/rtp_config.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/call/rtp_config.cc b/call/rtp_config.cc
|
|
index 115912cd46..5e08467d1f 100644
|
|
--- a/call/rtp_config.cc
|
|
+++ b/call/rtp_config.cc
|
|
@@ -258,7 +258,7 @@ RtpStreamConfig RtpConfig::GetStreamConfig(size_t index) const {
|
|
stream_config.raw_payload = raw_payload;
|
|
if (!rtx.ssrcs.empty()) {
|
|
RTC_DCHECK_EQ(ssrcs.size(), rtx.ssrcs.size());
|
|
- auto& stream_config_rtx = stream_config.rtx.emplace();
|
|
+ auto& stream_config_rtx = stream_config.rtx.emplace(RtpStreamConfig::Rtx());
|
|
stream_config_rtx.ssrc = rtx.ssrcs[index];
|
|
stream_config_rtx.payload_type = rtx.payload_type;
|
|
}
|