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

Unified Diff: media/filters/ffmpeg_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 | « media/base/demuxer.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index c527b7410c484a9f21942df214069977a73fd80e..154ff05ef33f6b62c4da7bec0a604a78c896ae84 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -233,8 +233,9 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
// go over capacity depending on how the file is muxed.
bool StreamsHaveAvailableCapacity();
- // Returns true if the maximum allowed memory usage has been reached.
- bool IsMaxMemoryUsageReached() const;
+ // Updates |stream_memory_usage_| to the memory usage in bytes of all
+ // FFmpegDemuxerStreams. Returns the current memory usage.
+ int64_t UpdateMemoryUsage();
// Signal all FFmpegDemuxerStreams that the stream has ended.
void StreamHasEnded();
@@ -323,6 +324,10 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
const EncryptedMediaInitDataCB encrypted_media_init_data_cb_;
+ // Last stream size as calculated by UpdateMemoryUsage().
+ mutable base::Lock stream_memory_usage_lock_;
+ int64_t stream_memory_usage_;
+
// NOTE: Weak pointers must be invalidated before all other member variables.
base::WeakPtrFactory<FFmpegDemuxer> weak_factory_;
« no previous file with comments | « media/base/demuxer.h ('k') | media/filters/ffmpeg_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698