| 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 53e8066ed6189b9cd0e875ff6d548a5e383ca54a..f319d90b1096a6541e6b513f76caf5211dd9668a 100644
|
| --- a/media/filters/source_buffer_stream_unittest.cc
|
| +++ b/media/filters/source_buffer_stream_unittest.cc
|
| @@ -95,13 +95,9 @@ class SourceBufferStreamTest : public testing::Test {
|
|
|
| void SetAudioStream() {
|
| video_config_ = TestVideoConfig::Invalid();
|
| - audio_config_.Initialize(kCodecVorbis,
|
| - kSampleFormatPlanarF32,
|
| - CHANNEL_LAYOUT_STEREO,
|
| - 1000,
|
| - EmptyExtraData(),
|
| - false,
|
| - base::TimeDelta(),
|
| + audio_config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32,
|
| + CHANNEL_LAYOUT_STEREO, 1000, EmptyExtraData(),
|
| + EncryptionScheme::unencrypted(), base::TimeDelta(),
|
| 0);
|
| stream_.reset(new SourceBufferStream(audio_config_, media_log_, true));
|
|
|
| @@ -3653,7 +3649,8 @@ TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Overlap_3) {
|
| // Test all the valid same timestamp cases for audio.
|
| TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) {
|
| AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
|
| - 44100, EmptyExtraData(), false);
|
| + 44100, EmptyExtraData(),
|
| + EncryptionScheme::unencrypted());
|
| stream_.reset(new SourceBufferStream(config, media_log_, true));
|
| Seek(0);
|
| NewCodedFrameGroupAppend("0K 0K 30K 30 60 60");
|
| @@ -3664,7 +3661,8 @@ TEST_F(SourceBufferStreamTest, SameTimestamp_Audio_SingleAppend_Warning) {
|
| EXPECT_MEDIA_LOG(ContainsSameTimestampAt30MillisecondsLog());
|
|
|
| AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
|
| - 44100, EmptyExtraData(), false);
|
| + 44100, EmptyExtraData(),
|
| + EncryptionScheme::unencrypted());
|
| stream_.reset(new SourceBufferStream(config, media_log_, true));
|
| Seek(0);
|
|
|
| @@ -4229,7 +4227,7 @@ TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_ConfigChange) {
|
|
|
| AudioDecoderConfig new_config(kCodecVorbis, kSampleFormatPlanarF32,
|
| CHANNEL_LAYOUT_MONO, 1000, EmptyExtraData(),
|
| - false);
|
| + EncryptionScheme::unencrypted());
|
| ASSERT_NE(new_config.channel_layout(), audio_config_.channel_layout());
|
|
|
| Seek(0);
|
| @@ -4269,9 +4267,9 @@ TEST_F(SourceBufferStreamTest, Audio_SpliceFrame_NoMillisecondSplices) {
|
| "splicing new buffer at 1250us. Have 750us, but need 1000us."));
|
|
|
| video_config_ = TestVideoConfig::Invalid();
|
| - audio_config_.Initialize(kCodecVorbis, kSampleFormatPlanarF32,
|
| - CHANNEL_LAYOUT_STEREO, 4000, EmptyExtraData(), false,
|
| - base::TimeDelta(), 0);
|
| + audio_config_.Initialize(
|
| + kCodecVorbis, kSampleFormatPlanarF32, CHANNEL_LAYOUT_STEREO, 4000,
|
| + EmptyExtraData(), EncryptionScheme::unencrypted(), base::TimeDelta(), 0);
|
| stream_.reset(new SourceBufferStream(audio_config_, media_log_, true));
|
| // Equivalent to 0.5ms per frame.
|
| SetStreamInfo(2000, 2000);
|
|
|