From 88a2e31f66a3d0ed564f891d15acf507dede32fc Mon Sep 17 00:00:00 2001 From: Taylor Brandstetter Date: Tue, 3 Oct 2017 02:54:38 +0000 Subject: [PATCH] Revert "Reland "Use injectable hardware video decoder/encoder in AppRTCMobile."" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bc675ff3fa71549b0a0fdeca56803b41f4de0f53. Reason for revert: Crashing video_quality_loopback_test on Android64 Tests (L Nexus9) buildbot. See bug for more details. Original change's description: > Reland "Use injectable hardware video decoder/encoder in AppRTCMobile." > > This is a reland of 0cbaf1a6f6ad13a25993f6ea3be931894a196834 > Original change's description: > > Use injectable hardware video decoder/encoder in AppRTCMobile. > > > > Also include a small fix for getting the encoder queue. > > > > Bug: webrtc:7760 > > Change-Id: I96dc8ffb363b90382276d88148f81d5f89dca5f2 > > Reviewed-on: https://webrtc-review.googlesource.com/2683 > > Commit-Queue: Sami Kalliomäki > > Reviewed-by: Magnus Jedvert > > Cr-Commit-Position: refs/heads/master@{#20022} > > Bug: webrtc:7760 > Change-Id: Ia82129fde7abb59120ba5bb23938db9eb576ae91 > Reviewed-on: https://webrtc-review.googlesource.com/4701 > Commit-Queue: Sami Kalliomäki > Reviewed-by: Magnus Jedvert > Cr-Commit-Position: refs/heads/master@{#20080} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: Iec30e92c1cc5a547bc2d0b74d12554873fba5e26 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7760 Reviewed-on: https://webrtc-review.googlesource.com/5681 Reviewed-by: Taylor Brandstetter Commit-Queue: Taylor Brandstetter Cr-Commit-Position: refs/heads/master@{#20096} --- .../src/org/appspot/apprtc/PeerConnectionClient.java | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 44278fff8a..caad17125b 100644 --- a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java +++ b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java @@ -36,8 +36,6 @@ import org.webrtc.AudioTrack; import org.webrtc.CameraVideoCapturer; import org.webrtc.DataChannel; import org.webrtc.EglBase; -import org.webrtc.HardwareVideoDecoderFactory; -import org.webrtc.HardwareVideoEncoderFactory; import org.webrtc.IceCandidate; import org.webrtc.Logging; import org.webrtc.MediaConstraints; @@ -341,7 +339,6 @@ public class PeerConnectionClient { createPeerConnection( localRender, Collections.singletonList(remoteRender), videoCapturer, signalingParameters); } - public void createPeerConnection(final VideoSink localRender, final List remoteRenders, final VideoCapturer videoCapturer, final SignalingParameters signalingParameters) { @@ -515,12 +512,7 @@ public class PeerConnectionClient { if (options != null) { Log.d(TAG, "Factory networkIgnoreMask option: " + options.networkIgnoreMask); } - final boolean enableH264HighProfile = - peerConnectionParameters.videoCodec.equals(VIDEO_CODEC_H264_HIGH); - factory = new PeerConnectionFactory(options, - new HardwareVideoEncoderFactory(rootEglBase.getEglBaseContext(), - true /* enableIntelVp8Encoder */, enableH264HighProfile), - new HardwareVideoDecoderFactory(rootEglBase.getEglBaseContext())); + factory = new PeerConnectionFactory(options); Log.d(TAG, "Peer connection factory created."); }