Skip to content

Commit de817d4

Browse files
Harald AlvestrandWebRTC LUCI CQ
authored andcommitted
[M147] Revert^3 "Default enable WebRTC-HeaderExtensionNegotiateMemory"
Original change's description: > Revert^3 "Default enable WebRTC-HeaderExtensionNegotiateMemory" > > This reverts commit 2f06978. > > Reland "Default enable WebRTC-HeaderExtensionNegotiateMemory" > > This reverts commit 2f06978. > > Reason for revert: Abundance of caution - want more canary time. > > Original change's description: > > Revert^2 "Default enable WebRTC-HeaderExtensionNegotiateMemory" > > > > This reverts commit 74d988f. > > > > Reland "Default enable WebRTC-HeaderExtensionNegotiateMemory" > > > > This reverts commit 74d988f. > > > > Reason for revert: Added code to skip stopped transceivers > > > > Original change's description: > > > Revert "Default enable WebRTC-HeaderExtensionNegotiateMemory" > > > > > > This reverts commit 4ecf297. > > > > > > Reason for revert: Impacted unexpected application usages > > > > > > Original change's description: > > > > Default enable WebRTC-HeaderExtensionNegotiateMemory > > > > > > > > Spec change: w3c/webrtc-extensions#238 > > > > > > > > Chromestatus entry for change: https://chromestatus.com/feature/5135528638939136 > > > > > > > > Bug: webrtc:439514253 > > > > Change-Id: I296f2f06dd69b4e30be419b44c926acfd2722e2d > > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/407821 > > > > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > > > > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > > > > Cr-Commit-Position: refs/heads/main@{#45993} > > > > > > Bug: webrtc:439514253, chromium:467164231 > > > Change-Id: I95dbc8cbaf1b769ffaea291801684bc26e4b9ccb > > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/433102 > > > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > > > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > > > Cr-Commit-Position: refs/heads/main@{#46456} > > > > Bug: webrtc:439514253, chromium:467164231 > > Change-Id: I2df85ba25016374a52abb13037cdca74fb1a395d > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/453240 > > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > > Commit-Queue: Guido Urdaneta <guidou@webrtc.org> > > Cr-Commit-Position: refs/heads/main@{#47038} > > No-Try: True > Bug: webrtc:439514253, chromium:467164231, webrtc:489813847 > Change-Id: Id2151293ffe14d2238a1363dd7df679c8a27c42f > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/453820 > Commit-Queue: Harald Alvestrand <hta@webrtc.org> > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> > Cr-Commit-Position: refs/heads/main@{#47093} (cherry picked from commit 5f9534d9205a870d40aff649967a38fbde7d7653) Bug: chromium:491748676,webrtc:439514253,chromium:467164231,webrtc:489813847 Change-Id: Id2151293ffe14d2238a1363dd7df679c8a27c42f Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/455980 Auto-Submit: Chrome Cherry Picker <chrome-cherry-picker@chops-service-accounts.iam.gserviceaccount.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Cr-Commit-Position: refs/branch-heads/7727@{#1} Cr-Branched-From: 5788235-refs/heads/main@{#47086}
1 parent 5788235 commit de817d4

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

pc/rtp_transceiver.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,19 +1224,19 @@ void RtpTransceiver::OnNegotiationUpdate(
12241224
RTC_DCHECK(content);
12251225
if (sdp_type == SdpType::kAnswer || sdp_type == SdpType::kPrAnswer) {
12261226
negotiated_header_extensions_ = content->rtp_header_extensions();
1227-
if (!env_.field_trials().IsDisabled(
1227+
if (env_.field_trials().IsEnabled(
12281228
"WebRTC-HeaderExtensionNegotiateMemory")) {
12291229
header_extensions_to_negotiate_ = GetNegotiatedHeaderExtensions();
12301230
}
12311231
} else if (sdp_type == SdpType::kOffer) {
1232-
if (!env_.field_trials().IsDisabled(
1232+
if (env_.field_trials().IsEnabled(
12331233
"WebRTC-HeaderExtensionNegotiateMemory")) {
12341234
header_extensions_for_rollback_ = header_extensions_to_negotiate_;
12351235
header_extensions_to_negotiate_ =
12361236
GetOfferedAndImplementedHeaderExtensions(content);
12371237
}
12381238
} else if (sdp_type == SdpType::kRollback) {
1239-
if (!env_.field_trials().IsDisabled(
1239+
if (env_.field_trials().IsEnabled(
12401240
"WebRTC-HeaderExtensionNegotiateMemory")) {
12411241
RTC_CHECK(!header_extensions_for_rollback_.empty());
12421242
header_extensions_to_negotiate_ = header_extensions_for_rollback_;

pc/rtp_transmission_manager.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,7 @@ RtpTransmissionManager::CreateAndAddTransceiver(
284284
RTC_DCHECK(!FindSenderById(sender_id));
285285
std::vector<RtpHeaderExtensionCapability> header_extensions =
286286
std::move(header_extensions_to_negotiate);
287-
if (!env_.field_trials().IsDisabled(
288-
"WebRTC-HeaderExtensionNegotiateMemory")) {
287+
if (env_.field_trials().IsEnabled("WebRTC-HeaderExtensionNegotiateMemory")) {
289288
// If we have already negotiated header extensions for this type,
290289
// and it is not stopped,
291290
// reuse the negotiated state for new transceivers of the same type.

0 commit comments

Comments
 (0)