Remove the IPC to request DemuxerConfigs when config changes

media/base/android/media_decoder_job.h

 // 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.
 
 #ifndef MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_
 #define MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_
 
 #include "base/callback.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
@@ skipping 36 matching lines @@
   // Called by MediaSourcePlayer when more data for this object has arrived.
   void OnDataReceived(const DemuxerData& data);
 
   // Prefetch so we know the decoder job has data when we call Decode().
   // |prefetch_cb| - Run when prefetching has completed.
   void Prefetch(const base::Closure& prefetch_cb);
 
   // Called by MediaSourcePlayer to decode some data.
   // |callback| - Run when decode operation has completed.
   //
-  // Returns true if the next decode was started and |callback| will be
-  // called when the decode operation is complete.
+  // Returns the pointer to a DemuxerConfig if a config change is detected, or
+  // Null otherwise. If the return value is NULL, decode was started and

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

nit: s/Null/NULL

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

Done.

+  // |callback| will be called when the decode operation is complete.
   // Returns false if a config change is needed. |callback| is ignored

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

nit: s/Returns false if a config change is needed./If a config change is
detected,/

Also, maybe add something to the effect of "In the case of requiring further
data before commencing decode, NULL will also be returned although the config
change has not yet been detected." ?

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

Done.

   // and will not be called.
-  bool Decode(base::TimeTicks start_time_ticks,
-              base::TimeDelta start_presentation_timestamp,
-              const DecoderCallback& callback);
+  DemuxerConfigs* Decode(base::TimeTicks start_time_ticks,
+                         base::TimeDelta start_presentation_timestamp,
+                         const DecoderCallback& callback);
 
   // Called to stop the last Decode() early.
   // If the decoder is in the process of decoding the next frame, then
   // this method will just allow the decode to complete as normal. If
   // this object is waiting for a data request to complete, then this method
   // will wait for the data to arrive and then call the |callback|
   // passed to Decode() with a status of MEDIA_CODEC_STOPPED. This ensures that
   // the |callback| passed to Decode() is always called and the status
   // reflects whether data was actually decoded or the decode terminated early.
   void StopDecode();
@@ skipping 66 matching lines @@
   // Called on the UI thread to indicate that one decode cycle has completed.
   // Completes any pending job destruction or any pending decode stop. If
   // destruction was not pending, passes its arguments to |decode_cb_|.
   void OnDecodeCompleted(MediaCodecStatus status,
                          base::TimeDelta current_presentation_timestamp,
                          base::TimeDelta max_presentation_timestamp);
 
   // Helper function to get the current access unit that is being decoded.
   const AccessUnit& CurrentAccessUnit() const;
 
+  // Helper function to get the current data chunk index that is being decoded.
+  size_t CurrentReceivedDataChunkIndex() const;
+
   // Check whether a chunk has no remaining access units to decode. If
   // |is_active_chunk| is true, this function returns whether decoder has
   // consumed all data in |received_data_[current_demuxer_data_index_]|.
   // Otherwise, it returns whether decoder has consumed all data in the inactive
   // chunk.
   bool NoAccessUnitsRemainingInChunk(bool is_active_chunk) const;
 
   // Clearn all the received data.
   void ClearData();
 
@@ skipping 91 matching lines @@
   // the decoder thread.
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaDecoderJob> weak_factory_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(MediaDecoderJob);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_DECODER_JOB_H_