Index: media/base/audio_decoder_config.cc |
diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc |
index 1f259f35a2ab90fdf5fccd2896d68705b15896cd..bd0e6a7e75f84ea5ee4bf76c33e6a01e95597a69 100644 |
--- a/media/base/audio_decoder_config.cc |
+++ b/media/base/audio_decoder_config.cc |
@@ -16,7 +16,8 @@ AudioDecoderConfig::AudioDecoderConfig() |
bits_per_channel_(0), |
channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED), |
samples_per_second_(0), |
- extra_data_size_(0) { |
+ extra_data_size_(0), |
+ is_encrypted_(false) { |
} |
AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec, |
@@ -24,9 +25,10 @@ AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec, |
ChannelLayout channel_layout, |
int samples_per_second, |
const uint8* extra_data, |
- size_t extra_data_size) { |
+ size_t extra_data_size, |
+ bool is_encrypted) { |
Initialize(codec, bits_per_channel, channel_layout, samples_per_second, |
- extra_data, extra_data_size, true); |
+ extra_data, extra_data_size, is_encrypted, true); |
} |
void AudioDecoderConfig::Initialize(AudioCodec codec, |
@@ -35,6 +37,7 @@ void AudioDecoderConfig::Initialize(AudioCodec codec, |
int samples_per_second, |
const uint8* extra_data, |
size_t extra_data_size, |
+ bool is_encrypted, |
bool record_stats) { |
CHECK((extra_data_size != 0) == (extra_data != NULL)); |
@@ -68,6 +71,8 @@ void AudioDecoderConfig::Initialize(AudioCodec codec, |
} else { |
extra_data_.reset(); |
} |
+ |
+ is_encrypted_ = is_encrypted; |
} |
AudioDecoderConfig::~AudioDecoderConfig() {} |
@@ -88,7 +93,8 @@ bool AudioDecoderConfig::Matches(const AudioDecoderConfig& config) const { |
(samples_per_second() == config.samples_per_second()) && |
(extra_data_size() == config.extra_data_size()) && |
(!extra_data() || !memcmp(extra_data(), config.extra_data(), |
- extra_data_size()))); |
+ extra_data_size())) && |
+ (is_encrypted() == config.is_encrypted())); |
} |
void AudioDecoderConfig::CopyFrom(const AudioDecoderConfig& audio_config) { |
@@ -98,6 +104,7 @@ void AudioDecoderConfig::CopyFrom(const AudioDecoderConfig& audio_config) { |
audio_config.samples_per_second(), |
audio_config.extra_data(), |
audio_config.extra_data_size(), |
+ audio_config.is_encrypted(), |
false); |
} |
@@ -125,4 +132,8 @@ size_t AudioDecoderConfig::extra_data_size() const { |
return extra_data_size_; |
} |
+bool AudioDecoderConfig::is_encrypted() const { |
+ return is_encrypted_; |
+} |
+ |
} // namespace media |