commit 53edac6c0ee266b148270de8a5e8eb855c9cdba0
author Peter Boström <pbos@webrtc.org> Wed Apr 27 00:08:34 2016 +0200
committer Peter Boström <pbos@webrtc.org> Tue Apr 26 22:08:45 2016 +0000
tree 12546b0678aeebb0ff440824c07bff0de83283f7
parent 73894369791cb5eedc8788baf918ec07d11d351d

Report dropped frames from codec thread.

Removes data race inside QualityScaler which were called both from the
codec thread and the invoking thread at the same time.

BUG=webrtc:5678
R=glaznev@webrtc.org

Review URL: https://codereview.webrtc.org/1919883002 .

Cr-Commit-Position: refs/heads/master@{#12517}

webrtc/api/java/jni/androidmediaencoder_jni.cc

diff --git a/webrtc/api/java/jni/androidmediaencoder_jni.cc b/webrtc/api/java/jni/androidmediaencoder_jni.cc
index a9aa1d9..e88a94c 100644
--- a/webrtc/api/java/jni/androidmediaencoder_jni.cc
+++ b/webrtc/api/java/jni/androidmediaencoder_jni.cc
@@ -125,10 +125,6 @@
   const char* ImplementationName() const override;
 
  private:
-  // CHECK-fail if not running on |codec_thread_|.
-  void CheckOnCodecThread();
-
- private:
   // ResetCodecOnCodecThread() calls ReleaseOnCodecThread() and
   // InitEncodeOnCodecThread() in an attempt to restore the codec to an
   // operable state.  Necessary after all manner of OMX-layer errors.
@@ -158,6 +154,7 @@
       webrtc::EncodedImageCallback* callback);
   int32_t ReleaseOnCodecThread();
   int32_t SetRatesOnCodecThread(uint32_t new_bit_rate, uint32_t frame_rate);
+  void OnDroppedFrameOnCodecThread();
 
   // Helper accessors for MediaCodecVideoEncoder$OutputBufferInfo members.
   int GetOutputBufferInfoIndex(JNIEnv* jni, jobject j_output_buffer_info);
@@ -645,7 +642,7 @@
     drop_next_input_frame_ = false;
     current_timestamp_us_ += rtc::kNumMicrosecsPerSec / last_set_fps_;
     frames_dropped_media_encoder_++;
-    OnDroppedFrame();
+    OnDroppedFrameOnCodecThread();
     return WEBRTC_VIDEO_CODEC_OK;
   }
 
@@ -668,7 +665,7 @@
       return WEBRTC_VIDEO_CODEC_ERROR;
     }
     frames_dropped_media_encoder_++;
-    OnDroppedFrame();
+    OnDroppedFrameOnCodecThread();
     return WEBRTC_VIDEO_CODEC_OK;
   }
   consecutive_full_queue_frame_drops_ = 0;
@@ -713,7 +710,7 @@
       ALOGW << "Encoder drop frame - no input buffers available";
       current_timestamp_us_ += rtc::kNumMicrosecsPerSec / last_set_fps_;
       frames_dropped_media_encoder_++;
-      OnDroppedFrame();
+      OnDroppedFrameOnCodecThread();
       return WEBRTC_VIDEO_CODEC_OK;  // TODO(fischman): see webrtc bug 2887.
     }
     if (j_input_buffer_index == -2) {
@@ -1169,6 +1166,15 @@
 }
 
 void MediaCodecVideoEncoder::OnDroppedFrame() {
+  // Methods running on the codec thread should call OnDroppedFrameOnCodecThread
+  // directly.
+  RTC_DCHECK(!codec_thread_checker_.CalledOnValidThread());
+  codec_thread_->Invoke<void>(
+      Bind(&MediaCodecVideoEncoder::OnDroppedFrameOnCodecThread, this));
+}
+
+void MediaCodecVideoEncoder::OnDroppedFrameOnCodecThread() {
+  RTC_DCHECK(codec_thread_checker_.CalledOnValidThread());
   // Report dropped frame to quality_scaler_.
   if (scale_)
     quality_scaler_.ReportDroppedFrame();