Allow setting memory limits on media::DemuxerStream

media/filters/source_buffer_stream.h

 // 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.
 
 // SourceBufferStream is a data structure that stores media Buffers in ranges.
 // Buffers can be appended out of presentation order. Buffers are retrieved by
 // seeking to the desired start point and calling GetNextBuffer(). Buffers are
 // returned in sequential presentation order.
 
 #ifndef MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_
@@ skipping 124 matching lines @@
 
   // Notifies this object that the video config has changed and buffers in
   // future Append() calls should be associated with this new config.
   bool UpdateVideoConfig(const VideoDecoderConfig& config);
 
   // Returns the largest distance between two adjacent buffers in this stream,
   // or an estimate if no two adjacent buffers have been appended to the stream
   // yet.
   base::TimeDelta GetMaxInterbufferDistance() const;
 
-  void set_memory_limit(int memory_limit) {
+  size_t GetMemoryLimit() const {

[ddorwin, 2015/06/17 21:02:16]

Memory limit for what? Maximum source buffer size? That's what's currently
implied, but I don't think that's accurate. It appears to be the maximum byte
range cache size or something like that.

[servolk, 2015/06/17 22:13:48]

Yeah, I guess you can call it "maximum byte cache range size". Note that the
terminology here (the "memory limit") wasn't introduced by me, it was introduced
long time ago by somebody else in a different CL. I'm just renaming the method
to make it's name more consistent with what I'm adding in media::DemuxerStream
interface in this CL. I can rename it to something else, if you prefer, but I
though the old terminology was fine and reasonably understandable.

[ddorwin, 2015/06/20 01:50:26]

Previously, the name followed the accessor style. Why did you change that?
https://www.chromium.org/developers/coding-style#TOC-Inline-functions

If not following that style, we should definitely be clearer. Even as an
accessor, we might consider updating the naming, though possibly in a separate
CL since we'd need to change all uses of this member.

+    return memory_limit_;
+  }
+
+  void SetMemoryLimit(size_t memory_limit) {
     memory_limit_ = memory_limit;
   }
 
  private:
   friend class SourceBufferStreamTest;
 
   // Frees up space if the SourceBufferStream is taking up too much memory.
   void GarbageCollectIfNeeded();
 
   // Attempts to delete approximately |total_bytes_to_free| amount of data
@@ skipping 233 matching lines @@
 
   // The decode timestamp on the last buffer returned by the most recent
   // GetNextBuffer() call. Set to kNoTimestamp() if GetNextBuffer() hasn't been
   // called yet or a seek has happened since the last GetNextBuffer() call.
   DecodeTimestamp last_output_buffer_timestamp_;
 
   // Stores the largest distance between two adjacent buffers in this stream.
   base::TimeDelta max_interbuffer_distance_;
 
   // The maximum amount of data in bytes the stream will keep in memory.
-  int memory_limit_;
+  size_t memory_limit_;
 
   // Indicates that a kConfigChanged status has been reported by GetNextBuffer()
   // and GetCurrentXXXDecoderConfig() must be called to update the current
   // config. GetNextBuffer() must not be called again until
   // GetCurrentXXXDecoderConfig() has been called.
   bool config_change_pending_;
 
   // Used by HandleNextBufferWithSplice() or HandleNextBufferWithPreroll() when
   // a splice frame buffer or buffer with preroll is returned from
   // GetNextBufferInternal().
   scoped_refptr<StreamParserBuffer> pending_buffer_;
 
   // Indicates which of the splice buffers in |splice_buffer_| should be
   // handled out next.
   size_t splice_buffers_index_;
 
   // Indicates that all buffers before |pending_buffer_| have been handed out.
   bool pending_buffers_complete_;
 
   // Indicates that splice frame generation is enabled.
   const bool splice_frames_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(SourceBufferStream);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_SOURCE_BUFFER_STREAM_H_