Index: media/formats/mp4/mp4_stream_parser.cc |
diff --git a/media/formats/mp4/mp4_stream_parser.cc b/media/formats/mp4/mp4_stream_parser.cc |
index af64343b6237d21e5b7654febc418b36cadaa2f2..9e113e69b70b489cbadeec00d861d6b02aa1faaa 100644 |
--- a/media/formats/mp4/mp4_stream_parser.cc |
+++ b/media/formats/mp4/mp4_stream_parser.cc |
@@ -11,6 +11,7 @@ |
#include "base/logging.h" |
#include "base/time/time.h" |
#include "media/base/audio_decoder_config.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" |
@@ -269,9 +270,9 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { |
is_audio_track_encrypted_ = entry.sinf.info.track_encryption.is_encrypted; |
DVLOG(1) << "is_audio_track_encrypted_: " << is_audio_track_encrypted_; |
- audio_config.Initialize(codec, sample_format, channel_layout, |
- sample_per_second, extra_data, |
- is_audio_track_encrypted_, base::TimeDelta(), 0); |
+ audio_config.Initialize( |
+ codec, sample_format, channel_layout, sample_per_second, extra_data, |
+ EncryptionScheme(is_audio_track_encrypted_), base::TimeDelta(), 0); |
has_audio_ = true; |
audio_track_id_ = track->header.track_id; |
} |
@@ -312,7 +313,7 @@ bool MP4StreamParser::ParseMoov(BoxReader* reader) { |
COLOR_SPACE_HD_REC709, coded_size, visible_rect, natural_size, |
// No decoder-specific buffer needed for AVC; |
// SPS/PPS are embedded in the video stream |
- std::vector<uint8_t>(), is_video_track_encrypted_); |
+ std::vector<uint8_t>(), EncryptionScheme(is_video_track_encrypted_)); |
has_video_ = true; |
video_track_id_ = track->header.track_id; |
} |