Change ChunkDemuxerStream/SourceBufferStream memory limit to size_t type

media/filters/chunk_demuxer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/chunk_demuxer.h"
 
 #include <algorithm>
 #include <limits>
 #include <list>
 
@@ skipping 495 matching lines @@
 
   if (video_)
     video_->Shutdown();
 
   for (TextStreamMap::iterator itr = text_stream_map_.begin();
        itr != text_stream_map_.end(); ++itr) {
     itr->second->Shutdown();
   }
 }
 
 void SourceState::SetMemoryLimits(DemuxerStream::Type type, int memory_limit) {

[wolenetz, 2015/07/17 20:23:53]

ISTM this method's decl and defn needs similar change to size_t. wdyt?

[servolk, 2015/07/17 21:34:06]

Done.

   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:
     case DemuxerStream::NUM_TYPES:
       NOTREACHED();
       break;
   }
 }
 
 bool SourceState::IsSeekWaitingForData() const {
@@ skipping 468 matching lines @@
 }
 
 VideoDecoderConfig ChunkDemuxerStream::video_decoder_config() {
   CHECK_EQ(type_, VIDEO);
   base::AutoLock auto_lock(lock_);
   return stream_->GetCurrentVideoDecoderConfig();
 }
 
 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 they are in decl. move to just
after text_track_config()?

[servolk, 2015/07/17 21:34:06]

Done.

+  stream_->SetMemoryLimit(memory_limit);
+}
+
 VideoRotation ChunkDemuxerStream::video_rotation() {
   return VIDEO_ROTATION_0;
 }
 
 TextTrackConfig ChunkDemuxerStream::text_track_config() {
   CHECK_EQ(type_, TEXT);
   base::AutoLock auto_lock(lock_);
   return stream_->GetCurrentTextTrackConfig();
 }
 
@@ skipping 552 matching lines @@
     return;
 
   ShutdownAllStreams();
 
   ChangeState_Locked(SHUTDOWN);
 
   if(!seek_cb_.is_null())
     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);
   }
 }
 
 void ChunkDemuxer::ChangeState_Locked(State new_state) {
   lock_.AssertAcquired();
   DVLOG(1) << "ChunkDemuxer::ChangeState_Locked() : "
            << state_ << " -> " << new_state;
@@ skipping 230 matching lines @@
 }
 
 void ChunkDemuxer::ShutdownAllStreams() {
   for (SourceStateMap::iterator itr = source_state_map_.begin();
        itr != source_state_map_.end(); ++itr) {
     itr->second->Shutdown();
   }
 }
 
 }  // namespace media