Allow setting memory limits on media::DemuxerStream

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 145 matching lines @@
   // Helper methods that call methods with similar names on all the
   // ChunkDemuxerStreams managed by this object.
   void StartReturningData();
   void AbortReads();
   void Seek(TimeDelta seek_time);
   void CompletePendingReadIfPossible();
   void OnSetDuration(TimeDelta duration);
   void MarkEndOfStream();
   void UnmarkEndOfStream();
   void Shutdown();
-  // 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);
   bool IsSeekWaitingForData() const;
 
  private:
   // Called by the |stream_parser_| when a new initialization segment is
   // encountered.
   // Returns true on a successful call. Returns false if an error occurred while
   // processing decoder configurations.
   bool OnNewConfigs(bool allow_audio, bool allow_video,
                     const AudioDecoderConfig& audio_config,
                     const VideoDecoderConfig& video_config,
@@ skipping 327 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) {
-  switch (type) {
-    case DemuxerStream::AUDIO:
-      if (audio_)
-        audio_->set_memory_limit(memory_limit);
-      break;
-    case DemuxerStream::VIDEO:
-      if (video_)
-        video_->set_memory_limit(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);
-      }
-      break;
-    case DemuxerStream::UNKNOWN:
-    case DemuxerStream::NUM_TYPES:
-      NOTREACHED();
-      break;
-  }
-}
-
 bool SourceState::IsSeekWaitingForData() const {
   if (audio_ && audio_->IsSeekWaitingForData())
     return true;
 
   if (video_ && video_->IsSeekWaitingForData())
     return true;
 
   // NOTE: We are intentionally not checking the text tracks
   // because text tracks are discontinuous and may not have data
   // for the seek position. This is ok and playback should not be
@@ skipping 463 matching lines @@
   base::AutoLock auto_lock(lock_);
   return stream_->GetCurrentVideoDecoderConfig();
 }
 
 bool ChunkDemuxerStream::SupportsConfigChanges() { return true; }
 
 VideoRotation ChunkDemuxerStream::video_rotation() {
   return VIDEO_ROTATION_0;
 }
 
+size_t ChunkDemuxerStream::GetMemoryLimit() const {
+  return stream_->GetMemoryLimit();
+}
+
+void ChunkDemuxerStream::SetMemoryLimit(size_t memory_limit) {
+  stream_->SetMemoryLimit(memory_limit);
+}
+
 TextTrackConfig ChunkDemuxerStream::text_track_config() {
   CHECK_EQ(type_, TEXT);
   base::AutoLock auto_lock(lock_);
   return stream_->GetCurrentTextTrackConfig();
 }
 
 void ChunkDemuxerStream::SetLiveness(Liveness liveness) {
   base::AutoLock auto_lock(lock_);
   liveness_ = liveness;
 }
@@ skipping 548 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) {
-  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;
   state_ = new_state;
 }
 
 ChunkDemuxer::~ChunkDemuxer() {
   DCHECK_NE(state_, INITIALIZED);
 
@@ skipping 224 matching lines @@
 }
 
 void ChunkDemuxer::ShutdownAllStreams() {
   for (SourceStateMap::iterator itr = source_state_map_.begin();
        itr != source_state_map_.end(); ++itr) {
     itr->second->Shutdown();
   }
 }
 
 }  // namespace media