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}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);
}