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

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

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/file_data_source.h ('k') | webkit/api/public/WebMediaPlayer.h » ('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.cc: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 #include <limits> 5 #include <limits>
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/string_util.h" 8 #include "base/string_util.h"
9 #include "media/base/filter_host.h" 9 #include "media/base/filter_host.h"
10 #include "media/base/filters.h" 10 #include "media/base/filters.h"
(...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 } 93 }
94 94
95 bool FileDataSource::GetSize(int64* size_out) { 95 bool FileDataSource::GetSize(int64* size_out) {
96 DCHECK(size_out); 96 DCHECK(size_out);
97 DCHECK(file_); 97 DCHECK(file_);
98 AutoLock l(lock_); 98 AutoLock l(lock_);
99 *size_out = file_size_; 99 *size_out = file_size_;
100 return (NULL != file_); 100 return (NULL != file_);
101 } 101 }
102 102
103 bool FileDataSource::IsSeekable() { 103 bool FileDataSource::IsStreaming() {
104 // A file data source is always seekable. 104 return false;
105 return true;
106 } 105 }
107 106
108 } // namespace media 107 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/file_data_source.h ('k') | webkit/api/public/WebMediaPlayer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698