Index: media/base/android/audio_decoder_job.h |
diff --git a/media/base/android/audio_decoder_job.h b/media/base/android/audio_decoder_job.h |
index 9bc293dd2f8f614eee99d1032482b490dffa9144..87a3087f4d6554532164d731bfd8e2f3a6ab4721 100644 |
--- a/media/base/android/audio_decoder_job.h |
+++ b/media/base/android/audio_decoder_job.h |
@@ -49,18 +49,25 @@ class AudioDecoderJob : public MediaDecoderJob { |
virtual bool AreDemuxerConfigsChanged( |
const DemuxerConfigs& configs) const override; |
virtual bool CreateMediaCodecBridgeInternal() override; |
+ virtual bool UpdateOutputFormat( |
+ const base::Closure& config_changed_cb) override; |
// Helper method to set the audio output volume. |
void SetVolumeInternal(); |
+ void ResetTimestampHelper(); |
+ |
// Audio configs from the demuxer. |
AudioCodec audio_codec_; |
int num_channels_; |
- int sampling_rate_; |
+ int config_sampling_rate_; |
std::vector<uint8> audio_extra_data_; |
double volume_; |
int bytes_per_frame_; |
+ // Audio output format |
qinmin
2015/01/21 02:04:13
s/output format/output sample rate/
kjoswiak
2015/01/21 03:21:18
Done.
|
+ int output_sampling_rate_; |
+ |
// Base timestamp for the |audio_timestamp_helper_|. |
base::TimeDelta base_timestamp_; |