Chromium Code Reviews| 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..291d33c32ee815321d57aa9e2b64da676b2024cf 100644 |
| --- a/media/base/android/media_decoder_job.h |
| +++ b/media/base/android/media_decoder_job.h |
| @@ -54,13 +54,14 @@ 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 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.
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 |
| @@ -147,6 +148,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_]|. |