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

Unified Diff: media/formats/mp2t/es_parser_adts.cc

Issue 1490613005: media config: expand is_encrypted to a struct. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: mojo changes; Message->base::Pickle Created 4 years, 10 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/formats/mp2t/es_parser_adts.cc
diff --git a/media/formats/mp2t/es_parser_adts.cc b/media/formats/mp2t/es_parser_adts.cc
index 5a909731101ef63fbac49828b3f1a1e2acd4e1c1..e64dd27831370d57e7192441f83ffa90e40c56c9 100644
--- a/media/formats/mp2t/es_parser_adts.cc
+++ b/media/formats/mp2t/es_parser_adts.cc
@@ -13,6 +13,7 @@
#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"
@@ -226,13 +227,12 @@ bool EsParserAdts::UpdateAudioConfiguration(const uint8_t* adts_header) {
extra_data.push_back(static_cast<uint8_t>(extra_data_int >> 8));
extra_data.push_back(static_cast<uint8_t>(extra_data_int & 0xff));
+ EncryptionScheme scheme(false);
+
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;

Powered by Google App Engine
This is Rietveld 408576698