| Index: webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| diff --git a/webrtc/api/java/jni/androidmediadecoder_jni.cc b/webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| index b3c2ffc241d456df5b489bb64c94e3dbfe2de6ec..774826281d02def6360ef2a1d3a640c776751195 100644
|
| --- a/webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| +++ b/webrtc/api/java/jni/androidmediadecoder_jni.cc
|
| @@ -307,7 +307,7 @@ int32_t MediaCodecVideoDecoder::InitDecode(const VideoCodec* inst,
|
|
|
| // Call Java init.
|
| return codec_thread_->Invoke<int32_t>(
|
| - Bind(&MediaCodecVideoDecoder::InitDecodeOnCodecThread, this));
|
| + FROM_HERE, Bind(&MediaCodecVideoDecoder::InitDecodeOnCodecThread, this));
|
| }
|
|
|
| void MediaCodecVideoDecoder::ResetVariables() {
|
| @@ -399,7 +399,7 @@ int32_t MediaCodecVideoDecoder::InitDecodeOnCodecThread() {
|
| }
|
| }
|
|
|
| - codec_thread_->PostDelayed(kMediaCodecPollMs, this);
|
| + codec_thread_->PostDelayed(FROM_HERE, kMediaCodecPollMs, this);
|
|
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
| @@ -430,7 +430,7 @@ int32_t MediaCodecVideoDecoder::ResetDecodeOnCodecThread() {
|
| }
|
| inited_ = true;
|
|
|
| - codec_thread_->PostDelayed(kMediaCodecPollMs, this);
|
| + codec_thread_->PostDelayed(FROM_HERE, kMediaCodecPollMs, this);
|
|
|
| return WEBRTC_VIDEO_CODEC_OK;
|
| }
|
| @@ -438,7 +438,7 @@ int32_t MediaCodecVideoDecoder::ResetDecodeOnCodecThread() {
|
| int32_t MediaCodecVideoDecoder::Release() {
|
| ALOGD << "DecoderRelease request";
|
| return codec_thread_->Invoke<int32_t>(
|
| - Bind(&MediaCodecVideoDecoder::ReleaseOnCodecThread, this));
|
| + FROM_HERE, Bind(&MediaCodecVideoDecoder::ReleaseOnCodecThread, this));
|
| }
|
|
|
| int32_t MediaCodecVideoDecoder::ReleaseOnCodecThread() {
|
| @@ -539,8 +539,9 @@ int32_t MediaCodecVideoDecoder::Decode(
|
| if (use_surface_ &&
|
| (codecType_ == kVideoCodecVP8 || codecType_ == kVideoCodecH264)) {
|
| // Soft codec reset - only for surface decoding.
|
| - ret = codec_thread_->Invoke<int32_t>(Bind(
|
| - &MediaCodecVideoDecoder::ResetDecodeOnCodecThread, this));
|
| + ret = codec_thread_->Invoke<int32_t>(
|
| + FROM_HERE,
|
| + Bind(&MediaCodecVideoDecoder::ResetDecodeOnCodecThread, this));
|
| } else {
|
| // Hard codec reset.
|
| ret = InitDecode(&codec_, 1);
|
| @@ -568,8 +569,9 @@ int32_t MediaCodecVideoDecoder::Decode(
|
| return WEBRTC_VIDEO_CODEC_ERROR;
|
| }
|
|
|
| - return codec_thread_->Invoke<int32_t>(Bind(
|
| - &MediaCodecVideoDecoder::DecodeOnCodecThread, this, inputImage));
|
| + return codec_thread_->Invoke<int32_t>(
|
| + FROM_HERE,
|
| + Bind(&MediaCodecVideoDecoder::DecodeOnCodecThread, this, inputImage));
|
| }
|
|
|
| int32_t MediaCodecVideoDecoder::DecodeOnCodecThread(
|
| @@ -897,7 +899,7 @@ void MediaCodecVideoDecoder::OnMessage(rtc::Message* msg) {
|
| ProcessHWErrorOnCodecThread();
|
| return;
|
| }
|
| - codec_thread_->PostDelayed(kMediaCodecPollMs, this);
|
| + codec_thread_->PostDelayed(FROM_HERE, kMediaCodecPollMs, this);
|
| }
|
|
|
| MediaCodecVideoDecoderFactory::MediaCodecVideoDecoderFactory()
|
|
|