| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <algorithm> | 5 #include <algorithm> |
| 6 #include <deque> | 6 #include <deque> |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 287 // Audio stream should be Vorbis. | 287 // Audio stream should be Vorbis. |
| 288 stream = demuxer_->GetStream(DemuxerStream::AUDIO); | 288 stream = demuxer_->GetStream(DemuxerStream::AUDIO); |
| 289 ASSERT_TRUE(stream); | 289 ASSERT_TRUE(stream); |
| 290 EXPECT_EQ(DemuxerStream::AUDIO, stream->type()); | 290 EXPECT_EQ(DemuxerStream::AUDIO, stream->type()); |
| 291 EXPECT_EQ(kCodecVorbis, stream->audio_decoder_config().codec()); | 291 EXPECT_EQ(kCodecVorbis, stream->audio_decoder_config().codec()); |
| 292 | 292 |
| 293 // Unknown stream should never be present. | 293 // Unknown stream should never be present. |
| 294 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::UNKNOWN)); | 294 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::UNKNOWN)); |
| 295 } | 295 } |
| 296 | 296 |
| 297 // TODO(fgalligan): Enable test when code to parse encrypted WebM files lands | 297 TEST_F(FFmpegDemuxerTest, Initialize_Encrypted) { |
| 298 // in Chromium's FFmpeg. crbug.com/189221 | |
| 299 TEST_F(FFmpegDemuxerTest, DISABLED_Initialize_Encrypted) { | |
| 300 EXPECT_CALL(*this, NeedKeyCBMock(kWebMEncryptInitDataType, NotNull(), | 298 EXPECT_CALL(*this, NeedKeyCBMock(kWebMEncryptInitDataType, NotNull(), |
| 301 DecryptConfig::kDecryptionKeySize)) | 299 DecryptConfig::kDecryptionKeySize)) |
| 302 .Times(Exactly(2)); | 300 .Times(Exactly(2)); |
| 303 | 301 |
| 304 CreateDemuxer("bear-320x240-av_enc-av.webm"); | 302 CreateDemuxer("bear-320x240-av_enc-av.webm"); |
| 305 InitializeDemuxer(); | 303 InitializeDemuxer(); |
| 306 } | 304 } |
| 307 | 305 |
| 308 TEST_F(FFmpegDemuxerTest, Read_Audio) { | 306 TEST_F(FFmpegDemuxerTest, Read_Audio) { |
| 309 // We test that on a successful audio packet read. | 307 // We test that on a successful audio packet read. |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 TEST_F(FFmpegDemuxerTest, MP4_ZeroStszEntry) { | 567 TEST_F(FFmpegDemuxerTest, MP4_ZeroStszEntry) { |
| 570 #if !defined(USE_PROPRIETARY_CODECS) | 568 #if !defined(USE_PROPRIETARY_CODECS) |
| 571 return; | 569 return; |
| 572 #endif | 570 #endif |
| 573 CreateDemuxer("bear-1280x720-zero-stsz-entry.mp4"); | 571 CreateDemuxer("bear-1280x720-zero-stsz-entry.mp4"); |
| 574 InitializeDemuxer(); | 572 InitializeDemuxer(); |
| 575 ReadUntilEndOfStream(); | 573 ReadUntilEndOfStream(); |
| 576 } | 574 } |
| 577 | 575 |
| 578 } // namespace media | 576 } // namespace media |
| OLD | NEW |