Android: Remove codec thread from MediaCodecVideoDecoder.

webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc

 /*
  *  Copyright 2015 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <algorithm>
 #include <deque>
 #include <memory>
 #include <vector>
 
 // NOTICE: androidmediadecoder_jni.h must be included before
 // androidmediacodeccommon.h to avoid build errors.
 #include "webrtc/sdk/android/src/jni/androidmediadecoder_jni.h"
 
 #include "third_party/libyuv/include/libyuv/convert.h"
 #include "third_party/libyuv/include/libyuv/convert_from.h"
 #include "third_party/libyuv/include/libyuv/video_common.h"
 #include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/base/thread.h"
+#include "webrtc/base/thread_checker.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/common_video/h264/h264_bitstream_parser.h"
 #include "webrtc/common_video/include/i420_buffer_pool.h"
 #include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/modules/video_coding/utility/vp8_header_parser.h"
 #include "webrtc/sdk/android/src/jni/androidmediacodeccommon.h"
 #include "webrtc/sdk/android/src/jni/classreferenceholder.h"
 #include "webrtc/sdk/android/src/jni/native_handle_impl.h"
 #include "webrtc/sdk/android/src/jni/surfacetexturehelper_jni.h"
 #include "webrtc/system_wrappers/include/logcat_trace_context.h"
@@ skipping 20 matching lines @@
 using webrtc::VideoFrame;
 using webrtc::RTPFragmentationHeader;
 using webrtc::VideoCodec;
 using webrtc::VideoCodecType;
 using webrtc::kVideoCodecH264;
 using webrtc::kVideoCodecVP8;
 using webrtc::kVideoCodecVP9;
 
 namespace webrtc_jni {
 
+// All calls should be made on the decoding thread expect for release which can
+// be called after the decoder thread has been stopped.
 class MediaCodecVideoDecoder : public webrtc::VideoDecoder {
  public:
   explicit MediaCodecVideoDecoder(
       JNIEnv* jni, VideoCodecType codecType, jobject render_egl_context);
   virtual ~MediaCodecVideoDecoder();
 
   int32_t InitDecode(const VideoCodec* codecSettings, int32_t numberOfCores)
       override;
 
   int32_t Decode(
       const EncodedImage& inputImage, bool missingFrames,
       const RTPFragmentationHeader* fragmentation,
       const CodecSpecificInfo* codecSpecificInfo = NULL,
       int64_t renderTimeMs = -1) override;
 
   void PollDecodedFrames() override;
 
   int32_t RegisterDecodeCompleteCallback(DecodedImageCallback* callback)
       override;
 
   int32_t Release() override;
 
   bool PrefersLateDecoding() const override { return true; }
 
   const char* ImplementationName() const override;
 
  private:
-  struct DecodedFrame {
-    DecodedFrame(VideoFrame frame,
-                 int decode_time_ms,
-                 int64_t timestamp,
-                 int64_t ntp_timestamp,
-                 rtc::Optional<uint8_t> qp)
-        : frame(std::move(frame)),
-          decode_time_ms(decode_time_ms),
-          qp(std::move(qp)) {
-      frame.set_timestamp(timestamp);
-      frame.set_ntp_time_ms(ntp_timestamp);
-    }
-
-    VideoFrame frame;
-    int decode_time_ms;
-    rtc::Optional<uint8_t> qp;
-  };
-
-  // Returns true if running on |codec_thread_|. Used for DCHECKing.
-  bool IsOnCodecThread();
-
-  int32_t InitDecodeOnCodecThread();
-  int32_t ResetDecodeOnCodecThread();
-  int32_t ReleaseOnCodecThread();
-  int32_t DecodeOnCodecThread(const EncodedImage& inputImage,
-                              std::vector<DecodedFrame>* frames);
-  void PollDecodedFramesOnCodecThread(std::vector<DecodedFrame>* frames);
+  int32_t InitDecodeInternal();
+  int32_t ResetDecode();
   // Deliver any outputs pending in the MediaCodec to our |callback_| and return
   // true on success.
-  bool DeliverPendingOutputs(JNIEnv* jni,
-                             int dequeue_timeout_us,
-                             std::vector<DecodedFrame>* frames);
-  int32_t ProcessHWErrorOnCodecThread();
+  bool DeliverPendingOutputs(JNIEnv* jni, int dequeue_timeout_us);
+  int32_t ProcessHWError();
   void EnableFrameLogOnWarning();
   void ResetVariables();
 
   // Type of video codec.
   VideoCodecType codecType_;
 
   // Render EGL context - owned by factory, should not be allocated/destroyed
   // by VideoDecoder.
   jobject render_egl_context_;
 
@@ skipping 13 matching lines @@
   int current_frames_;  // Number of frames in the current statistics interval.
   int current_bytes_;  // Encoded bytes in the current statistics interval.
   int current_decoding_time_ms_;  // Overall decoding time in the current second
   int current_delay_time_ms_;  // Overall delay time in the current second.
   uint32_t max_pending_frames_;  // Maximum number of pending input frames.
   webrtc::H264BitstreamParser h264_bitstream_parser_;
   std::deque<rtc::Optional<uint8_t>> pending_frame_qps_;
 
   // State that is constant for the lifetime of this object once the ctor
   // returns.
-  std::unique_ptr<Thread>
-      codec_thread_;  // Thread on which to operate MediaCodec.
+  rtc::ThreadChecker decode_thread_checker_;
   ScopedGlobalRef<jclass> j_media_codec_video_decoder_class_;
   ScopedGlobalRef<jobject> j_media_codec_video_decoder_;
   jmethodID j_init_decode_method_;
   jmethodID j_reset_method_;
   jmethodID j_release_method_;
   jmethodID j_dequeue_input_buffer_method_;
   jmethodID j_queue_input_buffer_method_;
   jmethodID j_dequeue_byte_buffer_method_;
   jmethodID j_dequeue_texture_buffer_method_;
   jmethodID j_return_decoded_byte_buffer_method_;
@@ skipping 17 matching lines @@
   jfieldID j_info_index_field_;
   jfieldID j_info_offset_field_;
   jfieldID j_info_size_field_;
   jfieldID j_presentation_timestamp_ms_field_;
   jfieldID j_timestamp_ms_field_;
   jfieldID j_ntp_timestamp_ms_field_;
   jfieldID j_byte_buffer_decode_time_ms_field_;
 
   // Global references; must be deleted in Release().
   std::vector<jobject> input_buffers_;
-
-  // Added to on the codec thread, frames are delivered on the decoder thread.
-  std::vector<DecodedFrame> decoded_frames_;
 };
 
 MediaCodecVideoDecoder::MediaCodecVideoDecoder(
     JNIEnv* jni, VideoCodecType codecType, jobject render_egl_context) :
     codecType_(codecType),
     render_egl_context_(render_egl_context),
     key_frame_required_(true),
     inited_(false),
     sw_fallback_required_(false),
-    codec_thread_(new Thread()),
     j_media_codec_video_decoder_class_(
         jni,
         FindClass(jni, "org/webrtc/MediaCodecVideoDecoder")),
           j_media_codec_video_decoder_(
               jni,
               jni->NewObject(*j_media_codec_video_decoder_class_,
                    GetMethodID(jni,
                               *j_media_codec_video_decoder_class_,
                               "<init>",
                               "()V"))) {
-  codec_thread_->SetName("MediaCodecVideoDecoder", NULL);
-  RTC_CHECK(codec_thread_->Start());
+  decode_thread_checker_.DetachFromThread();
 
   j_init_decode_method_ = GetMethodID(
       jni, *j_media_codec_video_decoder_class_, "initDecode",
       "(Lorg/webrtc/MediaCodecVideoDecoder$VideoCodecType;"
       "IILorg/webrtc/SurfaceTextureHelper;)Z");
   j_reset_method_ =
       GetMethodID(jni, *j_media_codec_video_decoder_class_, "reset", "(II)V");
   j_release_method_ =
       GetMethodID(jni, *j_media_codec_video_decoder_class_, "release", "()V");
   j_dequeue_input_buffer_method_ = GetMethodID(
@@ skipping 68 matching lines @@
   AllowBlockingCalls();
 }
 
 MediaCodecVideoDecoder::~MediaCodecVideoDecoder() {
   // Call Release() to ensure no more callbacks to us after we are deleted.
   Release();
 }
 
 int32_t MediaCodecVideoDecoder::InitDecode(const VideoCodec* inst,
     int32_t numberOfCores) {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
   ALOGD << "InitDecode.";
   if (inst == NULL) {
     ALOGE << "NULL VideoCodec instance";
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
   // Factory should guard against other codecs being used with us.
   RTC_DCHECK(inst->codecType == codecType_)
       << "Unsupported codec " << inst->codecType << " for " << codecType_;
 
   if (sw_fallback_required_) {
     ALOGE << "InitDecode() - fallback to SW decoder";
     return WEBRTC_VIDEO_CODEC_OK;
   }
   // Save VideoCodec instance for later.
   if (&codec_ != inst) {
     codec_ = *inst;
   }
   // If maxFramerate is not set then assume 30 fps.
   codec_.maxFramerate = (codec_.maxFramerate >= 1) ? codec_.maxFramerate : 30;
 
   // Call Java init.
-  return codec_thread_->Invoke<int32_t>(
-      RTC_FROM_HERE,
-      Bind(&MediaCodecVideoDecoder::InitDecodeOnCodecThread, this));
+  return InitDecodeInternal();
 }
 
 void MediaCodecVideoDecoder::ResetVariables() {
-  RTC_DCHECK(IsOnCodecThread());
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
 
   key_frame_required_ = true;
   frames_received_ = 0;
   frames_decoded_ = 0;
   frames_decoded_logged_ = kMaxDecodedLogFrames;
   start_time_ms_ = rtc::TimeMillis();
   current_frames_ = 0;
   current_bytes_ = 0;
   current_decoding_time_ms_ = 0;
   current_delay_time_ms_ = 0;
   pending_frame_qps_.clear();
 }
 
-int32_t MediaCodecVideoDecoder::InitDecodeOnCodecThread() {
-  RTC_DCHECK(IsOnCodecThread());
+int32_t MediaCodecVideoDecoder::InitDecodeInternal() {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
   ScopedLocalRefFrame local_ref_frame(jni);
-  ALOGD << "InitDecodeOnCodecThread Type: " << (int)codecType_ << ". "
-      << codec_.width << " x " << codec_.height << ". Fps: " <<
-      (int)codec_.maxFramerate;
+  ALOGD << "InitDecodeInternal Type: " << (int)codecType_ << ". "
+        << codec_.width << " x " << codec_.height
+        << ". Fps: " << (int)codec_.maxFramerate;
 
   // Release previous codec first if it was allocated before.
-  int ret_val = ReleaseOnCodecThread();
+  int ret_val = Release();
   if (ret_val < 0) {
     ALOGE << "Release failure: " << ret_val << " - fallback to SW codec";
     sw_fallback_required_ = true;
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
   ResetVariables();
 
   if (use_surface_) {
     surface_texture_helper_ = SurfaceTextureHelper::create(
@@ skipping 48 matching lines @@
     if (CheckException(jni)) {
       ALOGE << "NewGlobalRef error - fallback to SW codec.";
       sw_fallback_required_ = true;
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
   }
 
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-int32_t MediaCodecVideoDecoder::ResetDecodeOnCodecThread() {
-  RTC_DCHECK(IsOnCodecThread());
+int32_t MediaCodecVideoDecoder::ResetDecode() {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
   ScopedLocalRefFrame local_ref_frame(jni);
-  ALOGD << "ResetDecodeOnCodecThread Type: " << (int)codecType_ << ". "
-      << codec_.width << " x " << codec_.height;
+  ALOGD << "ResetDecode Type: " << (int)codecType_ << ". " << codec_.width
+        << " x " << codec_.height;
   ALOGD << "  Frames received: " << frames_received_ <<
       ". Frames decoded: " << frames_decoded_;
 
   inited_ = false;
   ResetVariables();
 
   jni->CallVoidMethod(
       *j_media_codec_video_decoder_,
       j_reset_method_,
       codec_.width,
       codec_.height);
 
   if (CheckException(jni)) {
     ALOGE << "Soft reset error - fallback to SW codec.";
     sw_fallback_required_ = true;
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
   inited_ = true;
 
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 int32_t MediaCodecVideoDecoder::Release() {
   ALOGD << "DecoderRelease request";
-  return codec_thread_->Invoke<int32_t>(
-      RTC_FROM_HERE, Bind(&MediaCodecVideoDecoder::ReleaseOnCodecThread, this));
-}
-
-int32_t MediaCodecVideoDecoder::ReleaseOnCodecThread() {
-  RTC_DCHECK(IsOnCodecThread());
   if (!inited_) {
     return WEBRTC_VIDEO_CODEC_OK;
   }
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
-  ALOGD << "DecoderReleaseOnCodecThread: Frames received: " <<
-      frames_received_ << ". Frames decoded: " << frames_decoded_;
+  ALOGD << "DecoderRelease: Frames received: " << frames_received_
+        << ". Frames decoded: " << frames_decoded_;
   ScopedLocalRefFrame local_ref_frame(jni);
   for (size_t i = 0; i < input_buffers_.size(); i++) {
     jni->DeleteGlobalRef(input_buffers_[i]);
   }
   input_buffers_.clear();
   jni->CallVoidMethod(*j_media_codec_video_decoder_, j_release_method_);
   surface_texture_helper_ = nullptr;
   inited_ = false;
   if (CheckException(jni)) {
     ALOGE << "Decoder release exception";
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
-  ALOGD << "DecoderReleaseOnCodecThread done";
+  ALOGD << "DecoderRelease done";
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-bool MediaCodecVideoDecoder::IsOnCodecThread() {
-  return codec_thread_.get() == ThreadManager::Instance()->CurrentThread();
-}
-
 void MediaCodecVideoDecoder::EnableFrameLogOnWarning() {
   // Log next 2 output frames.
   static const int kMaxWarningLogFrames = 2;
   frames_decoded_logged_ = std::max(
       frames_decoded_logged_, frames_decoded_ + kMaxWarningLogFrames);
 }
 
-int32_t MediaCodecVideoDecoder::ProcessHWErrorOnCodecThread() {
-  RTC_DCHECK(IsOnCodecThread());
-  int ret_val = ReleaseOnCodecThread();
+int32_t MediaCodecVideoDecoder::ProcessHWError() {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
+  int ret_val = Release();
   if (ret_val < 0) {
     ALOGE << "ProcessHWError: Release failure";
   }
   if (codecType_ == kVideoCodecH264) {
     // For now there is no SW H.264 which can be used as fallback codec.
     // So try to restart hw codec for now.
-    ret_val = InitDecodeOnCodecThread();
+    ret_val = InitDecodeInternal();
     ALOGE << "Reset H.264 codec done. Status: " << ret_val;
     if (ret_val == WEBRTC_VIDEO_CODEC_OK) {
       // H.264 codec was succesfully reset - return regular error code.
       return WEBRTC_VIDEO_CODEC_ERROR;
     } else {
       // Fail to restart H.264 codec - return error code which should stop the
       // call.
       return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
     }
   } else {
     sw_fallback_required_ = true;
     ALOGE << "Return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE";
     return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
   }
 }
 
 int32_t MediaCodecVideoDecoder::Decode(
     const EncodedImage& inputImage,
     bool missingFrames,
     const RTPFragmentationHeader* fragmentation,
     const CodecSpecificInfo* codecSpecificInfo,
     int64_t renderTimeMs) {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
   RTC_DCHECK(callback_);
   RTC_DCHECK(inited_);
 
   if (sw_fallback_required_) {
     ALOGE << "Decode() - fallback to SW codec";
     return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
   }
   if (inputImage._buffer == NULL && inputImage._length > 0) {
     ALOGE << "Decode() - inputImage is incorrect";
     return WEBRTC_VIDEO_CODEC_ERR_PARAMETER;
   }
 
   // Check if encoded frame dimension has changed.
   if ((inputImage._encodedWidth * inputImage._encodedHeight > 0) &&
       (inputImage._encodedWidth != codec_.width ||
       inputImage._encodedHeight != codec_.height)) {
     ALOGW << "Input resolution changed from " <<
         codec_.width << " x " << codec_.height << " to " <<
         inputImage._encodedWidth << " x " << inputImage._encodedHeight;
     codec_.width = inputImage._encodedWidth;
     codec_.height = inputImage._encodedHeight;
     int32_t ret;
     if (use_surface_ &&
         (codecType_ == kVideoCodecVP8 || codecType_ == kVideoCodecH264)) {
       // Soft codec reset - only for surface decoding.
-      ret = codec_thread_->Invoke<int32_t>(
-          RTC_FROM_HERE,
-          Bind(&MediaCodecVideoDecoder::ResetDecodeOnCodecThread, this));
+      ret = ResetDecode();
     } else {
       // Hard codec reset.
       ret = InitDecode(&codec_, 1);
     }
     if (ret < 0) {
       ALOGE << "InitDecode failure: " << ret << " - fallback to SW codec";
       sw_fallback_required_ = true;
       return WEBRTC_VIDEO_CODEC_FALLBACK_SOFTWARE;
     }
   }
 
   // Always start with a complete key frame.
   if (key_frame_required_) {
     if (inputImage._frameType != webrtc::kVideoFrameKey) {
       ALOGE << "Decode() - key frame is required";
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
     if (!inputImage._completeFrame) {
       ALOGE << "Decode() - complete frame is required";
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
     key_frame_required_ = false;
   }
   if (inputImage._length == 0) {
     return WEBRTC_VIDEO_CODEC_ERROR;
   }
 
-  std::vector<DecodedFrame> frames;
-  int32_t ret = codec_thread_->Invoke<int32_t>(
-      RTC_FROM_HERE, Bind(&MediaCodecVideoDecoder::DecodeOnCodecThread, this,
-                          inputImage, &frames));
-  for (auto& f : frames)
-    callback_->Decoded(f.frame, rtc::Optional<int32_t>(f.decode_time_ms), f.qp);
-  return ret;
-}
-
-void MediaCodecVideoDecoder::PollDecodedFrames() {
-  RTC_DCHECK(callback_);
-
-  std::vector<DecodedFrame> frames;
-  codec_thread_->Invoke<void>(
-      RTC_FROM_HERE,
-      Bind(&MediaCodecVideoDecoder::PollDecodedFramesOnCodecThread, this,
-           &frames));
-
-  for (auto& f : frames)
-    callback_->Decoded(f.frame, rtc::Optional<int32_t>(f.decode_time_ms), f.qp);
-}
-
-int32_t MediaCodecVideoDecoder::DecodeOnCodecThread(
-    const EncodedImage& inputImage,
-    std::vector<DecodedFrame>* frames) {
-  RTC_DCHECK(IsOnCodecThread());
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
   ScopedLocalRefFrame local_ref_frame(jni);
 
   // Try to drain the decoder and wait until output is not too
   // much behind the input.
   if (codecType_ == kVideoCodecH264 &&
       frames_received_ > frames_decoded_ + max_pending_frames_) {
     // Print warning for H.264 only - for VP8/VP9 one frame delay is ok.
     ALOGW << "Decoder is too far behind. Try to drain. Received: " <<
         frames_received_ << ". Decoded: " << frames_decoded_;
     EnableFrameLogOnWarning();
   }
   const int64 drain_start = rtc::TimeMillis();
   while ((frames_received_ > frames_decoded_ + max_pending_frames_) &&
          (rtc::TimeMillis() - drain_start) < kMediaCodecTimeoutMs) {
-    if (!DeliverPendingOutputs(jni, kMediaCodecPollMs, frames)) {
+    if (!DeliverPendingOutputs(jni, kMediaCodecPollMs)) {
       ALOGE << "DeliverPendingOutputs error. Frames received: " <<
           frames_received_ << ". Frames decoded: " << frames_decoded_;
-      return ProcessHWErrorOnCodecThread();
+      return ProcessHWError();
     }
   }
   if (frames_received_ > frames_decoded_ + max_pending_frames_) {
     ALOGE << "Output buffer dequeue timeout. Frames received: " <<
         frames_received_ << ". Frames decoded: " << frames_decoded_;
-    return ProcessHWErrorOnCodecThread();
+    return ProcessHWError();
   }
 
   // Get input buffer.
   int j_input_buffer_index = jni->CallIntMethod(
       *j_media_codec_video_decoder_, j_dequeue_input_buffer_method_);
   if (CheckException(jni) || j_input_buffer_index < 0) {
     ALOGE << "dequeueInputBuffer error: " << j_input_buffer_index <<
         ". Retry DeliverPendingOutputs.";
     EnableFrameLogOnWarning();
     // Try to drain the decoder.
-    if (!DeliverPendingOutputs(jni, kMediaCodecPollMs, frames)) {
+    if (!DeliverPendingOutputs(jni, kMediaCodecPollMs)) {
       ALOGE << "DeliverPendingOutputs error. Frames received: " <<
           frames_received_ << ". Frames decoded: " << frames_decoded_;
-      return ProcessHWErrorOnCodecThread();
+      return ProcessHWError();
     }
     // Try dequeue input buffer one last time.
     j_input_buffer_index = jni->CallIntMethod(
         *j_media_codec_video_decoder_, j_dequeue_input_buffer_method_);
     if (CheckException(jni) || j_input_buffer_index < 0) {
       ALOGE << "dequeueInputBuffer critical error: " << j_input_buffer_index;
-      return ProcessHWErrorOnCodecThread();
+      return ProcessHWError();
     }
   }
 
   // Copy encoded data to Java ByteBuffer.
   jobject j_input_buffer = input_buffers_[j_input_buffer_index];
   uint8_t* buffer =
       reinterpret_cast<uint8_t*>(jni->GetDirectBufferAddress(j_input_buffer));
   RTC_DCHECK(buffer) << "Indirect buffer??";
   int64_t buffer_capacity = jni->GetDirectBufferCapacity(j_input_buffer);
   if (CheckException(jni) || buffer_capacity < inputImage._length) {
     ALOGE << "Input frame size "<<  inputImage._length <<
         " is bigger than buffer size " << buffer_capacity;
-    return ProcessHWErrorOnCodecThread();
+    return ProcessHWError();
   }
   jlong presentation_timestamp_us = static_cast<jlong>(
       static_cast<int64_t>(frames_received_) * 1000000 / codec_.maxFramerate);
   memcpy(buffer, inputImage._buffer, inputImage._length);
 
   if (frames_decoded_ < frames_decoded_logged_) {
     ALOGD << "Decoder frame in # " << frames_received_ <<
         ". Type: " << inputImage._frameType <<
         ". Buffer # " << j_input_buffer_index <<
         ". TS: " << presentation_timestamp_us / 1000 <<
@@ skipping 23 matching lines @@
   bool success = jni->CallBooleanMethod(
       *j_media_codec_video_decoder_,
       j_queue_input_buffer_method_,
       j_input_buffer_index,
       inputImage._length,
       presentation_timestamp_us,
       static_cast<int64_t> (inputImage._timeStamp),
       inputImage.ntp_time_ms_);
   if (CheckException(jni) || !success) {
     ALOGE << "queueInputBuffer error";
-    return ProcessHWErrorOnCodecThread();
+    return ProcessHWError();
   }
 
   // Try to drain the decoder
-  if (!DeliverPendingOutputs(jni, 0, frames)) {
+  if (!DeliverPendingOutputs(jni, 0)) {
     ALOGE << "DeliverPendingOutputs error";
-    return ProcessHWErrorOnCodecThread();
+    return ProcessHWError();
   }
 
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
-void MediaCodecVideoDecoder::PollDecodedFramesOnCodecThread(
-    std::vector<DecodedFrame>* frames) {
-  RTC_DCHECK(IsOnCodecThread());
+void MediaCodecVideoDecoder::PollDecodedFrames() {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
 
   JNIEnv* jni = AttachCurrentThreadIfNeeded();
   ScopedLocalRefFrame local_ref_frame(jni);
 
-  if (!DeliverPendingOutputs(jni, 0, frames)) {
-    ALOGE << "PollDecodedFramesOnCodecThread: DeliverPendingOutputs error";
-    ProcessHWErrorOnCodecThread();
+  if (!DeliverPendingOutputs(jni, 0)) {
+    ALOGE << "PollDecodedFrames: DeliverPendingOutputs error";
+    ProcessHWError();
   }
 }
 
-bool MediaCodecVideoDecoder::DeliverPendingOutputs(
-    JNIEnv* jni,
-    int dequeue_timeout_ms,
-    std::vector<DecodedFrame>* frames) {
-  RTC_DCHECK(IsOnCodecThread());
-  RTC_DCHECK(frames);
+bool MediaCodecVideoDecoder::DeliverPendingOutputs(JNIEnv* jni,
+                                                   int dequeue_timeout_ms) {
+  RTC_DCHECK(decode_thread_checker_.CalledOnValidThread());
 
   if (frames_received_ <= frames_decoded_) {
     // No need to query for output buffers - decoder is drained.
     return true;
   }
   // Get decoder output.
   jobject j_decoder_output_buffer =
       jni->CallObjectMethod(*j_media_codec_video_decoder_,
           use_surface_ ? j_dequeue_texture_buffer_method_
                        : j_dequeue_byte_buffer_method_,
@@ skipping 190 matching lines @@
   }
 
   // If the frame was dropped, frame_buffer is left as nullptr.
   if (frame_buffer) {
     VideoFrame decoded_frame(frame_buffer, 0, 0, webrtc::kVideoRotation_0);
     decoded_frame.set_timestamp(output_timestamps_ms);
     decoded_frame.set_ntp_time_ms(output_ntp_timestamps_ms);
 
     rtc::Optional<uint8_t> qp = pending_frame_qps_.front();
     pending_frame_qps_.pop_front();
-    decoded_frames_.push_back(DecodedFrame(std::move(decoded_frame),
-                                           decode_time_ms, output_timestamps_ms,
-                                           output_ntp_timestamps_ms, qp));
+    callback_->Decoded(decoded_frame, rtc::Optional<int32_t>(decode_time_ms),
+                       qp);
   }
 
-  frames->reserve(frames->size() + decoded_frames_.size());
-  std::move(decoded_frames_.begin(), decoded_frames_.end(),
-            std::back_inserter(*frames));
-  decoded_frames_.clear();
-
   return true;
 }
 
 int32_t MediaCodecVideoDecoder::RegisterDecodeCompleteCallback(
     DecodedImageCallback* callback) {
   callback_ = callback;
   return WEBRTC_VIDEO_CODEC_OK;
 }
 
 MediaCodecVideoDecoderFactory::MediaCodecVideoDecoderFactory()
@@ skipping 81 matching lines @@
     webrtc::VideoDecoder* decoder) {
   ALOGD << "Destroy video decoder.";
   delete decoder;
 }
 
 const char* MediaCodecVideoDecoder::ImplementationName() const {
   return "MediaCodec";
 }
 
 }  // namespace webrtc_jni