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

Side by Side Diff: media/filters/ffmpeg_demuxer_unittest.cc

Issue 10796074: Move VideoRenderer out of Filter heirarchy. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 8 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/path_service.h" 12 #include "base/path_service.h"
13 #include "base/threading/thread.h" 13 #include "base/threading/thread.h"
14 #include "media/base/filters.h"
15 #include "media/base/mock_callback.h" 14 #include "media/base/mock_callback.h"
16 #include "media/base/mock_demuxer_host.h" 15 #include "media/base/mock_demuxer_host.h"
17 #include "media/base/mock_filters.h"
18 #include "media/ffmpeg/ffmpeg_common.h" 16 #include "media/ffmpeg/ffmpeg_common.h"
19 #include "media/filters/ffmpeg_demuxer.h" 17 #include "media/filters/ffmpeg_demuxer.h"
20 #include "media/filters/file_data_source.h" 18 #include "media/filters/file_data_source.h"
21 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
22 20
23 using ::testing::AnyNumber; 21 using ::testing::AnyNumber;
24 using ::testing::DoAll; 22 using ::testing::DoAll;
25 using ::testing::InSequence; 23 using ::testing::InSequence;
26 using ::testing::Invoke; 24 using ::testing::Invoke;
27 using ::testing::Return; 25 using ::testing::Return;
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
721 TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) { 719 TEST_F(FFmpegDemuxerTest, UnsupportedVideoSupportedAudioDemux) {
722 CreateDemuxer("vorbis_audio_wmv_video.mkv"); 720 CreateDemuxer("vorbis_audio_wmv_video.mkv");
723 InitializeDemuxer(); 721 InitializeDemuxer();
724 722
725 // Ensure the expected streams are present. 723 // Ensure the expected streams are present.
726 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::VIDEO)); 724 EXPECT_FALSE(demuxer_->GetStream(DemuxerStream::VIDEO));
727 EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO)); 725 EXPECT_TRUE(demuxer_->GetStream(DemuxerStream::AUDIO));
728 } 726 }
729 727
730 } // namespace media 728 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698