Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / media / formats / mp4 / mp4_stream_parser_unittest.cc

diff --git a/src/media/formats/mp4/mp4_stream_parser_unittest.cc b/src/media/formats/mp4/mp4_stream_parser_unittest.cc
index 8805c05..5bcb7ad 100644 (file)
--- a/src/media/formats/mp4/mp4_stream_parser_unittest.cc
+++ b/src/media/formats/mp4/mp4_stream_parser_unittest.cc
@@ -25,14 +25,14 @@ using base::TimeDelta;
 namespace media {
 namespace mp4 {
 
-// TODO(xhwang): Figure out the init data type appropriately once it's spec'ed.
-static const char kMp4InitDataType[] = "video/mp4";
+static const char kCencInitDataType[] = "cenc";
 
 class MP4StreamParserTest : public testing::Test {
  public:
   MP4StreamParserTest()
       : configs_received_(false),
-        lower_bound_(base::TimeDelta::Max()) {
+        lower_bound_(
+            DecodeTimestamp::FromPresentationTime(base::TimeDelta::Max())) {
     std::set<int> audio_object_types;
     audio_object_types.insert(kISO_14496_3);
     parser_.reset(new MP4StreamParser(audio_object_types, false));
@@ -41,7 +41,7 @@ class MP4StreamParserTest : public testing::Test {
  protected:
   scoped_ptr<MP4StreamParser> parser_;
   bool configs_received_;
-  base::TimeDelta lower_bound_;
+  DecodeTimestamp lower_bound_;
 
   bool AppendData(const uint8* data, size_t length) {
     return parser_->Parse(data, length);
@@ -99,17 +99,17 @@ class MP4StreamParserTest : public testing::Test {
 
     // Find the second highest timestamp so that we know what the
     // timestamps on the next set of buffers must be >= than.
-    base::TimeDelta audio = !audio_buffers.empty() ?
-        audio_buffers.back()->GetDecodeTimestamp() : kNoTimestamp();
-    base::TimeDelta video = !video_buffers.empty() ?
-        video_buffers.back()->GetDecodeTimestamp() : kNoTimestamp();
-    base::TimeDelta second_highest_timestamp =
-        (audio == kNoTimestamp() ||
-         (video != kNoTimestamp() && audio > video)) ? video : audio;
+    DecodeTimestamp audio = !audio_buffers.empty() ?
+        audio_buffers.back()->GetDecodeTimestamp() : kNoDecodeTimestamp();
+    DecodeTimestamp video = !video_buffers.empty() ?
+        video_buffers.back()->GetDecodeTimestamp() : kNoDecodeTimestamp();
+    DecodeTimestamp second_highest_timestamp =
+        (audio == kNoDecodeTimestamp() ||
+         (video != kNoDecodeTimestamp() && audio > video)) ? video : audio;
 
-    DCHECK(second_highest_timestamp != kNoTimestamp());
+    DCHECK(second_highest_timestamp != kNoDecodeTimestamp());
 
-    if (lower_bound_ != kNoTimestamp() &&
+    if (lower_bound_ != kNoDecodeTimestamp() &&
         second_highest_timestamp < lower_bound_) {
       return false;
     }
@@ -121,18 +121,19 @@ class MP4StreamParserTest : public testing::Test {
   void KeyNeededF(const std::string& type,
                   const std::vector<uint8>& init_data) {
     DVLOG(1) << "KeyNeededF: " << init_data.size();
-    EXPECT_EQ(kMp4InitDataType, type);
+    EXPECT_EQ(kCencInitDataType, type);
     EXPECT_FALSE(init_data.empty());
   }
 
   void NewSegmentF() {
     DVLOG(1) << "NewSegmentF";
-    lower_bound_ = kNoTimestamp();
+    lower_bound_ = kNoDecodeTimestamp();
   }
 
   void EndOfSegmentF() {
     DVLOG(1) << "EndOfSegmentF()";
-    lower_bound_ = base::TimeDelta::Max();
+    lower_bound_ =
+        DecodeTimestamp::FromPresentationTime(base::TimeDelta::Max());
   }
 
   void InitializeParser() {