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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/demuxer.h
diff --git a/media/base/demuxer.h b/media/base/demuxer.h
index 1f136a0cbcccd6e93f1ad85804407c9ecb1a4d04..2324c87ab16685617720ed09dd903f640c23bb87 100644
--- a/media/base/demuxer.h
+++ b/media/base/demuxer.h
@@ -87,7 +87,8 @@ class MEDIA_EXPORT Demuxer : public DemuxerStreamProvider {
// a null Time is returned.
virtual base::Time GetTimelineOffset() const = 0;
- // Returns the memory usage in bytes for the demuxer.
+ // Returns the memory usage in bytes for the demuxer. May be called from any
+ // thread.
virtual int64_t GetMemoryUsage() const = 0;
private:
« 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