commit a265da4082eadc5624ed1c2e624649600b26ff57
author Sami Kalliomäki <sakal@webrtc.org> Mon Oct 02 11:18:01 2017 +0200
committer Commit Bot <commit-bot@chromium.org> Mon Oct 02 12:30:49 2017 +0000
tree 5af5c7ad7c4347545d8ef25b26b5754b50747eb1
parent e3044fe12ea14781f4d9d75c6c3a359f1bb5c596

Android: Fix getting encoder queue in encoder wrapper.

Get the encoder queue in init instead of the constructor. The
constructor is not always called on the same thread as init. The
encoder may also be reinitialized on a different thread.

Bug: webrtc:7760
Change-Id: I32a025a8bdf652ab019ac4c2ffc6be1533008925
Reviewed-on: https://webrtc-review.googlesource.com/5480
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20074}

sdk/android/src/jni/videoencoderwrapper.cc

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