Index: media/filters/source_buffer_stream_unittest.cc |
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc |
index a9558a2f00c815b492a8b3d82bee136471a6fd46..53e8066ed6189b9cd0e875ff6d548a5e383ca54a 100644 |
--- a/media/filters/source_buffer_stream_unittest.cc |
+++ b/media/filters/source_buffer_stream_unittest.cc |
@@ -95,9 +95,14 @@ |
void SetAudioStream() { |
video_config_ = TestVideoConfig::Invalid(); |
- audio_config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32, |
- CHANNEL_LAYOUT_STEREO, 1000, EmptyExtraData(), |
- Unencrypted(), base::TimeDelta(), 0); |
+ audio_config_.Initialize(kCodecVorbis, |
+ kSampleFormatPlanarF32, |
+ CHANNEL_LAYOUT_STEREO, |
+ 1000, |
+ EmptyExtraData(), |
+ false, |
+ base::TimeDelta(), |
+ 0); |
stream_.reset(new SourceBufferStream(audio_config_, media_log_, true)); |
// Equivalent to 2ms per frame. |
@@ -3648,7 +3653,7 @@ |
// Test all the valid same timestamp cases for audio. |
TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) { |
AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO, |
- 44100, EmptyExtraData(), Unencrypted()); |
+ 44100, EmptyExtraData(), false); |
stream_.reset(new SourceBufferStream(config, media_log_, true)); |
Seek(0); |
NewCodedFrameGroupAppend("0K 0K 30K 30 60 60"); |
@@ -3659,7 +3664,7 @@ |
EXPECT_MEDIA_LOG(ContainsSameTimestampAt30MillisecondsLog()); |
AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO, |
- 44100, EmptyExtraData(), Unencrypted()); |
+ 44100, EmptyExtraData(), false); |
stream_.reset(new SourceBufferStream(config, media_log_, true)); |
Seek(0); |
@@ -4224,7 +4229,7 @@ |
AudioDecoderConfig new_config(kCodecVorbis, kSampleFormatPlanarF32, |
CHANNEL_LAYOUT_MONO, 1000, EmptyExtraData(), |
- Unencrypted()); |
+ false); |
ASSERT_NE(new_config.channel_layout(), audio_config_.channel_layout()); |
Seek(0); |
@@ -4265,8 +4270,8 @@ |
video_config_ = TestVideoConfig::Invalid(); |
audio_config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32, |
- CHANNEL_LAYOUT_STEREO, 4000, EmptyExtraData(), |
- Unencrypted(), base::TimeDelta(), 0); |
+ CHANNEL_LAYOUT_STEREO, 4000, EmptyExtraData(), false, |
+ base::TimeDelta(), 0); |
stream_.reset(new SourceBufferStream(audio_config_, media_log_, true)); |
// Equivalent to 0.5ms per frame. |
SetStreamInfo(2000, 2000); |