Support HLS MPEG2 TS with SAMPLE-AES encryption.

media/formats/mpeg/adts_header_parser.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/formats/mpeg/adts_header_parser.h"
 
 #include <algorithm>
 #include <vector>
 #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 file, I think it is better to
include it.

 #include "media/base/media_util.h"
 #include "media/base/sample_format.h"
 #include "media/formats/mpeg/adts_constants.h"
 
 namespace media {
 
 namespace {
 
 size_t ExtractAdtsFrequencyIndex(const uint8_t* adts_header) {
   return ((adts_header[2] >> 2) & 0xf);
 }
 
 size_t ExtractAdtsChannelConfig(const uint8_t* adts_header) {
   return (((adts_header[3] >> 6) & 0x3) | ((adts_header[2] & 0x1) << 2));
 }
 
 }  // namespace (anonymous)
 
 bool ParseAdtsHeader(const uint8_t* adts_header,
                      bool is_sbr,
+                     const EncryptionScheme& scheme,
                      AudioDecoderConfig* config) {
   DCHECK(adts_header);
 
   size_t frequency_index = ExtractAdtsFrequencyIndex(adts_header);
   if (frequency_index >= kADTSFrequencyTableSize) {
     // Frequency index 13 & 14 are reserved
     // while 15 means that the frequency is explicitly written
     // (not supported).
     return false;
   }
@@ skipping 27 matching lines @@
       (frequency_index << 7) +
       // channel_configuration is [0..7], per early out above.
       (channel_configuration << 3));
   std::vector<uint8_t> extra_data;
   extra_data.push_back(static_cast<uint8_t>(extra_data_int >> 8));
   extra_data.push_back(static_cast<uint8_t>(extra_data_int & 0xff));
 
   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;
 }
 
 }  // namespace media