Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1277)

Unified Diff: media/filters/decrypting_video_decoder.cc

Issue 65803002: Replace MessageLoopProxy with SingleThreadTaskRunner for media/filters/ + associated code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decrypting_video_decoder.h ('k') | media/filters/fake_demuxer_stream.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index b3ea2144558101fc764791c9e12bc6b0ccdf416a..589b0a5e57fac72b25ed3c5c6711cac9eb3c7f76 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -9,7 +9,7 @@
#include "base/debug/trace_event.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/bind_to_loop.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decryptor.h"
@@ -20,9 +20,9 @@
namespace media {
DecryptingVideoDecoder::DecryptingVideoDecoder(
- 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),
set_decryptor_ready_cb_(set_decryptor_ready_cb),
@@ -34,7 +34,7 @@ DecryptingVideoDecoder::DecryptingVideoDecoder(
void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,
const PipelineStatusCB& status_cb) {
DVLOG(2) << "Initialize()";
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(state_ == kUninitialized ||
state_ == kIdle ||
state_ == kDecodeFinished) << state_;
@@ -64,7 +64,7 @@ void DecryptingVideoDecoder::Initialize(const VideoDecoderConfig& config,
void DecryptingVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
const DecodeCB& decode_cb) {
DVLOG(3) << "Decode()";
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(state_ == kIdle ||
state_ == kDecodeFinished ||
state_ == kError) << state_;
@@ -91,7 +91,7 @@ void DecryptingVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer,
void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
DVLOG(2) << "Reset() - state: " << state_;
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK(state_ == kIdle ||
state_ == kPendingDecode ||
state_ == kWaitingForKey ||
@@ -124,7 +124,7 @@ void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
}
void DecryptingVideoDecoder::Stop(const base::Closure& closure) {
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
DVLOG(2) << "Stop() - state: " << state_;
// At this point the render thread is likely paused (in WebMediaPlayerImpl's
@@ -155,7 +155,7 @@ DecryptingVideoDecoder::~DecryptingVideoDecoder() {
void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) {
DVLOG(2) << "SetDecryptor()";
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
if (state_ == kStopped)
return;
@@ -182,7 +182,7 @@ void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) {
void DecryptingVideoDecoder::FinishInitialization(bool success) {
DVLOG(2) << "FinishInitialization()";
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
if (state_ == kStopped)
return;
@@ -208,7 +208,7 @@ void DecryptingVideoDecoder::FinishInitialization(bool success) {
void DecryptingVideoDecoder::DecodePendingBuffer() {
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK_EQ(state_, kPendingDecode) << state_;
TRACE_EVENT_ASYNC_BEGIN0(
"media", "DecryptingVideoDecoder::DecodePendingBuffer", ++trace_id_);
@@ -228,7 +228,7 @@ void DecryptingVideoDecoder::DeliverFrame(
Decryptor::Status status,
const scoped_refptr<VideoFrame>& frame) {
DVLOG(3) << "DeliverFrame() - status: " << status;
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
TRACE_EVENT_ASYNC_END0(
"media", "DecryptingVideoDecoder::DecodePendingBuffer", trace_id_);
@@ -300,7 +300,7 @@ void DecryptingVideoDecoder::DeliverFrame(
void DecryptingVideoDecoder::OnKeyAdded() {
DVLOG(2) << "OnKeyAdded()";
- DCHECK(message_loop_->BelongsToCurrentThread());
+ DCHECK(task_runner_->BelongsToCurrentThread());
if (state_ == kPendingDecode) {
key_added_while_decode_pending_ = true;
« no previous file with comments | « media/filters/decrypting_video_decoder.h ('k') | media/filters/fake_demuxer_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698