Remove the IPC to request DemuxerConfigs when config changes

media/base/android/media_decoder_job.cc

Index: media/base/android/media_decoder_job.cc
diff --git a/media/base/android/media_decoder_job.cc b/media/base/android/media_decoder_job.cc
index c57da3af1729fe0df9ba72e8613742dd38d97f68..96fee810088afee45dbc15964ebe9c5d7429847e 100644
--- a/media/base/android/media_decoder_job.cc
+++ b/media/base/android/media_decoder_job.cc
@@ -102,7 +102,7 @@ void MediaDecoderJob::Prefetch(const base::Closure& prefetch_cb) {
   RequestData(prefetch_cb);
 }
 
-bool MediaDecoderJob::Decode(
+DemuxerConfigs* MediaDecoderJob::Decode(
     base::TimeTicks start_time_ticks,
     base::TimeDelta start_presentation_timestamp,
     const DecoderCallback& callback) {
@@ -117,18 +117,18 @@ bool MediaDecoderJob::Decode(
                            base::Unretained(this),
                            start_time_ticks,
                            start_presentation_timestamp));
-    return true;
+    return NULL;
   }
 
   if (DemuxerStream::kConfigChanged == CurrentAccessUnit().status) {
     // Clear received data because we need to handle a config change.
     decode_cb_.Reset();
-    ClearData();
-    return false;
+    size_t index = CurrentReceivedDataChunkIndex();
+    return &(received_data_[index].demuxer_configs[0]);

[wolenetz, 2014/05/05 22:06:55]

Before returning, please protect against [0] which could exceed the bounds of an
empty demuxer_configs vector; add something like:
CHECK_EQ(1, received_data_[index].demuxer_configs.size());

I'm also concerned about the unspoken lifetime of the returned pointer. ISTM
that returning a scoped_ptr to a copy of our MDJ-owned configs would be less
fragile and less tightly bound.

[qinmin, 2014/05/06 18:05:26]

Changed this function to return a new pointer and asked the caller to own it.

On 2014/05/05 22:06:55, wolenetz wrote:

   }
 
   DecodeCurrentAccessUnit(start_time_ticks, start_presentation_timestamp);
-  return true;
+  return NULL;
 }
 
 void MediaDecoderJob::StopDecode() {
@@ -462,11 +462,15 @@ void MediaDecoderJob::OnDecodeCompleted(
 const AccessUnit& MediaDecoderJob::CurrentAccessUnit() const {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());
   DCHECK(HasData());
-  int index = NoAccessUnitsRemainingInChunk(true) ?
-      inactive_demuxer_data_index() : current_demuxer_data_index_;
+  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_;
+}
+
 bool MediaDecoderJob::NoAccessUnitsRemainingInChunk(
     bool is_active_chunk) const {
   DCHECK(ui_task_runner_->BelongsToCurrentThread());