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

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

Issue 10808087: Remove use of PipelineStatus from BufferedDataSource and FileDataSource. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: status -> success Created 8 years, 4 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"
11 #include "base/synchronization/lock.h" 11 #include "base/synchronization/lock.h"
12 #include "media/base/data_source.h" 12 #include "media/base/data_source.h"
13 13
14 namespace media { 14 namespace media {
15 15
16 // Basic data source that treats the URL as a file path, and uses the file 16 // Basic data source that treats the URL as a file path, and uses the file
17 // system to read data for a media pipeline. 17 // system to read data for a media pipeline.
18 class MEDIA_EXPORT FileDataSource : public DataSource { 18 class MEDIA_EXPORT FileDataSource : public DataSource {
19 public: 19 public:
20 FileDataSource(); 20 FileDataSource();
21 FileDataSource(bool disable_file_size); 21 FileDataSource(bool disable_file_size);
22 22
23 PipelineStatus Initialize(const std::string& url); 23 bool Initialize(const std::string& url);
24 24
25 // Implementation of DataSource. 25 // Implementation of DataSource.
26 virtual void set_host(DataSourceHost* host) OVERRIDE; 26 virtual void set_host(DataSourceHost* host) OVERRIDE;
27 virtual void Stop(const base::Closure& callback) OVERRIDE; 27 virtual void Stop(const base::Closure& callback) OVERRIDE;
28 virtual void Read(int64 position, int size, uint8* data, 28 virtual void Read(int64 position, int size, uint8* data,
29 const DataSource::ReadCB& read_cb) OVERRIDE; 29 const DataSource::ReadCB& read_cb) OVERRIDE;
30 virtual bool GetSize(int64* size_out) OVERRIDE; 30 virtual bool GetSize(int64* size_out) OVERRIDE;
31 virtual bool IsStreaming() OVERRIDE; 31 virtual bool IsStreaming() OVERRIDE;
32 virtual void SetBitrate(int bitrate) OVERRIDE; 32 virtual void SetBitrate(int bitrate) OVERRIDE;
33 33
(...skipping 20 matching lines...) Expand all
54 // that we will block for a short period of time in reads. Otherwise, we can 54 // that we will block for a short period of time in reads. Otherwise, we can
55 // hang the pipeline Stop. 55 // hang the pipeline Stop.
56 base::Lock lock_; 56 base::Lock lock_;
57 57
58 DISALLOW_COPY_AND_ASSIGN(FileDataSource); 58 DISALLOW_COPY_AND_ASSIGN(FileDataSource);
59 }; 59 };
60 60
61 } // namespace media 61 } // namespace media
62 62
63 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 63 #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