From 64534fd91704983b1ed73d3386e254374a9d2326 Mon Sep 17 00:00:00 2001 From: Bjorn Mellem Date: Mon, 13 Nov 2017 12:54:11 -0800 Subject: [PATCH] Make HardwareVideo*Factory ctors that take fallbackToSoftware public. https://webrtc-review.googlesource.com/c/src/+/17480 changed the default behavior of HardwareVideoEncoderFactory and HardwareVideoDecoderFactory without providing any way to maintain the previous behavior. This breaks current users. Making these constructors public at least gives existing users a way to maintain the previous behavior. Bug: webrtc:7925 Change-Id: Id8f0ec25026592f5e9096ac5f39fdda22993ff09 Reviewed-on: https://webrtc-review.googlesource.com/22763 Reviewed-by: Anders Carlsson Reviewed-by: Magnus Jedvert Commit-Queue: Bjorn Mellem Cr-Commit-Position: refs/heads/master@{#20675} --- sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java | 2 +- sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java index c14ec5f1d8..566624cd56 100644 --- a/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java +++ b/sdk/android/api/org/webrtc/HardwareVideoDecoderFactory.java @@ -42,7 +42,7 @@ public class HardwareVideoDecoderFactory implements VideoDecoderFactory { this(sharedContext, true /* fallbackToSoftware */); } - HardwareVideoDecoderFactory(EglBase.Context sharedContext, boolean fallbackToSoftware) { + public HardwareVideoDecoderFactory(EglBase.Context sharedContext, boolean fallbackToSoftware) { this.sharedContext = sharedContext; this.fallbackToSoftware = fallbackToSoftware; } diff --git a/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java b/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java index 02a96f8969..8bc5bf7ccf 100644 --- a/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java +++ b/sdk/android/api/org/webrtc/HardwareVideoEncoderFactory.java @@ -50,7 +50,7 @@ public class HardwareVideoEncoderFactory implements VideoEncoderFactory { sharedContext, enableIntelVp8Encoder, enableH264HighProfile, true /* fallbackToSoftware */); } - HardwareVideoEncoderFactory(EglBase.Context sharedContext, boolean enableIntelVp8Encoder, + public HardwareVideoEncoderFactory(EglBase.Context sharedContext, boolean enableIntelVp8Encoder, boolean enableH264HighProfile, boolean fallbackToSoftware) { // Texture mode requires EglBase14. if (sharedContext instanceof EglBase14.Context) {