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

Unified Diff: media/filters/chunk_demuxer.cc

Issue 1235403002: Change ChunkDemuxerStream/SourceBufferStream memory limit to size_t type (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: media/filters/chunk_demuxer.cc
diff --git a/media/filters/chunk_demuxer.cc b/media/filters/chunk_demuxer.cc
index 72c7ef43e5c772dab9759c09a5bee78601370f0e..9b63a012d2898855002471c90dc7c6f9a89e16d4 100644
--- a/media/filters/chunk_demuxer.cc
+++ b/media/filters/chunk_demuxer.cc
@@ -517,16 +517,16 @@ void SourceState::SetMemoryLimits(DemuxerStream::Type type, int memory_limit) {
switch (type) {
case DemuxerStream::AUDIO:
if (audio_)
- audio_->set_memory_limit(memory_limit);
+ audio_->SetMemoryLimit(memory_limit);
break;
case DemuxerStream::VIDEO:
if (video_)
- video_->set_memory_limit(memory_limit);
+ video_->SetMemoryLimit(memory_limit);
break;
case DemuxerStream::TEXT:
for (TextStreamMap::iterator itr = text_stream_map_.begin();
itr != text_stream_map_.end(); ++itr) {
- itr->second->set_memory_limit(memory_limit);
+ itr->second->SetMemoryLimit(memory_limit);
}
break;
case DemuxerStream::UNKNOWN:
@@ -1015,6 +1015,10 @@ VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() {
bool ChunkDemuxerStream::SupportsConfigChanges() { return true; }
+void ChunkDemuxerStream::SetMemoryLimit(size_t memory_limit) {
wolenetz 2015/07/17 20:23:53 nit: try to retain ordering of methods in impl as
servolk 2015/07/17 21:34:06 Done.
+ stream_->SetMemoryLimit(memory_limit);
+}
+
VideoRotation ChunkDemuxerStream::video_rotation() {
return VIDEO_ROTATION_0;
}
@@ -1587,7 +1591,8 @@ void ChunkDemuxer::Shutdown() {
base::ResetAndReturn(&seek_cb_).Run(PIPELINE_ERROR_ABORT);
}
-void ChunkDemuxer::SetMemoryLimits(DemuxerStream::Type type, int memory_limit) {
+void ChunkDemuxer::SetMemoryLimits(DemuxerStream::Type type,
+ size_t memory_limit) {
for (SourceStateMap::iterator itr = source_state_map_.begin();
itr != source_state_map_.end(); ++itr) {
itr->second->SetMemoryLimits(type, memory_limit);

Powered by Google App Engine
This is Rietveld 408576698