Fix the flaky MediaSourcePlayerTest

media/base/android/media_decoder_job.cc

 // Copyright 2013 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/base/android/media_decoder_job.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/debug/trace_event.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 54 matching lines @@
       is_requesting_demuxer_data_ = false;
     return;
   }
 
   size_t next_demuxer_data_index = inactive_demuxer_data_index();
   received_data_[next_demuxer_data_index] = data;
   access_unit_index_[next_demuxer_data_index] = 0;
   is_requesting_demuxer_data_ = false;
 
   base::Closure done_cb = base::ResetAndReturn(&on_data_received_cb_);
+
+  // If this data request is for the inactive chunk, do nothing.

[wolenetz, 2014/04/10 00:15:35]

I'm confused. If it's a request for the inactive chunk, on_data_received_cb_
should be just a base::Closure. However, if this data ack was received after
StopDecode() or ClearData(), then done_cb would be null here. Is it just the new
comment that is incorrect here?

[qinmin, 2014/04/10 00:19:37]

So if done_cb.is_null() is true, this is the data request for the inactive
chunk. And in this case, we should do nothing, just early return.

On 2014/04/10 00:15:35, wolenetz wrote:

+  if (done_cb.is_null())
+    return;
+
   if (stop_decode_pending_) {
+    DCHECK(is_decoding());
     OnDecodeCompleted(MEDIA_CODEC_STOPPED, kNoTimestamp(), 0);
     return;
   }
 
-  if (!done_cb.is_null())
-    done_cb.Run();
+  done_cb.Run();
 }
 
 void MediaDecoderJob::Prefetch(const base::Closure& prefetch_cb) {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   DCHECK(on_data_received_cb_.is_null());
   DCHECK(decode_cb_.is_null());
 
   if (HasData()) {
     DVLOG(1) << __FUNCTION__ << " : using previously received data";
     ui_task_runner_->PostTask(FROM_HERE, prefetch_cb);
@@ skipping 403 matching lines @@
 }
 
 void MediaDecoderJob::InitializeReceivedData() {
   for (size_t i = 0; i < 2; ++i) {
     received_data_[i] = DemuxerData();
     access_unit_index_[i] = 0;
   }
 }
 
 }  // namespace media