Replace MessageLoopProxy with SingleThreadTaskRunner for media/filters/ + associated code.

media/filters/decrypting_audio_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
-#include "base/message_loop/message_loop_proxy.h"
+#include "base/single_thread_task_runner.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/bind_to_loop.h"
 #include "media/base/buffers.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decryptor.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/pipeline.h"
 
 namespace media {
 
 const int DecryptingAudioDecoder::kSupportedBitsPerChannel = 16;
 
 static inline bool IsOutOfSync(const base::TimeDelta& timestamp_1,
                                const base::TimeDelta& timestamp_2) {
   // Out of sync of 100ms would be pretty noticeable and we should keep any
   // drift below that.
   const int64 kOutOfSyncThresholdInMilliseconds = 100;
   return std::abs(timestamp_1.InMilliseconds() - timestamp_2.InMilliseconds()) >
          kOutOfSyncThresholdInMilliseconds;
 }
 
 DecryptingAudioDecoder::DecryptingAudioDecoder(
-    const scoped_refptr<base::MessageLoopProxy>& message_loop,
+    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
     const SetDecryptorReadyCB& set_decryptor_ready_cb)
-    : message_loop_(message_loop),
+    : task_runner_(task_runner),
       weak_factory_(this),
       state_(kUninitialized),
       demuxer_stream_(NULL),
       set_decryptor_ready_cb_(set_decryptor_ready_cb),
       decryptor_(NULL),
       key_added_while_decode_pending_(false),
       bits_per_channel_(0),
       channel_layout_(CHANNEL_LAYOUT_NONE),
       samples_per_second_(0) {
 }
 
 void DecryptingAudioDecoder::Initialize(
     DemuxerStream* stream,
     const PipelineStatusCB& status_cb,
     const StatisticsCB& statistics_cb) {
   DVLOG(2) << "Initialize()";
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kUninitialized) << state_;
   DCHECK(stream);
 
   weak_this_ = weak_factory_.GetWeakPtr();
   init_cb_ = BindToCurrentLoop(status_cb);
 
   const AudioDecoderConfig& config = stream->audio_decoder_config();
   if (!config.IsValidConfig()) {
     DLOG(ERROR) << "Invalid audio stream config.";
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_DECODE);
@@ skipping 10 matching lines @@
   demuxer_stream_ = stream;
   statistics_cb_ = statistics_cb;
 
   state_ = kDecryptorRequested;
   set_decryptor_ready_cb_.Run(BindToCurrentLoop(
       base::Bind(&DecryptingAudioDecoder::SetDecryptor, weak_this_)));
 }
 
 void DecryptingAudioDecoder::Read(const ReadCB& read_cb) {
   DVLOG(3) << "Read()";
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(state_ == kIdle || state_ == kDecodeFinished) << state_;
   DCHECK(!read_cb.is_null());
   CHECK(read_cb_.is_null()) << "Overlapping decodes are not supported.";
 
   read_cb_ = BindToCurrentLoop(read_cb);
 
   // Return empty (end-of-stream) frames if decoding has finished.
   if (state_ == kDecodeFinished) {
     base::ResetAndReturn(&read_cb_).Run(kOk, AudioBuffer::CreateEOSBuffer());
     return;
   }
 
   if (!queued_audio_frames_.empty()) {
     base::ResetAndReturn(&read_cb_).Run(kOk, queued_audio_frames_.front());
     queued_audio_frames_.pop_front();
     return;
   }
 
   state_ = kPendingDemuxerRead;
   ReadFromDemuxerStream();
 }
 
 void DecryptingAudioDecoder::Reset(const base::Closure& closure) {
   DVLOG(2) << "Reset() - state: " << state_;
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(state_ == kIdle ||
          state_ == kPendingConfigChange ||
          state_ == kPendingDemuxerRead ||
          state_ == kPendingDecode ||
          state_ == kWaitingForKey ||
          state_ == kDecodeFinished) << state_;
   DCHECK(init_cb_.is_null());  // No Reset() during pending initialization.
   DCHECK(reset_cb_.is_null());
 
   reset_cb_ = closure;
@@ skipping 15 matching lines @@
     DCHECK(!read_cb_.is_null());
     pending_buffer_to_decode_ = NULL;
     base::ResetAndReturn(&read_cb_).Run(kAborted, NULL);
   }
 
   DCHECK(read_cb_.is_null());
   DoReset();
 }
 
 int DecryptingAudioDecoder::bits_per_channel() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   return bits_per_channel_;
 }
 
 ChannelLayout DecryptingAudioDecoder::channel_layout() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   return channel_layout_;
 }
 
 int DecryptingAudioDecoder::samples_per_second() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   return samples_per_second_;
 }
 
 DecryptingAudioDecoder::~DecryptingAudioDecoder() {
 }
 
 void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
   DVLOG(2) << "SetDecryptor()";
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kDecryptorRequested) << state_;
   DCHECK(!init_cb_.is_null());
   DCHECK(!set_decryptor_ready_cb_.is_null());
 
   set_decryptor_ready_cb_.Reset();
 
   if (!decryptor) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     // TODO(xhwang): Add kError state. See http://crbug.com/251503
     state_ = kDecodeFinished;
@@ skipping 18 matching lines @@
 
   state_ = kPendingDecoderInit;
   decryptor_->InitializeAudioDecoder(
       config,
       BindToCurrentLoop(base::Bind(
           &DecryptingAudioDecoder::FinishInitialization, weak_this_)));
 }
 
 void DecryptingAudioDecoder::FinishInitialization(bool success) {
   DVLOG(2) << "FinishInitialization()";
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDecoderInit) << state_;
   DCHECK(!init_cb_.is_null());
   DCHECK(reset_cb_.is_null());  // No Reset() before initialization finished.
   DCHECK(read_cb_.is_null());  // No Read() before initialization finished.
 
   if (!success) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     state_ = kDecodeFinished;
     return;
   }
 
   // Success!
   UpdateDecoderConfig();
 
   decryptor_->RegisterNewKeyCB(
       Decryptor::kAudio, BindToCurrentLoop(base::Bind(
           &DecryptingAudioDecoder::OnKeyAdded, weak_this_)));
 
   state_ = kIdle;
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
 void DecryptingAudioDecoder::FinishConfigChange(bool success) {
   DVLOG(2) << "FinishConfigChange()";
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingConfigChange) << state_;
   DCHECK(!read_cb_.is_null());
 
   if (!success) {
     base::ResetAndReturn(&read_cb_).Run(kDecodeError, NULL);
     state_ = kDecodeFinished;
     if (!reset_cb_.is_null())
       base::ResetAndReturn(&reset_cb_).Run();
     return;
   }
@@ skipping 16 matching lines @@
   DCHECK(!read_cb_.is_null());
 
   demuxer_stream_->Read(
       base::Bind(&DecryptingAudioDecoder::DecryptAndDecodeBuffer, weak_this_));
 }
 
 void DecryptingAudioDecoder::DecryptAndDecodeBuffer(
     DemuxerStream::Status status,
     const scoped_refptr<DecoderBuffer>& buffer) {
   DVLOG(3) << "DecryptAndDecodeBuffer()";
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDemuxerRead) << state_;
   DCHECK(!read_cb_.is_null());
   DCHECK_EQ(buffer.get() != NULL, status == DemuxerStream::kOk) << status;
 
   if (status == DemuxerStream::kConfigChanged) {
     DVLOG(2) << "DecryptAndDecodeBuffer() - kConfigChanged";
 
   const AudioDecoderConfig& input_config =
       demuxer_stream_->audio_decoder_config();
   AudioDecoderConfig config;
@@ skipping 37 matching lines @@
       !buffer->end_of_stream()) {
     timestamp_helper_->SetBaseTimestamp(buffer->timestamp());
   }
 
   pending_buffer_to_decode_ = buffer;
   state_ = kPendingDecode;
   DecodePendingBuffer();
 }
 
 void DecryptingAudioDecoder::DecodePendingBuffer() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDecode) << state_;
 
   int buffer_size = 0;
   if (!pending_buffer_to_decode_->end_of_stream()) {
     buffer_size = pending_buffer_to_decode_->data_size();
   }
 
   decryptor_->DecryptAndDecodeAudio(
       pending_buffer_to_decode_,
       BindToCurrentLoop(base::Bind(
           &DecryptingAudioDecoder::DeliverFrame, weak_this_, buffer_size)));
 }
 
 void DecryptingAudioDecoder::DeliverFrame(
     int buffer_size,
     Decryptor::Status status,
     const Decryptor::AudioBuffers& frames) {
   DVLOG(3) << "DeliverFrame() - status: " << status;
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDecode) << state_;
   DCHECK(!read_cb_.is_null());
   DCHECK(pending_buffer_to_decode_.get());
   DCHECK(queued_audio_frames_.empty());
 
   bool need_to_try_again_if_nokey_is_returned = key_added_while_decode_pending_;
   key_added_while_decode_pending_ = false;
 
   scoped_refptr<DecoderBuffer> scoped_pending_buffer_to_decode =
       pending_buffer_to_decode_;
@@ skipping 53 matching lines @@
   DCHECK_EQ(status, Decryptor::kSuccess);
   DCHECK(!frames.empty());
   EnqueueFrames(frames);
 
   state_ = kIdle;
   base::ResetAndReturn(&read_cb_).Run(kOk, queued_audio_frames_.front());
   queued_audio_frames_.pop_front();
 }
 
 void DecryptingAudioDecoder::OnKeyAdded() {
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (state_ == kPendingDecode) {
     key_added_while_decode_pending_ = true;
     return;
   }
 
   if (state_ == kWaitingForKey) {
     state_ = kPendingDecode;
     DecodePendingBuffer();
   }
@@ skipping 36 matching lines @@
     }
 
     frame->set_timestamp(current_time);
     frame->set_duration(
         timestamp_helper_->GetFrameDuration(frame->frame_count()));
     timestamp_helper_->AddFrames(frame->frame_count());
   }
 }
 
 }  // namespace media