From 27bafec7c1ff0fc87d8826436e5364e31622a27c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Kalliom=C3=A4ki?= Date: Thu, 28 Sep 2017 16:31:41 +0000 Subject: [PATCH] Revert "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 0cbaf1a6f6ad13a25993f6ea3be931894a196834. Reason for revert: Makes a test flaky: https://build.chromium.org/p/client.webrtc/builders/Android32%20%28M%20Nexus5X%29/builds/4603 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} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: I6cb9a10eadb0eff2b85d5028d684746dc69bccfb No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:7760 Reviewed-on: https://webrtc-review.googlesource.com/4480 Reviewed-by: Sami Kalliomäki Commit-Queue: Sami Kalliomäki Cr-Commit-Position: refs/heads/master@{#20024} --- .../src/org/appspot/apprtc/PeerConnectionClient.java | 10 +--------- sdk/android/src/jni/videoencoderwrapper.cc | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java index 0e3ea0cf07..e40a17cd14 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) { @@ -512,12 +509,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."); } diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc index 55ebeef219..ceecda2bf2 100644 --- a/sdk/android/src/jni/videoencoderwrapper.cc +++ b/sdk/android/src/jni/videoencoderwrapper.cc @@ -97,6 +97,8 @@ VideoEncoderWrapper::VideoEncoderWrapper(JNIEnv* jni, jobject j_encoder) implementation_name_ = GetImplementationName(jni); + encoder_queue_ = rtc::TaskQueue::Current(); + initialized_ = false; num_resets_ = 0; @@ -114,7 +116,6 @@ int32_t VideoEncoderWrapper::InitEncode(const VideoCodec* codec_settings, number_of_cores_ = number_of_cores; codec_settings_ = *codec_settings; num_resets_ = 0; - encoder_queue_ = rtc::TaskQueue::Current(); return InitEncodeInternal(jni); } @@ -166,7 +167,6 @@ int32_t VideoEncoderWrapper::Release() { jobject ret = jni->CallObjectMethod(*encoder_, release_method_); frame_extra_infos_.clear(); initialized_ = false; - encoder_queue_ = nullptr; return HandleReturnCode(jni, ret); }