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

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

Issue 165176: Merge 21999 - BufferedDataSource to support server without range request supp... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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_glue_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')
Property Changes:
Modified: svn:mergeinfo
Merged /trunk/src/media/filters/file_data_source.h:r21999
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/lock.h" 10 #include "base/lock.h"
(...skipping 13 matching lines...) Expand all
24 24
25 // Implementation of MediaFilter. 25 // Implementation of MediaFilter.
26 virtual void Stop(); 26 virtual void Stop();
27 27
28 // Implementation of DataSource. 28 // Implementation of DataSource.
29 virtual void Initialize(const std::string& url, FilterCallback* callback); 29 virtual void Initialize(const std::string& url, FilterCallback* callback);
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);
34 virtual bool IsSeekable(); 34 virtual bool IsStreaming();
35 35
36 private: 36 private:
37 // Only allow factories and tests to create this object. 37 // Only allow factories and tests to create this object.
38 // 38 //
39 // TODO(scherkus): I'm getting tired of these factories getting in the way 39 // TODO(scherkus): I'm getting tired of these factories getting in the way
40 // of my tests!!! 40 // of my tests!!!
41 FRIEND_TEST(FileDataSourceTest, OpenFile); 41 FRIEND_TEST(FileDataSourceTest, OpenFile);
42 FRIEND_TEST(FileDataSourceTest, ReadData); 42 FRIEND_TEST(FileDataSourceTest, ReadData);
43 FRIEND_TEST(FileDataSourceTest, Seek); 43 FRIEND_TEST(FileDataSourceTest, Seek);
44 friend class FilterFactoryImpl0<FileDataSource>; 44 friend class FilterFactoryImpl0<FileDataSource>;
(...skipping 15 matching lines...) Expand all
60 // 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
61 // hang the pipeline Stop. 61 // hang the pipeline Stop.
62 Lock lock_; 62 Lock lock_;
63 63
64 DISALLOW_COPY_AND_ASSIGN(FileDataSource); 64 DISALLOW_COPY_AND_ASSIGN(FileDataSource);
65 }; 65 };
66 66
67 } // namespace media 67 } // namespace media
68 68
69 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_ 69 #endif // MEDIA_FILTERS_FILE_DATA_SOURCE_H_
OLDNEW
« no previous file with comments | « media/filters/ffmpeg_glue_unittest.cc ('k') | media/filters/file_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698