Remove locking from FFmpegDemuxerStream and associated TODOs from media code.

media/filters/ffmpeg_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/ffmpeg_audio_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
@@ skipping 171 matching lines @@
   }
 
   base::ResetAndReturn(&read_cb_).Run(
       queued_audio_.front().status, queued_audio_.front().buffer);
   queued_audio_.pop_front();
 }
 
 void FFmpegAudioDecoder::DoDecodeBuffer(
     DemuxerStream::Status status,
     const scoped_refptr<DecoderBuffer>& input) {
-  DCHECK(message_loop_->BelongsToCurrentThread());
+  if (!message_loop_->BelongsToCurrentThread()) {
+    message_loop_->PostTask(FROM_HERE, base::Bind(
+        &FFmpegAudioDecoder::DoDecodeBuffer, this, status, input));
+    return;
+  }
+
   DCHECK(!read_cb_.is_null());
   DCHECK(queued_audio_.empty());
 
   if (status != DemuxerStream::kOk) {
     DCHECK(!input);
     // TODO(acolwell): Add support for reinitializing the decoder when
     // |status| == kConfigChanged. For now we just trigger a decode error.
     AudioDecoder::Status decoder_status =
         (status == DemuxerStream::kAborted) ? kAborted : kDecodeError;
     base::ResetAndReturn(&read_cb_).Run(decoder_status, NULL);
@@ skipping 155 matching lines @@
 
   // Execute callback to return the first frame we decoded.
   base::ResetAndReturn(&read_cb_).Run(
       queued_audio_.front().status, queued_audio_.front().buffer);
   queued_audio_.pop_front();
 }
 
 void FFmpegAudioDecoder::ReadFromDemuxerStream() {
   DCHECK(!read_cb_.is_null());
 
-  demuxer_stream_->Read(base::Bind(&FFmpegAudioDecoder::DecodeBuffer, this));
-}
-
-void FFmpegAudioDecoder::DecodeBuffer(
-    DemuxerStream::Status status,
-    const scoped_refptr<DecoderBuffer>& buffer) {
-  DCHECK_EQ(status != DemuxerStream::kOk, !buffer) << status;

[xhwang, 2012/11/20 17:54:34]

Do you want to keep this check?

[scherkus (not reviewing), 2012/11/20 19:16:07]

Done.

-
-  // TODO(scherkus): fix FFmpegDemuxerStream::Read() to not execute our read
-  // callback on the same execution stack so we can get rid of forced task post.
-  message_loop_->PostTask(FROM_HERE, base::Bind(
-      &FFmpegAudioDecoder::DoDecodeBuffer, this, status, buffer));
+  demuxer_stream_->Read(base::Bind(&FFmpegAudioDecoder::DoDecodeBuffer, this));
 }
 
 base::TimeDelta FFmpegAudioDecoder::GetNextOutputTimestamp() const {
   DCHECK(output_timestamp_base_ != kNoTimestamp());
   double decoded_us = (total_frames_decoded_ / samples_per_second_) *
       base::Time::kMicrosecondsPerSecond;
   return output_timestamp_base_ + base::TimeDelta::FromMicroseconds(decoded_us);
 }
+
 }  // namespace media