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

Side by Side Diff: media/test/pipeline_integration_test_base.h

Issue 941633004: Moved renderer implementation from media/filters/ to media/renderers/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed android build Created 5 years, 10 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
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 5 #ifndef MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 6 #define MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
7 7
8 #include "base/md5.h" 8 #include "base/md5.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "media/audio/clockless_audio_sink.h" 10 #include "media/audio/clockless_audio_sink.h"
11 #include "media/audio/null_audio_sink.h" 11 #include "media/audio/null_audio_sink.h"
12 #include "media/base/audio_hardware_config.h" 12 #include "media/base/audio_hardware_config.h"
13 #include "media/base/demuxer.h" 13 #include "media/base/demuxer.h"
14 #include "media/base/media_keys.h" 14 #include "media/base/media_keys.h"
15 #include "media/base/pipeline.h" 15 #include "media/base/pipeline.h"
16 #include "media/base/text_track.h" 16 #include "media/base/text_track.h"
17 #include "media/base/text_track_config.h" 17 #include "media/base/text_track_config.h"
18 #include "media/base/video_frame.h" 18 #include "media/base/video_frame.h"
19 #include "media/filters/video_renderer_impl.h" 19 #include "media/renderers/video_renderer_impl.h"
20 #include "testing/gmock/include/gmock/gmock.h" 20 #include "testing/gmock/include/gmock/gmock.h"
21 21
22 namespace base { 22 namespace base {
23 class FilePath; 23 class FilePath;
24 } 24 }
25 25
26 namespace media { 26 namespace media {
27 27
28 class CdmContext; 28 class CdmContext;
29 29
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState)); 138 MOCK_METHOD1(OnBufferingStateChanged, void(BufferingState));
139 MOCK_METHOD1(DecryptorAttached, void(bool)); 139 MOCK_METHOD1(DecryptorAttached, void(bool));
140 MOCK_METHOD2(OnAddTextTrack, 140 MOCK_METHOD2(OnAddTextTrack,
141 void(const TextTrackConfig& config, 141 void(const TextTrackConfig& config,
142 const AddTextTrackDoneCB& done_cb)); 142 const AddTextTrackDoneCB& done_cb));
143 }; 143 };
144 144
145 } // namespace media 145 } // namespace media
146 146
147 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_ 147 #endif // MEDIA_TEST_PIPELINE_INTEGRATION_TEST_BASE_H_
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test.cc ('k') | media/test/pipeline_integration_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698