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

Side by Side Diff: media/base/demuxer.h

Issue 1419753007: Fix race on demuxer memory usage. Reuse previous calculation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Restyle. Created 5 years, 1 month 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
« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer.h » ('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_BASE_DEMUXER_H_ 5 #ifndef MEDIA_BASE_DEMUXER_H_
6 #define MEDIA_BASE_DEMUXER_H_ 6 #define MEDIA_BASE_DEMUXER_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/time/time.h" 10 #include "base/time/time.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 virtual void Stop() = 0; 80 virtual void Stop() = 0;
81 81
82 // Returns the starting time for the media file; it's always positive. 82 // Returns the starting time for the media file; it's always positive.
83 virtual base::TimeDelta GetStartTime() const = 0; 83 virtual base::TimeDelta GetStartTime() const = 0;
84 84
85 // Returns Time represented by presentation timestamp 0. 85 // Returns Time represented by presentation timestamp 0.
86 // If the timstamps are not associated with a Time, then 86 // If the timstamps are not associated with a Time, then
87 // a null Time is returned. 87 // a null Time is returned.
88 virtual base::Time GetTimelineOffset() const = 0; 88 virtual base::Time GetTimelineOffset() const = 0;
89 89
90 // Returns the memory usage in bytes for the demuxer. 90 // Returns the memory usage in bytes for the demuxer. May be called from any
91 // thread.
91 virtual int64_t GetMemoryUsage() const = 0; 92 virtual int64_t GetMemoryUsage() const = 0;
92 93
93 private: 94 private:
94 DISALLOW_COPY_AND_ASSIGN(Demuxer); 95 DISALLOW_COPY_AND_ASSIGN(Demuxer);
95 }; 96 };
96 97
97 } // namespace media 98 } // namespace media
98 99
99 #endif // MEDIA_BASE_DEMUXER_H_ 100 #endif // MEDIA_BASE_DEMUXER_H_
OLDNEW
« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698