commit 27bafec7c1ff0fc87d8826436e5364e31622a27c
author Sami Kalliomäki <sakal@webrtc.org> Thu Sep 28 16:31:41 2017 +0000
committer Commit Bot <commit-bot@chromium.org> Thu Sep 28 16:31:50 2017 +0000
tree fb0896eae301416430ef0bb494f728b8df3dfc04
parent 612f858ba0aa35c2993c4510b8ec5d3f8a5b70bf

Revert "Use injectable hardware video decoder/encoder in AppRTCMobile."

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 <sakal@webrtc.org>
> Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
> 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 <sakal@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20024}

examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java

diff --git a/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java b/examples/androidapp/src/org/appspot/apprtc/PeerConnectionClient.java
index 0e3ea0c..e40a17c 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.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 @@
     createPeerConnection(
         localRender, Collections.singletonList(remoteRender), videoCapturer, signalingParameters);
   }
-
   public void createPeerConnection(final VideoSink localRender,
       final List<VideoRenderer.Callbacks> remoteRenders, final VideoCapturer videoCapturer,
       final SignalingParameters signalingParameters) {
@@ -512,12 +509,7 @@
     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.");
   }
 

sdk/android/src/jni/videoencoderwrapper.cc

diff --git a/sdk/android/src/jni/videoencoderwrapper.cc b/sdk/android/src/jni/videoencoderwrapper.cc
index 55ebeef..ceecda2 100644
--- a/sdk/android/src/jni/videoencoderwrapper.cc
+++ b/sdk/android/src/jni/videoencoderwrapper.cc
@@ -97,6 +97,8 @@
 
   implementation_name_ = GetImplementationName(jni);
 
+  encoder_queue_ = rtc::TaskQueue::Current();
+
   initialized_ = false;
   num_resets_ = 0;
 
@@ -114,7 +116,6 @@
   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 @@
   jobject ret = jni->CallObjectMethod(*encoder_, release_method_);
   frame_extra_infos_.clear();
   initialized_ = false;
-  encoder_queue_ = nullptr;
   return HandleReturnCode(jni, ret);
 }