| 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 3b5da1450c1b4e683e51213ffc4a35d51ce6702e..6a9e186306b1b0c9b6ccf6cdc8de4a3c3323aa10 100644
|
| --- a/media/base/android/media_decoder_job.h
|
| +++ b/media/base/android/media_decoder_job.h
|
| @@ -84,9 +84,8 @@ class MediaDecoderJob {
|
| // Releases all the decoder resources as the current tab is going background.
|
| virtual void ReleaseDecoderResources();
|
|
|
| - // Sets the demuxer configs. Returns true if configs has changed, or false
|
| - // otherwise.
|
| - bool SetDemuxerConfigs(const DemuxerConfigs& configs);
|
| + // Sets the demuxer configs.
|
| + virtual void SetDemuxerConfigs(const DemuxerConfigs& configs) = 0;
|
|
|
| // Returns whether the decoder has finished decoding all the data.
|
| bool OutputEOSReached() const;
|
| @@ -228,13 +227,14 @@ class MediaDecoderJob {
|
| virtual bool AreDemuxerConfigsChanged(
|
| const DemuxerConfigs& configs) const = 0;
|
|
|
| - // Updates the demuxer configs.
|
| - virtual void UpdateDemuxerConfigs(const DemuxerConfigs& configs) = 0;
|
| -
|
| // Returns true if |media_codec_bridge_| needs to be reconfigured for the
|
| // new DemuxerConfigs, or false otherwise.
|
| virtual bool IsCodecReconfigureNeeded(const DemuxerConfigs& configs) const;
|
|
|
| + // Update the output format from the decoder, returns true if the output
|
| + // format changes, or false otherwise.
|
| + virtual bool UpdateOutputFormat() { return false; };
|
| +
|
| // Return the index to |received_data_| that is not currently being decoded.
|
| size_t inactive_demuxer_data_index() const {
|
| return 1 - current_demuxer_data_index_;
|
|
|