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

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

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, 9 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_base.h ('k') | media/tools/player_x11/player_x11.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 #include "media/test/pipeline_integration_test_base.h" 5 #include "media/test/pipeline_integration_test_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
9 #include "media/base/cdm_context.h" 9 #include "media/base/cdm_context.h"
10 #include "media/base/media_log.h" 10 #include "media/base/media_log.h"
11 #include "media/base/test_data_util.h" 11 #include "media/base/test_data_util.h"
12 #include "media/filters/audio_renderer_impl.h"
13 #include "media/filters/chunk_demuxer.h" 12 #include "media/filters/chunk_demuxer.h"
14 #if !defined(MEDIA_DISABLE_FFMPEG) 13 #if !defined(MEDIA_DISABLE_FFMPEG)
15 #include "media/filters/ffmpeg_audio_decoder.h" 14 #include "media/filters/ffmpeg_audio_decoder.h"
16 #include "media/filters/ffmpeg_demuxer.h" 15 #include "media/filters/ffmpeg_demuxer.h"
17 #include "media/filters/ffmpeg_video_decoder.h" 16 #include "media/filters/ffmpeg_video_decoder.h"
18 #endif 17 #endif
19 #include "media/filters/file_data_source.h" 18 #include "media/filters/file_data_source.h"
20 #include "media/filters/opus_audio_decoder.h" 19 #include "media/filters/opus_audio_decoder.h"
21 #include "media/filters/renderer_impl.h" 20 #include "media/renderers/audio_renderer_impl.h"
21 #include "media/renderers/renderer_impl.h"
22 #if !defined(MEDIA_DISABLE_LIBVPX) 22 #if !defined(MEDIA_DISABLE_LIBVPX)
23 #include "media/filters/vpx_video_decoder.h" 23 #include "media/filters/vpx_video_decoder.h"
24 #endif 24 #endif
25 25
26 using ::testing::_; 26 using ::testing::_;
27 using ::testing::AnyNumber; 27 using ::testing::AnyNumber;
28 using ::testing::AtMost; 28 using ::testing::AtMost;
29 using ::testing::InvokeWithoutArgs; 29 using ::testing::InvokeWithoutArgs;
30 using ::testing::SaveArg; 30 using ::testing::SaveArg;
31 31
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 DCHECK(clockless_playback_); 308 DCHECK(clockless_playback_);
309 return clockless_audio_sink_->render_time(); 309 return clockless_audio_sink_->render_time();
310 } 310 }
311 311
312 base::TimeTicks DummyTickClock::NowTicks() { 312 base::TimeTicks DummyTickClock::NowTicks() {
313 now_ += base::TimeDelta::FromSeconds(60); 313 now_ += base::TimeDelta::FromSeconds(60);
314 return now_; 314 return now_;
315 } 315 }
316 316
317 } // namespace media 317 } // namespace media
OLDNEW
« no previous file with comments | « media/test/pipeline_integration_test_base.h ('k') | media/tools/player_x11/player_x11.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698