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

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

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: responses to 2nd CR Created 9 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/ffmpeg_demuxer_factory.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/filters.h" 12 #include "media/base/filters.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 FileDataSource : public DataSource { 18 class FileDataSource : public DataSource {
19 public: 19 public:
20 FileDataSource(); 20 FileDataSource();
21 virtual ~FileDataSource(); 21 virtual ~FileDataSource();
22 22
23 PipelineError Initialize(const std::string& url); 23 PipelineStatus Initialize(const std::string& url);
24 24
25 // Implementation of Filter. 25 // Implementation of Filter.
26 virtual void set_host(FilterHost* filter_host); 26 virtual void set_host(FilterHost* filter_host);
27 virtual void Stop(FilterCallback* callback); 27 virtual void Stop(FilterCallback* callback);
28 28
29 // Implementation of DataSource. 29 // Implementation of DataSource.
30 virtual const MediaFormat& media_format(); 30 virtual const MediaFormat& media_format();
31 virtual void Read(int64 position, size_t size, uint8* data, 31 virtual void Read(int64 position, size_t size, uint8* data,
32 ReadCallback* read_callback); 32 ReadCallback* read_callback);
33 virtual bool GetSize(int64* size_out); 33 virtual bool GetSize(int64* size_out);
(...skipping 23 matching lines...) Expand all
57 // that we will block for a short period of time in reads. Otherwise, we can 57 // that we will block for a short period of time in reads. Otherwise, we can
58 // hang the pipeline Stop. 58 // hang the pipeline Stop.
59 base::Lock lock_; 59 base::Lock lock_;
60 60
61 DISALLOW_COPY_AND_ASSIGN(FileDataSource); 61 DISALLOW_COPY_AND_ASSIGN(FileDataSource);
62 }; 62 };
63 63
64 } // namespace media 64 } // namespace media
65 65
66 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 66 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_demuxer_factory.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698