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

Unified Diff: media/filters/chunk_demuxer.h

Issue 1235403002: Change ChunkDemuxerStream/SourceBufferStream memory limit to size_t type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: A few more minor fixes Created 5 years, 5 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
« no previous file with comments | « media/base/decoder_buffer.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer.h
diff --git a/media/filters/chunk_demuxer.h b/media/filters/chunk_demuxer.h
index cdf2e524c812e906459ee7b7136f39520fd1e60a..b856a2950b69377d382052545a239135e54aae18 100644
--- a/media/filters/chunk_demuxer.h
+++ b/media/filters/chunk_demuxer.h
@@ -11,6 +11,7 @@
#include <utility>
#include <vector>
+#include "base/basictypes.h"
#include "base/synchronization/lock.h"
#include "media/base/byte_queue.h"
#include "media/base/demuxer.h"
@@ -94,9 +95,7 @@ class MEDIA_EXPORT ChunkDemuxerStream : public DemuxerStream {
TextTrackConfig text_track_config();
// Sets the memory limit, in bytes, on the SourceBufferStream.
- void set_memory_limit(int memory_limit) {
- stream_->set_memory_limit(memory_limit);
- }
+ void SetStreamMemoryLimit(size_t memory_limit);
bool supports_partial_append_window_trimming() const {
return partial_append_window_trimming_enabled_;
@@ -277,7 +276,7 @@ class MEDIA_EXPORT ChunkDemuxer : public Demuxer {
// Sets the memory limit on each stream of a specific type.
// |memory_limit| is the maximum number of bytes each stream of type |type|
// is allowed to hold in its buffer.
- void SetMemoryLimits(DemuxerStream::Type type, int memory_limit);
+ void SetMemoryLimits(DemuxerStream::Type type, size_t memory_limit);
// Returns the ranges representing the buffered data in the demuxer.
// TODO(wolenetz): Remove this method once MediaSourceDelegate no longer
« no previous file with comments | « media/base/decoder_buffer.h ('k') | media/filters/chunk_demuxer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698