Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow flex-fec support enabling/disabling from application side #128

Merged
merged 2 commits into from
Mar 2, 2021
Merged

Allow flex-fec support enabling/disabling from application side #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9699791
Link to static gpra library only on Windows.
taste1981 Feb 26, 2021
c3c3dc5
Enable flex-fec by application instead of hard-code.
taste1981 Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 2 additions & 4 deletions media/engine/webrtc_video_engine.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ const int kMinLayerSize = 16;
// If this field trial is enabled, we will enable sending FlexFEC and disable
// sending ULPFEC whenever the former has been negotiated in the SDPs.
bool IsFlexfecFieldTrialEnabled() {
//return webrtc::field_trial::IsEnabled("WebRTC-FlexFEC-03");
return true;
return webrtc::field_trial::IsEnabled("OWT-FlexFEC");
}

// If this field trial is enabled, the "flexfec-03" codec will be advertised
Expand All @@ -65,8 +64,7 @@ bool IsFlexfecFieldTrialEnabled() {
// MediaSession and added as "a=ssrc:" and "a=ssrc-group:" lines in the local
// SDP.
bool IsFlexfecAdvertisedFieldTrialEnabled() {
//return webrtc::field_trial::IsEnabled("WebRTC-FlexFEC-03-Advertised");
return true;
return webrtc::field_trial::IsEnabled("OWT-FlexFEC");
}

void AddDefaultFeedbackParams(VideoCodec* codec) {
Expand Down
6 changes: 4 additions & 2 deletions modules/congestion_controller/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ rtc_library("congestion_controller") {
if (owt_use_gpra) {
# use Intel Goodput Rate Adapatation BWE
include_dirs = [ owt_gpra_header_root ]
libs = [ "gpra_lib.lib" ]
lib_dirs = [ owt_gpra_lib_root ]
if (is_win && owt_gpra_lib_root != "") {
libs = [ "gpra_lib.lib" ]
lib_dirs = [ owt_gpra_lib_root ]
}
defines += [ "INTEL_GPRA" ]
}

Expand Down
6 changes: 4 additions & 2 deletions modules/congestion_controller/goog_cc/BUILD.gn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ rtc_library("goog_cc") {
if (owt_use_gpra) {
# use Intel Goodput Rate Adapatation BWE
include_dirs = [ owt_gpra_header_root ]
libs = [ "gpra_lib.lib" ]
lib_dirs = [ owt_gpra_lib_root ]
if (is_win && owt_gpra_lib_root != "") {
libs = [ "gpra_lib.lib" ]
lib_dirs = [ owt_gpra_lib_root ]
}
defines += [ "INTEL_GPRA" ]
}

Expand Down