| Index: media/base/android/media_decoder_job.h
|
| diff --git a/media/base/android/media_decoder_job.h b/media/base/android/media_decoder_job.h
|
| index 9dbbd00fceaba8c1a222fabfd6e95c0fce8749b1..7f7177564f737536c231863f127ccf48f3cd3082 100644
|
| --- a/media/base/android/media_decoder_job.h
|
| +++ b/media/base/android/media_decoder_job.h
|
| @@ -54,13 +54,16 @@ class MediaDecoderJob {
|
| // 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 false if a config change is needed. |callback| is ignored
|
| - // and will not be called.
|
| - bool Decode(base::TimeTicks start_time_ticks,
|
| - base::TimeDelta start_presentation_timestamp,
|
| - const DecoderCallback& callback);
|
| + // Returns the pointer to a DemuxerConfig if a config change is detected, or
|
| + // NULL otherwise. Caller needs to take the ownership of the returned pointer.
|
| + // In the case of requiring further data before commencing
|
| + // decode, NULL will also be returned although config change may be the next
|
| + // received access unit. |callback| will be called when the decode operation
|
| + // is complete. If a config change is detected, |callback| is ignored and
|
| + // will not be called.
|
| + 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
|
| @@ -147,6 +150,9 @@ class MediaDecoderJob {
|
| // 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_]|.
|
|
|