MSE: Populate WebM missing duration with DefaultDuration, derived, or default

media/formats/webm/webm_stream_parser.cc

 // Copyright 2014 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/formats/webm/webm_stream_parser.h"
 
 #include <string>
 
 #include "base/callback.h"
 #include "base/callback_helpers.h"
@@ skipping 162 matching lines @@
   bytes_parsed += result;
 
   WebMTracksParser tracks_parser(log_cb_, ignore_text_tracks_);
   result = tracks_parser.Parse(cur, cur_size);
 
   if (result <= 0)
     return result;
 
   bytes_parsed += result;
 
+  double timecode_scale_in_us = info_parser.timecode_scale() / 1000.0;
   base::TimeDelta duration = kInfiniteDuration();
 
   if (info_parser.duration() > 0) {
-    double mult = info_parser.timecode_scale() / 1000.0;
-    int64 duration_in_us = info_parser.duration() * mult;
+    int64 duration_in_us = info_parser.duration() * timecode_scale_in_us;
     duration = base::TimeDelta::FromMicroseconds(duration_in_us);
   }
 
   const AudioDecoderConfig& audio_config = tracks_parser.audio_decoder_config();
   if (audio_config.is_encrypted())
     FireNeedKey(tracks_parser.audio_encryption_key_id());
 
   const VideoDecoderConfig& video_config = tracks_parser.video_decoder_config();
   if (video_config.is_encrypted())
     FireNeedKey(tracks_parser.video_encryption_key_id());
 
   if (!config_cb_.Run(audio_config,
                       video_config,
                       tracks_parser.text_tracks())) {
     DVLOG(1) << "New config data isn't allowed.";
     return -1;
   }
 
+
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
+      tracks_parser.GetAudioDefaultDuration(timecode_scale_in_us),
       tracks_parser.video_track_num(),
+      tracks_parser.GetVideoDefaultDuration(timecode_scale_in_us),
       tracks_parser.text_tracks(),
       tracks_parser.ignored_tracks(),
       tracks_parser.audio_encryption_key_id(),
       tracks_parser.video_encryption_key_id(),
       log_cb_));
 
   ChangeState(kParsingClusters);
 
   if (!init_cb_.is_null())
     base::ResetAndReturn(&init_cb_).Run(true, duration, false);
@@ skipping 36 matching lines @@
   if (bytes_parsed <= 0)
     return bytes_parsed;
 
   // If cluster detected, immediately notify new segment if we have not already
   // done this.
   if (id == kWebMIdCluster && !parsing_cluster_) {
     parsing_cluster_ = true;
     new_segment_cb_.Run();
   }
 
-  const BufferQueue& audio_buffers = cluster_parser_->audio_buffers();
-  const BufferQueue& video_buffers = cluster_parser_->video_buffers();
+  const BufferQueue& audio_buffers = cluster_parser_->GetAudioBuffers();
+  const BufferQueue& video_buffers = cluster_parser_->GetVideoBuffers();
   const TextBufferQueueMap& text_map = cluster_parser_->GetTextBuffers();
+
   bool cluster_ended = cluster_parser_->cluster_ended();
 
   if ((!audio_buffers.empty() || !video_buffers.empty() || !text_map.empty()) &&
       !new_buffers_cb_.Run(audio_buffers, video_buffers, text_map)) {
     return -1;
   }
 
   if (cluster_ended) {
     parsing_cluster_ = false;
     end_of_segment_cb_.Run();
   }
 
   return bytes_parsed;
 }
 
 void WebMStreamParser::FireNeedKey(const std::string& key_id) {
   std::vector<uint8> key_id_vector(key_id.begin(), key_id.end());
   need_key_cb_.Run(kWebMEncryptInitDataType, key_id_vector);
 }
 
 }  // namespace media