media config: expand is_encrypted to a struct.

media/formats/mp2t/es_parser_adts.cc

 // Copyright 2014 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/mp2t/es_parser_adts.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/bit_reader.h"
 #include "media/base/channel_layout.h"
+#include "media/base/encryption_scheme.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/timestamp_constants.h"
 #include "media/formats/common/offset_byte_queue.h"
 #include "media/formats/mp2t/mp2t_common.h"
 #include "media/formats/mpeg/adts_constants.h"
 
 namespace media {
 
 static int ExtractAdtsFrameSize(const uint8* adts_header) {
   return ((static_cast<int>(adts_header[5]) >> 5) |
@@ skipping 193 matching lines @@
       // allows two bits for its value.
       ((adts_profile + 1) << 11) +
       // frequency_index is [0..13], per early out above.
       (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>(extra_data_int >> 8));
   extra_data.push_back(static_cast<uint8>(extra_data_int & 0xff));
 
+  EncryptionScheme scheme(false);

[ddorwin, 2015/12/10 18:36:01]

Why do we need a local variable?

[dougsteed, 2015/12/14 21:19:02]

This is a placeholder for a change in the next CL, where the scheme variable is
computed in a more complicated way.

+
   AudioDecoderConfig audio_decoder_config(
-      kCodecAAC,
-      kSampleFormatS16,
+      kCodecAAC, kSampleFormatS16,
       kADTSChannelLayoutTable[channel_configuration],
-      extended_samples_per_second,
-      extra_data,
-      false);
+      extended_samples_per_second, extra_data, scheme);
 
   if (!audio_decoder_config.Matches(last_audio_decoder_config_)) {
     DVLOG(1) << "Sampling frequency: " << samples_per_second;
     DVLOG(1) << "Extended sampling frequency: " << extended_samples_per_second;
     DVLOG(1) << "Channel config: " << channel_configuration;
     DVLOG(1) << "Adts profile: " << adts_profile;
     // Reset the timestamp helper to use a new time scale.
     if (audio_timestamp_helper_ &&
         audio_timestamp_helper_->base_timestamp() != kNoTimestamp()) {
       base::TimeDelta base_timestamp = audio_timestamp_helper_->GetTimestamp();
       audio_timestamp_helper_.reset(
         new AudioTimestampHelper(samples_per_second));
       audio_timestamp_helper_->SetBaseTimestamp(base_timestamp);
     } else {
       audio_timestamp_helper_.reset(
           new AudioTimestampHelper(samples_per_second));
     }
     // Audio config notification.
     last_audio_decoder_config_ = audio_decoder_config;
     new_audio_config_cb_.Run(audio_decoder_config);
   }
 
   return true;
 }
 
 }  // namespace mp2t
 }  // namespace media