Make MSE buffer sizes configurable via command line

media/filters/media_source_state.cc

 // Copyright 2016 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/media_source_state.h"
 
 #include "base/callback_helpers.h"
+#include "base/command_line.h"
 #include "base/stl_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "media/base/media_switches.h"
 #include "media/base/media_track.h"
 #include "media/base/media_tracks.h"
 #include "media/filters/chunk_demuxer.h"
 #include "media/filters/frame_processor.h"
 #include "media/filters/source_buffer_stream.h"
 
 namespace media {
 
 enum {
   // Limits the number of MEDIA_LOG() calls warning the user that a muxed stream
@@ skipping 547 matching lines @@
   if (audio_config.IsValidConfig()) {
     if (!audio_) {
       media_log_->SetBooleanProperty("found_audio_stream", true);
     }
     if (!audio_ ||
         audio_->audio_decoder_config().codec() != audio_config.codec()) {
       media_log_->SetStringProperty("audio_codec_name",
                                     GetCodecName(audio_config.codec()));
     }
 
+    bool audio_stream_just_created = false;
     if (!audio_) {
       audio_ = create_demuxer_stream_cb_.Run(DemuxerStream::AUDIO);
 
       if (!audio_) {
         DVLOG(1) << "Failed to create an audio stream.";
         return false;
       }
+      audio_stream_just_created = true;
 
       if (!frame_processor_->AddTrack(FrameProcessor::kAudioTrackId, audio_)) {
         DVLOG(1) << "Failed to add audio track to frame processor.";
         return false;
       }
     }
 
     frame_processor_->OnPossibleAudioConfigUpdate(audio_config);
     success &= audio_->UpdateAudioConfig(audio_config, media_log_);
+
+    if (audio_stream_just_created) {

[alokp, 2016/07/29 21:36:21]

can you just move this into "if (!audio_)" block above? why do you need the
audio_stream_just_created boolean?

[servolk, 2016/07/29 22:14:10]

I tried that (see earlier patchsets), but this needs to happen after
audio_->UpdateAudioConfig (on line 596), since that's where the
SourceBufferStream is actually created when we receive the first init segment.

[alokp, 2016/07/30 00:08:26]

OK. Although I would prefer the buffer size limits to be passed in the
constructor if it does not make sense to change it at afterwards.

+      std::string audioBufferSwitchStr =

[alokp, 2016/07/29 21:36:21]

variable names do not follow chromium style guide.

[servolk, 2016/07/29 22:14:10]

Done.

+          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+              switches::kMSEAudioBufferSizeLimit);
+      unsigned mseAudioBufferSizeLimit = 0;

[alokp, 2016/07/29 21:36:21]

variable name

[servolk, 2016/07/29 22:14:10]

Done.

+      if (base::StringToUint(audioBufferSwitchStr, &mseAudioBufferSizeLimit) &&
+          mseAudioBufferSizeLimit > 0) {
+        MEDIA_LOG(INFO, media_log_) << "Custom MSE audio SourceBuffer size="
+                                    << mseAudioBufferSizeLimit;
+        audio_->SetStreamMemoryLimit(mseAudioBufferSizeLimit);
+      }
+    }
   }
 
   if (video_config.IsValidConfig()) {
     if (!video_) {
       media_log_->SetBooleanProperty("found_video_stream", true);
     }
     if (!video_ ||
         video_->video_decoder_config().codec() != video_config.codec()) {
       media_log_->SetStringProperty("video_codec_name",
                                     GetCodecName(video_config.codec()));
     }
 
+    bool video_stream_just_created = false;

[alokp, 2016/07/29 21:36:21]

ditto

[servolk, 2016/07/29 22:14:10]

Done.

     if (!video_) {
       video_ = create_demuxer_stream_cb_.Run(DemuxerStream::VIDEO);
 
       if (!video_) {
         DVLOG(1) << "Failed to create a video stream.";
         return false;
       }
+      video_stream_just_created = true;
 
       if (!frame_processor_->AddTrack(FrameProcessor::kVideoTrackId, video_)) {
         DVLOG(1) << "Failed to add video track to frame processor.";
         return false;
       }
     }
 
     success &= video_->UpdateVideoConfig(video_config, media_log_);
+
+    if (video_stream_just_created) {
+      std::string videoBufferSwitchStr =
+          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
+              switches::kMSEVideoBufferSizeLimit);
+      unsigned mseVideoBufferSizeLimit = 0;
+      if (base::StringToUint(videoBufferSwitchStr, &mseVideoBufferSizeLimit) &&
+          mseVideoBufferSizeLimit > 0) {
+        MEDIA_LOG(INFO, media_log_) << "Custom MSE video SourceBuffer size="
+                                    << mseVideoBufferSizeLimit;
+        video_->SetStreamMemoryLimit(mseVideoBufferSizeLimit);
+      }
+    }
   }
 
   typedef StreamParser::TextTrackConfigMap::const_iterator TextConfigItr;
   if (text_stream_map_.empty()) {
     for (TextConfigItr itr = text_configs.begin(); itr != text_configs.end();
          ++itr) {
       ChunkDemuxerStream* const text_stream =
           create_demuxer_stream_cb_.Run(DemuxerStream::TEXT);
       if (!frame_processor_->AddTrack(itr->first, text_stream)) {
         success &= false;
@@ skipping 163 matching lines @@
 
 void MediaSourceState::OnSourceInitDone(
     const StreamParser::InitParameters& params) {
   DCHECK_EQ(state_, PENDING_PARSER_INIT);
   state_ = PARSER_INITIALIZED;
   auto_update_timestamp_offset_ = params.auto_update_timestamp_offset;
   base::ResetAndReturn(&init_cb_).Run(params);
 }
 
 }  // namespace media