zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove field trial for scaling down MediaCodec.

Browse Source 
This should be on everywhere.

BUG=webrtc:5678
R=glaznev@webrtc.org

Review URL: https://codereview.webrtc.org/1889463002 .

Cr-Commit-Position: refs/heads/master@{#12355}
This commit is contained in:
Peter Boström
2016-04-14 00:54:56 +02:00
parent d4badbcb6d
commit 7ace488f47
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
webrtc/api/java/jni/androidmediaencoder_jni.cc
View File

@ -365,8 +365,7 @@ int32_t MediaCodecVideoEncoder::InitEncode(
codec_mode_ = codec_settings->mode;
int init_width = codec_settings->width;
int init_height = codec_settings->height;
scale_ = (codecType_ != kVideoCodecVP9) && (webrtc::field_trial::FindFullName(
"WebRTC-MediaCodecVideoEncoder-AutomaticResize") == "Enabled");
scale_ = codecType_ != kVideoCodecVP9;
ALOGD << "InitEncode request: " << init_width << " x " << init_height;
ALOGD << "Encoder automatic resize " << (scale_ ? "enabled" : "disabled");

4
webrtc/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
View File

@ -60,8 +60,6 @@ public class PeerConnectionClient {
public static final String VIDEO_TRACK_ID = "ARDAMSv0";
public static final String AUDIO_TRACK_ID = "ARDAMSa0";
private static final String TAG = "PCRTCClient";
private static final String FIELD_TRIAL_AUTOMATIC_RESIZE =
"WebRTC-MediaCodecVideoEncoder-AutomaticResize/Enabled/";
private static final String VIDEO_CODEC_VP8 = "VP8";
private static final String VIDEO_CODEC_VP9 = "VP9";
private static final String VIDEO_CODEC_H264 = "H264";
@ -314,7 +312,7 @@ public class PeerConnectionClient {
isError = false;
// Initialize field trials.
PeerConnectionFactory.initializeFieldTrials(FIELD_TRIAL_AUTOMATIC_RESIZE);
PeerConnectionFactory.initializeFieldTrials("");
// Check preferred video codec.
preferredVideoCodec = VIDEO_CODEC_VP8;