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

Unified Diff: media/formats/mpeg/mpeg_audio_stream_parser_base.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/mpeg/mpeg_audio_stream_parser_base.cc
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
index ea2261fad7965e572c61b9acfcf94ac28745431c..40eeb18957b607e6526e573b5775779b5c8ca265 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -7,6 +7,7 @@
#include "base/bind.h"
#include "base/callback_helpers.h"
#include "base/message_loop/message_loop.h"
+#include "media/base/encryption_scheme.h"
#include "media/base/stream_parser_buffer.h"
#include "media/base/text_track_config.h"
#include "media/base/timestamp_constants.h"
@@ -204,13 +205,9 @@ int MPEGAudioStreamParserBase::ParseFrame(const uint8_t* data,
}
if (!config_.IsValidConfig()) {
- config_.Initialize(audio_codec_,
- kSampleFormatF32,
- channel_layout,
- sample_rate,
- std::vector<uint8_t>(),
- false,
- base::TimeDelta(),
+ config_.Initialize(audio_codec_, kSampleFormatF32, channel_layout,
+ sample_rate, std::vector<uint8_t>(),
+ EncryptionScheme::unencrypted(), base::TimeDelta(),
codec_delay_);
base::TimeDelta base_timestamp;

Powered by Google App Engine
This is Rietveld 408576698