Update WebMClusterParser to compute durations for all StreamParserBuffers.

media/webm/webm_tracks_parser.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/webm/webm_tracks_parser.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
+#include "media/base/buffers.h"
 #include "media/webm/webm_constants.h"
 #include "media/webm/webm_content_encodings.h"
 
 namespace media {
 
 // Values for TrackType element.
 static const int kWebMTrackTypeVideo = 1;
 static const int kWebMTrackTypeAudio = 2;
 
 WebMTracksParser::WebMTracksParser(int64 timecode_scale)
     : timecode_scale_(timecode_scale),
       track_type_(-1),
       track_num_(-1),
       track_default_duration_(-1),
       audio_track_num_(-1),
-      video_track_num_(-1) {
+      audio_default_duration_(kNoTimestamp()),
+      video_track_num_(-1),
+      video_default_duration_(kNoTimestamp()) {
 }
 
 WebMTracksParser::~WebMTracksParser() {}
 
 const uint8* WebMTracksParser::video_encryption_key_id() const {
   if (!video_content_encodings_client_.get())
     return NULL;
 
   DCHECK(!video_content_encodings_client_->content_encodings().empty());
   return video_content_encodings_client_->content_encodings()[0]->
       encryption_key_id();
 }
 
 int WebMTracksParser::video_encryption_key_id_size() const {
   if (!video_content_encodings_client_.get())
     return 0;
 
   DCHECK(!video_content_encodings_client_->content_encodings().empty());
   return video_content_encodings_client_->content_encodings()[0]->
       encryption_key_id_size();
 }
 
 int WebMTracksParser::Parse(const uint8* buf, int size) {
   track_type_ =-1;
   track_num_ = -1;
   track_default_duration_ = -1;
   audio_track_num_ = -1;
-  audio_default_duration_ = base::TimeDelta();
+  audio_default_duration_ = kNoTimestamp();
   video_track_num_ = -1;
-  video_default_duration_ = base::TimeDelta();
+  video_default_duration_ = kNoTimestamp();
 
   WebMListParser parser(kWebMIdTracks, this);
   int result = parser.Parse(buf, size);
 
   if (result <= 0)
     return result;
 
   // For now we do all or nothing parsing.
   return parser.IsParsingComplete() ? result : 0;
 }
@@ skipping 23 matching lines @@
   }
 
   if (id == kWebMIdTrackEntry) {
     if (track_type_ == -1 || track_num_ == -1) {
       DVLOG(1) << "Missing TrackEntry data"
                << " TrackType " << track_type_
                << " TrackNum " << track_num_;
       return false;
     }
 
-    base::TimeDelta default_duration;
+    base::TimeDelta default_duration = kNoTimestamp();
 
     if (track_default_duration_ > 0) {
       // Convert nanoseconds to base::TimeDelta.
       default_duration = base::TimeDelta::FromMicroseconds(
           track_default_duration_ / 1000.0);
     }
 
     if (track_type_ == kWebMTrackTypeVideo) {
       video_track_num_ = track_num_;
       video_default_duration_ = default_duration;
@@ skipping 59 matching lines @@
 bool WebMTracksParser::OnString(int id, const std::string& str) {
   if (id == kWebMIdCodecID && str != "A_VORBIS" && str != "V_VP8") {
     DVLOG(1) << "Unexpected CodecID " << str;
     return false;
   }
 
   return true;
 }
 
 }  // namespace media