Remove the IPC to request DemuxerConfigs when config changes

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 84 matching lines @@
   if (HasData()) {
     DVLOG(1) << __FUNCTION__ << " : using previously received data";
     ui_task_runner_->PostTask(FROM_HERE, prefetch_cb);
     return;
   }
 
   DVLOG(1) << __FUNCTION__ << " : requesting data";
   RequestData(prefetch_cb);
 }
 
-bool MediaDecoderJob::Decode(
+scoped_ptr<DemuxerConfigs> MediaDecoderJob::Decode(
     base::TimeTicks start_time_ticks,
     base::TimeDelta start_presentation_timestamp,
     const DecoderCallback& callback) {
   DCHECK(decode_cb_.is_null());
   DCHECK(on_data_received_cb_.is_null());
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
 
   decode_cb_ = callback;
 
   if (!HasData()) {
     RequestData(base::Bind(&MediaDecoderJob::DecodeCurrentAccessUnit,
                            base::Unretained(this),
                            start_time_ticks,
                            start_presentation_timestamp));
-    return true;
+    return scoped_ptr<DemuxerConfigs>();
   }
 
   if (DemuxerStream::kConfigChanged == CurrentAccessUnit().status) {
     // Clear received data because we need to handle a config change.

[wolenetz, 2014/05/08 17:41:47]

nit: we no longer clear the data. Sorry I didn't catch this nit earlier...

[qinmin, 2014/05/08 17:48:37]

Done.

     decode_cb_.Reset();
-    ClearData();
-    return false;
+    size_t index = CurrentReceivedDataChunkIndex();
+    if (received_data_[index].demuxer_configs.size() > 0) {
+      return scoped_ptr<DemuxerConfigs>(new DemuxerConfigs(
+          received_data_[index].demuxer_configs[0]));
+    } else {
+      ui_task_runner_->PostTask(FROM_HERE,
+                                base::Bind(&MediaDecoderJob::OnDecodeCompleted,
+                                           base::Unretained(this),
+                                           MEDIA_CODEC_OK,

[wolenetz, 2014/05/08 17:41:47]

nit: I think this is ok, but we would miss learning about broken demuxer that is
incorrectly signalling config change without providing config. Would
MEDIA_CODEC_ERROR be better? I liked the previous CHECK because it would
explicitly crash on this incorrect demuxer behavior. wdyt?

[qinmin, 2014/05/08 17:48:37]

The crash will crash the browser process, probably a MEDIA_CODEC_ERROR will be
better.

On 2014/05/08 17:41:47, wolenetz wrote:

[wolenetz, 2014/05/08 20:05:25]

nit: Can we do a CHECK, then, in media_source_delegate, to get crash for this
situation emitted there? This crash should not occur, so if it does, it may be
low-frequency and MEDIA_CODEC_ERROR to a few users might not get attention
directed to getting a fix. wdyt?

[qinmin, 2014/05/08 20:50:07]

Sounds ok to me. modified the media_source_delegate.cc to expect
GetDemuxerConfigFromStream() always return true in when config changes.

On 2014/05/08 20:05:25, wolenetz wrote:

+                                           kNoTimestamp(), kNoTimestamp()));
+      return scoped_ptr<DemuxerConfigs>();
+    }
   }
 
   DecodeCurrentAccessUnit(start_time_ticks, start_presentation_timestamp);
-  return true;
+  return scoped_ptr<DemuxerConfigs>();
 }
 
 void MediaDecoderJob::StopDecode() {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   DCHECK(is_decoding());
   stop_decode_pending_ = true;
 }
 
 void MediaDecoderJob::Flush() {
   DCHECK(decode_cb_.is_null());
@@ skipping 313 matching lines @@
   };
 
   stop_decode_pending_ = false;
   base::ResetAndReturn(&decode_cb_).Run(
       status, current_presentation_timestamp, max_presentation_timestamp);
 }
 
 const AccessUnit& MediaDecoderJob::CurrentAccessUnit() const {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   DCHECK(HasData());
-  int index = NoAccessUnitsRemainingInChunk(true) ?
+  size_t index = CurrentReceivedDataChunkIndex();
+  return received_data_[index].access_units[access_unit_index_[index]];
+}
+
+size_t MediaDecoderJob::CurrentReceivedDataChunkIndex() const {
+  return NoAccessUnitsRemainingInChunk(true) ?
       inactive_demuxer_data_index() : current_demuxer_data_index_;
-  return received_data_[index].access_units[access_unit_index_[index]];
 }
 
 bool MediaDecoderJob::NoAccessUnitsRemainingInChunk(
     bool is_active_chunk) const {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   size_t index = is_active_chunk ? current_demuxer_data_index_ :
       inactive_demuxer_data_index();
   return received_data_[index].access_units.size() <= access_unit_index_[index];
 }
 
@@ skipping 25 matching lines @@
 }
 
 void MediaDecoderJob::InitializeReceivedData() {
   for (size_t i = 0; i < 2; ++i) {
     received_data_[i] = DemuxerData();
     access_unit_index_[i] = 0;
   }
 }
 
 }  // namespace media