| Index: webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
|
| diff --git a/webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java b/webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
|
| index fc868c4b8cbc5473475fb02871ab7334c40a70b0..199aa8f3b4a8bc515dffb5a4403a8b432a3ed061 100644
|
| --- a/webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
|
| +++ b/webrtc/sdk/android/src/java/org/webrtc/HardwareVideoEncoder.java
|
| @@ -92,6 +92,7 @@ class HardwareVideoEncoder implements VideoEncoder {
|
| private MediaCodec codec;
|
| private Callback callback;
|
|
|
| + private boolean automaticResizeOn;
|
| private int width;
|
| private int height;
|
|
|
| @@ -133,6 +134,8 @@ class HardwareVideoEncoder implements VideoEncoder {
|
|
|
| @Override
|
| public VideoCodecStatus initEncode(Settings settings, Callback callback) {
|
| + automaticResizeOn = settings.automaticResizeOn;
|
| +
|
| return initEncodeInternal(
|
| settings.width, settings.height, settings.startBitrate, settings.maxFramerate, callback);
|
| }
|
| @@ -379,8 +382,7 @@ class HardwareVideoEncoder implements VideoEncoder {
|
|
|
| @Override
|
| public ScalingSettings getScalingSettings() {
|
| - // TODO(mellem): Implement scaling settings.
|
| - return null;
|
| + return new ScalingSettings(automaticResizeOn);
|
| }
|
|
|
| @Override
|
|
|