From c48badaed659b2328ca1e6ad751668db186d1fac Mon Sep 17 00:00:00 2001 From: Bjorn Mellem Date: Wed, 15 Nov 2017 17:48:06 +0000 Subject: [PATCH] Revert "Make HardwareVideo*Factory ctors that take fallbackToSoftware public." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 64534fd91704983b1ed73d3386e254374a9d2326. Reason for revert: no longer necessary. Original change's description: > 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} TBR=magjed@webrtc.org,sakal@webrtc.org,andersc@webrtc.org,mellem@webrtc.org # Not skipping CQ checks because original CL landed > 1 day ago. Bug: webrtc:7925 Change-Id: Ia467337a3916371a619e1d238e1dd03aa0e19261 Reviewed-on: https://webrtc-review.googlesource.com/23380 Reviewed-by: Bjorn Mellem Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#20695} --- 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 566624cd56..c14ec5f1d8 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 */); } - public HardwareVideoDecoderFactory(EglBase.Context sharedContext, boolean fallbackToSoftware) { + 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 8bc5bf7ccf..02a96f8969 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 */); } - public HardwareVideoEncoderFactory(EglBase.Context sharedContext, boolean enableIntelVp8Encoder, + HardwareVideoEncoderFactory(EglBase.Context sharedContext, boolean enableIntelVp8Encoder, boolean enableH264HighProfile, boolean fallbackToSoftware) { // Texture mode requires EglBase14. if (sharedContext instanceof EglBase14.Context) {