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

Side by Side Diff: media/filters/file_data_source.h

Issue 9860027: Remove DemuxerFactory and URL parameter from Pipeline. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: again Created 8 years, 8 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/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/file_data_source.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_FILTERS_FILE_DATA_SOURCE_H_ 5 #ifndef MEDIA_FILTERS_FILE_DATA_SOURCE_H_
6 #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 6 #define MEDIA_FILTERS_FILE_DATA_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/gtest_prod_util.h" 10 #include "base/gtest_prod_util.h"
(...skipping 12 matching lines...) Expand all
23 23
24 PipelineStatus Initialize(const std::string& url); 24 PipelineStatus Initialize(const std::string& url);
25 25
26 // Implementation of DataSource. 26 // Implementation of DataSource.
27 virtual void set_host(DataSourceHost* host) OVERRIDE; 27 virtual void set_host(DataSourceHost* host) OVERRIDE;
28 virtual void Stop(const base::Closure& callback) OVERRIDE; 28 virtual void Stop(const base::Closure& callback) OVERRIDE;
29 virtual void Read(int64 position, int size, uint8* data, 29 virtual void Read(int64 position, int size, uint8* data,
30 const DataSource::ReadCB& read_cb) OVERRIDE; 30 const DataSource::ReadCB& read_cb) OVERRIDE;
31 virtual bool GetSize(int64* size_out) OVERRIDE; 31 virtual bool GetSize(int64* size_out) OVERRIDE;
32 virtual bool IsStreaming() OVERRIDE; 32 virtual bool IsStreaming() OVERRIDE;
33 virtual void SetPreload(Preload preload) OVERRIDE;
34 virtual void SetBitrate(int bitrate) OVERRIDE; 33 virtual void SetBitrate(int bitrate) OVERRIDE;
35 34
36 private: 35 private:
37 // Only allow factories and tests to create this object. 36 // Only allow factories and tests to create this object.
38 // 37 //
39 // TODO(scherkus): I'm getting tired of these factories getting in the way 38 // TODO(scherkus): I'm getting tired of these factories getting in the way
40 // of my tests!!! 39 // of my tests!!!
41 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, OpenFile); 40 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, OpenFile);
42 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, ReadData); 41 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, ReadData);
43 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, Seek); 42 FRIEND_TEST_ALL_PREFIXES(FileDataSourceTest, Seek);
(...skipping 17 matching lines...) Expand all
61 // that we will block for a short period of time in reads. Otherwise, we can 60 // that we will block for a short period of time in reads. Otherwise, we can
62 // hang the pipeline Stop. 61 // hang the pipeline Stop.
63 base::Lock lock_; 62 base::Lock lock_;
64 63
65 DISALLOW_COPY_AND_ASSIGN(FileDataSource); 64 DISALLOW_COPY_AND_ASSIGN(FileDataSource);
66 }; 65 };
67 66
68 } // namespace media 67 } // namespace media
69 68
70 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 69 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer_unittest.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698