Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(237)

Unified Diff: media/base/audio_decoder_config.cc

Issue 23014009: media: Opus support for WebM in Media Source (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/base/audio_decoder_config.cc
diff --git a/media/base/audio_decoder_config.cc b/media/base/audio_decoder_config.cc
index 38db05d3a54e1a7106da2d49a74b7085bdd5a05e..877c1c863f6c215d4c2789b0f7dbfc70c19d0888 100644
--- a/media/base/audio_decoder_config.cc
+++ b/media/base/audio_decoder_config.cc
@@ -19,7 +19,9 @@ AudioDecoderConfig::AudioDecoderConfig()
channel_layout_(CHANNEL_LAYOUT_UNSUPPORTED),
samples_per_second_(0),
bytes_per_frame_(0),
- is_encrypted_(false) {
+ is_encrypted_(false),
+ seek_pre_roll_(0),
+ codec_delay_(0) {
}
AudioDecoderConfig::AudioDecoderConfig(AudioCodec codec,
@@ -92,7 +94,9 @@ bool AudioDecoderConfig::Matches(const AudioDecoderConfig& config) const {
(!extra_data() || !memcmp(extra_data(), config.extra_data(),
extra_data_size())) &&
(is_encrypted() == config.is_encrypted()) &&
- (sample_format() == config.sample_format()));
+ (sample_format() == config.sample_format()) &&
+ (seek_pre_roll() == config.seek_pre_roll()) &&
+ (codec_delay() == config.codec_delay()));
}
} // namespace media

Powered by Google App Engine
This is Rietveld 408576698