| Index: webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
|
| diff --git a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
|
| index cc5e457cbf0594e1514371af193517a0169cd09b..737e854b8739dad843e1365a031ecd02704b921b 100644
|
| --- a/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
|
| +++ b/webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
|
| @@ -73,6 +73,7 @@ public class PeerConnectionClient {
|
| private static final String AUDIO_CODEC_ISAC = "ISAC";
|
| private static final String VIDEO_CODEC_PARAM_START_BITRATE = "x-google-start-bitrate";
|
| private static final String VIDEO_FLEXFEC_FIELDTRIAL = "WebRTC-FlexFEC-03/Enabled/";
|
| + private static final String VIDEO_VP8_INTEL_HW_ENCODER_FIELDTRIAL = "WebRTC-IntelVP8/Enabled/";
|
| private static final String AUDIO_CODEC_PARAM_BITRATE = "maxaveragebitrate";
|
| private static final String AUDIO_ECHO_CANCELLATION_CONSTRAINT = "googEchoCancellation";
|
| private static final String AUDIO_AUTO_GAIN_CONTROL_CONSTRAINT = "googAutoGainControl";
|
| @@ -371,12 +372,13 @@ public class PeerConnectionClient {
|
| isError = false;
|
|
|
| // Initialize field trials.
|
| + String fieldTrials = "";
|
| if (peerConnectionParameters.videoFlexfecEnabled) {
|
| - PeerConnectionFactory.initializeFieldTrials(VIDEO_FLEXFEC_FIELDTRIAL);
|
| + fieldTrials += VIDEO_FLEXFEC_FIELDTRIAL;
|
| Log.d(TAG, "Enable FlexFEC field trial.");
|
| - } else {
|
| - PeerConnectionFactory.initializeFieldTrials("");
|
| }
|
| + fieldTrials += VIDEO_VP8_INTEL_HW_ENCODER_FIELDTRIAL;
|
| + PeerConnectionFactory.initializeFieldTrials(fieldTrials);
|
|
|
| // Check preferred video codec.
|
| preferredVideoCodec = VIDEO_CODEC_VP8;
|
|
|