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

Side by Side Diff: media/base/pipeline_impl.h

Issue 6028009: Move base/thread.h to base/threading, fix up callers to use the new location.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 9 years, 11 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
« no previous file with comments | « media/audio/linux/audio_manager_linux.h ('k') | media/filters/decoder_base.h » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 // Implementation of Pipeline. 5 // Implementation of Pipeline.
6 6
7 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_ 7 #ifndef MEDIA_BASE_PIPELINE_IMPL_H_
8 #define MEDIA_BASE_PIPELINE_IMPL_H_ 8 #define MEDIA_BASE_PIPELINE_IMPL_H_
9 9
10 #include <set> 10 #include <set>
11 #include <string> 11 #include <string>
12 #include <vector> 12 #include <vector>
13 13
14 #include "base/gtest_prod_util.h" 14 #include "base/gtest_prod_util.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/ref_counted.h" 16 #include "base/ref_counted.h"
17 #include "base/scoped_ptr.h" 17 #include "base/scoped_ptr.h"
18 #include "base/thread.h" 18 #include "base/threading/thread.h"
19 #include "base/time.h" 19 #include "base/time.h"
20 #include "media/base/clock.h" 20 #include "media/base/clock.h"
21 #include "media/base/filter_host.h" 21 #include "media/base/filter_host.h"
22 #include "media/base/pipeline.h" 22 #include "media/base/pipeline.h"
23 23
24 namespace media { 24 namespace media {
25 25
26 26
27 // PipelineImpl runs the media pipeline. Filters are created and called on the 27 // PipelineImpl runs the media pipeline. Filters are created and called on the
28 // message loop injected into this object. PipelineImpl works like a state 28 // message loop injected into this object. PipelineImpl works like a state
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 409
410 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime); 410 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, GetBufferedTime);
411 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo); 411 FRIEND_TEST_ALL_PREFIXES(PipelineImplTest, AudioStreamShorterThanVideo);
412 412
413 DISALLOW_COPY_AND_ASSIGN(PipelineImpl); 413 DISALLOW_COPY_AND_ASSIGN(PipelineImpl);
414 }; 414 };
415 415
416 } // namespace media 416 } // namespace media
417 417
418 #endif // MEDIA_BASE_PIPELINE_IMPL_H_ 418 #endif // MEDIA_BASE_PIPELINE_IMPL_H_
OLDNEW
« no previous file with comments | « media/audio/linux/audio_manager_linux.h ('k') | media/filters/decoder_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698