Index: media/formats/mpeg/adts_header_parser.cc |
diff --git a/media/formats/mpeg/adts_header_parser.cc b/media/formats/mpeg/adts_header_parser.cc |
index b2162a905028561899389aadbe834d2139c97928..c63b8b941e3b03b4ab1ad612ed30390b2246e416 100644 |
--- a/media/formats/mpeg/adts_header_parser.cc |
+++ b/media/formats/mpeg/adts_header_parser.cc |
@@ -9,6 +9,7 @@ |
#include "base/logging.h" |
#include "media/base/audio_codecs.h" |
#include "media/base/audio_decoder_config.h" |
+#include "media/base/encryption_scheme.h" |
ddorwin
2016/04/12 00:40:48
Do you need this?
dougsteed
2016/05/08 23:18:45
Since I use "EncryptionScheme" explicitly in this
|
#include "media/base/media_util.h" |
#include "media/base/sample_format.h" |
#include "media/formats/mpeg/adts_constants.h" |
@@ -29,6 +30,7 @@ size_t ExtractAdtsChannelConfig(const uint8_t* adts_header) { |
bool ParseAdtsHeader(const uint8_t* adts_header, |
bool is_sbr, |
+ const EncryptionScheme& scheme, |
AudioDecoderConfig* config) { |
DCHECK(adts_header); |
@@ -76,8 +78,7 @@ bool ParseAdtsHeader(const uint8_t* adts_header, |
DCHECK(config); |
*config = AudioDecoderConfig(kCodecAAC, kSampleFormatS16, |
kADTSChannelLayoutTable[channel_configuration], |
- extended_samples_per_second, extra_data, |
- Unencrypted()); |
+ extended_samples_per_second, extra_data, scheme); |
return true; |
} |