From 23730a6e56a168d1879203e4b3819bb36e3d8f1f Mon Sep 17 00:00:00 2001
From: "Torne (Richard Coles)" <torne@google.com>
Date: Fri, 21 Mar 2014 14:25:57 +0000
Subject: Merge from Chromium at DEPS revision 258528

This commit was generated by merge_to_master.py.

Change-Id: Id197cbdde2c2881915f096c0426c741416884783
---
 media/formats/mpeg/adts_stream_parser_unittest.cc  | 32 +++++++++++-----------
 media/formats/mpeg/mp3_stream_parser_unittest.cc   | 32 +++++++++++-----------
 .../formats/mpeg/mpeg_audio_stream_parser_base.cc  |  3 +-
 3 files changed, 34 insertions(+), 33 deletions(-)

(limited to 'media/formats/mpeg')

diff --git a/media/formats/mpeg/adts_stream_parser_unittest.cc b/media/formats/mpeg/adts_stream_parser_unittest.cc
index d0bedbeaac..b9eb0d9c6c 100644
--- a/media/formats/mpeg/adts_stream_parser_unittest.cc
+++ b/media/formats/mpeg/adts_stream_parser_unittest.cc
@@ -22,21 +22,21 @@ TEST_F(ADTSStreamParserTest, UnalignedAppend) {
   const std::string expected =
       "NewSegment"
       "{ 0K }"
-      "{ 23K }"
-      "{ 46K }"
-      "{ 69K }"
-      "{ 92K }"
-      "{ 116K }"
-      "{ 139K }"
-      "{ 162K }"
-      "{ 185K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
       "EndOfSegment"
       "NewSegment"
-      "{ 208K }"
-      "{ 232K }"
-      "{ 255K }"
-      "{ 278K }"
-      "{ 301K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
       "EndOfSegment";
   EXPECT_EQ(expected, ParseFile("sfx.adts", 17));
 }
@@ -47,11 +47,11 @@ TEST_F(ADTSStreamParserTest, UnalignedAppend512) {
   const std::string expected =
       "NewSegment"
       "{ 0K 23K 46K }"
-      "{ 69K 92K 116K 139K 162K }"
-      "{ 185K 208K 232K 255K 278K }"
+      "{ 0K 23K 46K 69K 92K }"
+      "{ 0K 23K 46K 69K 92K }"
       "EndOfSegment"
       "NewSegment"
-      "{ 301K }"
+      "{ 0K }"
       "EndOfSegment";
   EXPECT_EQ(expected, ParseFile("sfx.adts", 512));
 }
diff --git a/media/formats/mpeg/mp3_stream_parser_unittest.cc b/media/formats/mpeg/mp3_stream_parser_unittest.cc
index eefadc5486..85cc129fe1 100644
--- a/media/formats/mpeg/mp3_stream_parser_unittest.cc
+++ b/media/formats/mpeg/mp3_stream_parser_unittest.cc
@@ -22,22 +22,22 @@ TEST_F(MP3StreamParserTest, UnalignedAppend) {
   const std::string expected =
       "NewSegment"
       "{ 0K }"
-      "{ 26K }"
-      "{ 52K }"
-      "{ 78K }"
-      "{ 104K }"
-      "{ 130K }"
-      "{ 156K }"
-      "{ 182K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
       "EndOfSegment"
       "NewSegment"
-      "{ 208K }"
-      "{ 235K }"
-      "{ 261K }"
+      "{ 0K }"
+      "{ 0K }"
+      "{ 0K }"
       "EndOfSegment"
       "NewSegment"
-      "{ 287K }"
-      "{ 313K }"
+      "{ 0K }"
+      "{ 0K }"
       "EndOfSegment";
   EXPECT_EQ(expected, ParseFile("sfx.mp3", 17));
 }
@@ -48,12 +48,12 @@ TEST_F(MP3StreamParserTest, UnalignedAppend512) {
   const std::string expected =
       "NewSegment"
       "{ 0K }"
-      "{ 26K 52K 78K 104K }"
+      "{ 0K 26K 52K 78K }"
       "EndOfSegment"
       "NewSegment"
-      "{ 130K 156K 182K }"
-      "{ 208K 235K 261K 287K }"
-      "{ 313K }"
+      "{ 0K 26K 52K }"
+      "{ 0K 26K 52K 78K }"
+      "{ 0K }"
       "EndOfSegment";
   EXPECT_EQ(expected, ParseFile("sfx.mp3", 512));
 }
diff --git a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
index ba3cbd9377..aaf6a50bb3 100644
--- a/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
+++ b/media/formats/mpeg/mpeg_audio_stream_parser_base.cc
@@ -208,7 +208,7 @@ int MPEGAudioStreamParserBase::ParseFrame(const uint8* data,
     bool success = config_cb_.Run(config_, video_config, TextTrackConfigMap());
 
     if (!init_cb_.is_null())
-      base::ResetAndReturn(&init_cb_).Run(success, kInfiniteDuration());
+      base::ResetAndReturn(&init_cb_).Run(success, kInfiniteDuration(), true);
 
     if (!success)
       return -1;
@@ -393,6 +393,7 @@ bool MPEGAudioStreamParserBase::SendBuffers(BufferQueue* buffers,
     end_of_segment_cb_.Run();
   }
 
+  timestamp_helper_->SetBaseTimestamp(base::TimeDelta());
   return true;
 }
 
-- 
cgit v1.2.3