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

Unified Diff: media/filters/source_buffer_stream.cc

Issue 1171263004: Allow setting memory limits on media::DemuxerStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include logging.h for NOTIMPLEMENTED definition Created 5 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: media/filters/source_buffer_stream.cc
diff --git a/media/filters/source_buffer_stream.cc b/media/filters/source_buffer_stream.cc
index 18a08b7501f4b640514ffffdc2845b03437aaacb..b33e53f9f1def5ee4c0eaddfea8a3ced48d16abc 100644
--- a/media/filters/source_buffer_stream.cc
+++ b/media/filters/source_buffer_stream.cc
@@ -599,15 +599,15 @@ void SourceBufferStream::GarbageCollectIfNeeded() {
ranges_size += (*itr)->size_in_bytes();
// Return if we're under or at the memory limit.
- if (ranges_size <= memory_limit_)
+ if (ranges_size <= GetMemoryLimit())
return;
- int bytes_to_free = ranges_size - memory_limit_;
+ int bytes_to_free = ranges_size - GetMemoryLimit();
DVLOG(2) << __FUNCTION__ << " " << GetStreamTypeName() << ": Before GC"
<< " ranges_size=" << ranges_size
<< " ranges_=" << RangesToString(ranges_)
- << " memory_limit_=" << memory_limit_;
+ << " GetMemoryLimit()=" << GetMemoryLimit();
// Begin deleting after the last appended buffer.
int bytes_freed = FreeBuffersAfterLastAppended(bytes_to_free);

Powered by Google App Engine
This is Rietveld 408576698