06e90addc7
We already cherry-picked this when we vendored f30c044cf9. Upstream commit: https://webrtc.googlesource.com/src/+/995688c8e85b520d50961486abbe0cc03eae9558 Revert "more p2p cleanups" This reverts commit f30c044cf9bd06f91017c171d98690094ce6d88b. Reason for revert: breaks roll to chromium: https://ci.chromium.org/ui/p/chromium/builders/try/mac_chromium_compile_dbg_ng/2290104/overview Original change's description: > more p2p cleanups > > Move test code from p2p/base and rtc_base/ into p2p/test/ > This p2p/base much less crowded and > clarifies that the rtc_base/nat* is in fact only test code. > > BUG=webrtc:0 > > Change-Id: I4d14fae24cb0eff6783962f4b4483b560367ca5d > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/378900 > Commit-Queue: Jonas Oreland <jonaso@webrtc.org> > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > Auto-Submit: Jonas Oreland <jonaso@webrtc.org> > Cr-Commit-Position: refs/heads/main@{#43995} Bug: webrtc:0 Change-Id: I6c79fa85f53fdb9a1dacbe38911771f9a4289c76 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/379040 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com <rubber-stamper@appspot.gserviceaccount.com> Owners-Override: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org> Cr-Commit-Position: refs/heads/main@{#43999} Differential Revision: https://phabricator.services.mozilla.com/D244009
24 lines
1009 B
Diff
24 lines
1009 B
Diff
From: Michael Froman <mfroman@mozilla.com>
|
|
Date: Tue, 17 Sep 2024 13:33:00 -0500
|
|
Subject: Bug 1918268 - (fix-96c1b9c5ea) provide template arg for optional to
|
|
fix compile error
|
|
|
|
Mercurial Revision: https://hg.mozilla.org/mozilla-central/rev/ca2211dbb0dd8864768cdcce1ea146bdbb0faeda
|
|
---
|
|
video/video_send_stream_impl.cc | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc
|
|
index 2276b32387..4d5736a79d 100644
|
|
--- a/video/video_send_stream_impl.cc
|
|
+++ b/video/video_send_stream_impl.cc
|
|
@@ -782,7 +782,7 @@ MediaStreamAllocationConfig VideoSendStreamImpl::GetAllocationConfig() const {
|
|
!config_.suspend_below_min_bitrate,
|
|
encoder_bitrate_priority_,
|
|
(content_type_ == VideoEncoderConfig::ContentType::kRealtimeVideo)
|
|
- ? std::optional(TrackRateElasticity::kCanConsumeExtraRate)
|
|
+ ? std::optional<TrackRateElasticity>(TrackRateElasticity::kCanConsumeExtraRate)
|
|
: std::nullopt};
|
|
}
|
|
|