| commit | 6196feb2ed60fc5969747ec649e1a30f804c25f3 | [log] [tgz] |
|---|---|---|
| author | Sami Kalliomäki <sakal@webrtc.org> | Fri Nov 24 11:00:04 2017 +0100 |
| committer | Commit Bot <commit-bot@chromium.org> | Fri Nov 24 10:30:59 2017 +0000 |
| tree | e3657f67cae8c9179170b434d2f825f9154d21dd | |
| parent | 1f2a3e705809c3d2233eafe9e6cca44d46e9c09a [diff] [blame] |
Fix a bug where all wrapped codecs were considered software codecs. This is not the case for fallback codecs. Bug: webrtc:7925 Change-Id: I5039d8879923a2db1e7c08bb5640763dd20ea8e7 Reviewed-on: https://webrtc-review.googlesource.com/24863 Commit-Queue: Sami Kalliomäki <sakal@webrtc.org> Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20861}
diff --git a/sdk/android/api/org/webrtc/VideoEncoderFallback.java b/sdk/android/api/org/webrtc/VideoEncoderFallback.java index 6ee6351..7894da9 100644 --- a/sdk/android/api/org/webrtc/VideoEncoderFallback.java +++ b/sdk/android/api/org/webrtc/VideoEncoderFallback.java
@@ -27,5 +27,10 @@ return createNativeEncoder(fallback, primary); } + @Override + boolean isSoftwareEncoder() { + return isWrappedSoftwareEncoder(primary); + } + private static native long createNativeEncoder(VideoEncoder fallback, VideoEncoder primary); }