Remove default duration logic from WebM parsing code.

BUG=130313
TEST=WebMClusterParserTest*


Review URL: https://chromiumcodereview.appspot.com/10440093

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139615 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 8 insertions, 60 deletions

diff --git a/media/webm/webm_cluster_parser.cc b/media/webm/webm_cluster_parser.cc
index 67ae9a7..6cbd71d 100644
--- a/media/webm/webm_cluster_parser.cc
+++ b/media/webm/webm_cluster_parser.cc
@@ -13,9 +13,7 @@ namespace media {
 
 WebMClusterParser::WebMClusterParser(int64 timecode_scale,
                                      int audio_track_num,
-                                     base::TimeDelta audio_default_duration,
                                      int video_track_num,
-                                     base::TimeDelta video_default_duration,
                                      const uint8* video_encryption_key_id,
                                      int video_encryption_key_id_size)
     : timecode_multiplier_(timecode_scale / 1000.0),
@@ -25,8 +23,8 @@ WebMClusterParser::WebMClusterParser(int64 timecode_scale,
       block_data_size_(-1),
       block_duration_(-1),
       cluster_timecode_(-1),
-      audio_(audio_track_num, audio_default_duration),
-      video_(video_track_num, video_default_duration) {
+      audio_(audio_track_num),
+      video_(video_track_num) {
   CHECK_GE(video_encryption_key_id_size, 0);
   if (video_encryption_key_id_size > 0) {
     video_encryption_key_id_.reset(new uint8[video_encryption_key_id_size]);
@@ -217,10 +215,8 @@ bool WebMClusterParser::OnBlock(int track_num, int timecode,
   return false;
 }
 
-WebMClusterParser::Track::Track(int track_num,
-                                base::TimeDelta default_duration)
-    : track_num_(track_num),
-      default_duration_(default_duration) {
+WebMClusterParser::Track::Track(int track_num)
+    : track_num_(track_num) {
 }
 
 WebMClusterParser::Track::~Track() {}
diff --git a/media/webm/webm_cluster_parser.h b/media/webm/webm_cluster_parser.h
index 851f95c..159fd38 100644
--- a/media/webm/webm_cluster_parser.h
+++ b/media/webm/webm_cluster_parser.h
@@ -21,9 +21,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
 
   WebMClusterParser(int64 timecode_scale,
                     int audio_track_num,
-                    base::TimeDelta audio_default_duration,
                     int video_track_num,
-                    base::TimeDelta video_default_duration,
                     const uint8* video_encryption_key_id,
                     int video_encryption_key_id_size);
   virtual ~WebMClusterParser();
@@ -45,7 +43,7 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
   // Helper class that manages per-track state.
   class Track {
    public:
-    Track(int track_num, base::TimeDelta default_duration);
+    explicit Track(int track_num);
     ~Track();
 
     int track_num() const { return track_num_; }
@@ -61,7 +59,6 @@ class MEDIA_EXPORT WebMClusterParser : public WebMParserClient {
 
    private:
     int track_num_;
-    base::TimeDelta default_duration_;
     BufferQueue buffers_;
     scoped_refptr<StreamParserBuffer> delayed_buffer_;
   };
diff --git a/media/webm/webm_cluster_parser_unittest.cc b/media/webm/webm_cluster_parser_unittest.cc
index 96586d1..7ed6c6c 100644
--- a/media/webm/webm_cluster_parser_unittest.cc
+++ b/media/webm/webm_cluster_parser_unittest.cc
@@ -19,17 +19,8 @@ enum {
   kTimecodeScale = 1000000,  // Timecode scale for millisecond timestamps.
   kAudioTrackNum = 1,
   kVideoTrackNum = 2,
-  kVideoDefaultDurationInMs = 33,
 };
 
-static base::TimeDelta kAudioDefaultDuration() {
-  return kNoTimestamp();
-}
-
-static base::TimeDelta kVideoDefaultDuration() {
-  return base::TimeDelta::FromMilliseconds(kVideoDefaultDurationInMs);
-}
-
 struct BlockInfo {
   int track_num;
   int timestamp;
@@ -133,9 +124,7 @@ class WebMClusterParserTest  : public testing::Test {
   WebMClusterParserTest()
       : parser_(new WebMClusterParser(kTimecodeScale,
                                       kAudioTrackNum,
-                                      kAudioDefaultDuration(),
                                       kVideoTrackNum,
-                                      kVideoDefaultDuration(),
                                       NULL, 0)) {
   }
 
@@ -244,11 +233,9 @@ TEST_F(WebMClusterParserTest, ParseSimpleBlockAndBlockGroupMixture) {
   const BlockInfo kBlockInfo[] = {
     { kAudioTrackNum, 0, 23, true },
     { kAudioTrackNum, 23, 23, false },
-    { kVideoTrackNum, kVideoDefaultDurationInMs, kVideoDefaultDurationInMs,
-      true },
+    { kVideoTrackNum, 33, 34, true },
     { kAudioTrackNum, 46, 23, false },
-    { kVideoTrackNum, 2 * kVideoDefaultDurationInMs, 34,
-      false },
+    { kVideoTrackNum, 67, 33, false },
   };
   int block_count = arraysize(kBlockInfo);
   scoped_ptr<Cluster> cluster(CreateCluster(0, kBlockInfo, block_count));
diff --git a/media/webm/webm_stream_parser.cc b/media/webm/webm_stream_parser.cc
index 8596368..bd03148 100644
--- a/media/webm/webm_stream_parser.cc
+++ b/media/webm/webm_stream_parser.cc
@@ -349,9 +349,7 @@ int WebMStreamParser::ParseInfoAndTracks(const uint8* data, int size) {
   cluster_parser_.reset(new WebMClusterParser(
       info_parser.timecode_scale(),
       tracks_parser.audio_track_num(),
-      tracks_parser.audio_default_duration(),
       tracks_parser.video_track_num(),
-      tracks_parser.video_default_duration(),
       tracks_parser.video_encryption_key_id(),
       tracks_parser.video_encryption_key_id_size()));
 
diff --git a/media/webm/webm_tracks_parser.cc b/media/webm/webm_tracks_parser.cc
index d7ab5af..77cb0d0 100644
--- a/media/webm/webm_tracks_parser.cc
+++ b/media/webm/webm_tracks_parser.cc
@@ -20,11 +20,8 @@ WebMTracksParser::WebMTracksParser(int64 timecode_scale)
     : timecode_scale_(timecode_scale),
       track_type_(-1),
       track_num_(-1),
-      track_default_duration_(-1),
       audio_track_num_(-1),
-      audio_default_duration_(kNoTimestamp()),
-      video_track_num_(-1),
-      video_default_duration_(kNoTimestamp()) {
+      video_track_num_(-1) {
 }
 
 WebMTracksParser::~WebMTracksParser() {}
@@ -50,11 +47,8 @@ int WebMTracksParser::video_encryption_key_id_size() const {
 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_ = kNoTimestamp();
   video_track_num_ = -1;
-  video_default_duration_ = kNoTimestamp();
 
   WebMListParser parser(kWebMIdTracks, this);
   int result = parser.Parse(buf, size);
@@ -77,7 +71,6 @@ WebMParserClient* WebMTracksParser::OnListStart(int id) {
   if (id == kWebMIdTrackEntry) {
     track_type_ = -1;
     track_num_ = -1;
-    track_default_duration_ = -1;
     return this;
   }
 
@@ -98,24 +91,14 @@ bool WebMTracksParser::OnListEnd(int id) {
       return false;
     }
 
-    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;
       if (track_content_encodings_client_.get()) {
         video_content_encodings_client_ =
             track_content_encodings_client_.Pass();
       }
     } else if (track_type_ == kWebMTrackTypeAudio) {
       audio_track_num_ = track_num_;
-      audio_default_duration_ = default_duration;
       if (track_content_encodings_client_.get()) {
         audio_content_encodings_client_ =
             track_content_encodings_client_.Pass();
@@ -144,9 +127,6 @@ bool WebMTracksParser::OnUInt(int id, int64 val) {
     case kWebMIdTrackType:
       dst = &track_type_;
       break;
-    case kWebMIdDefaultDuration:
-      dst = &track_default_duration_;
-      break;
     default:
       return true;
   }
diff --git a/media/webm/webm_tracks_parser.h b/media/webm/webm_tracks_parser.h
index db2c928..8b8cb32 100644
--- a/media/webm/webm_tracks_parser.h
+++ b/media/webm/webm_tracks_parser.h
@@ -27,14 +27,7 @@ class WebMTracksParser : public WebMParserClient {
   int Parse(const uint8* buf, int size);
 
   int64 audio_track_num() const { return audio_track_num_; }
-  base::TimeDelta audio_default_duration() const {
-    return audio_default_duration_;
-  }
-
   int64 video_track_num() const { return video_track_num_; }
-  base::TimeDelta video_default_duration() const {
-    return video_default_duration_;
-  }
 
   const uint8* video_encryption_key_id() const;
   int video_encryption_key_id_size() const;
@@ -52,15 +45,12 @@ class WebMTracksParser : public WebMParserClient {
 
   int64 track_type_;
   int64 track_num_;
-  int64 track_default_duration_;
   scoped_ptr<WebMContentEncodingsClient> track_content_encodings_client_;
 
   int64 audio_track_num_;
-  base::TimeDelta audio_default_duration_;
   scoped_ptr<WebMContentEncodingsClient> audio_content_encodings_client_;
 
   int64 video_track_num_;
-  base::TimeDelta video_default_duration_;
   scoped_ptr<WebMContentEncodingsClient> video_content_encodings_client_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebMTracksParser);