Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / media / formats / common / stream_parser_test_base.cc

diff --git a/src/media/formats/common/stream_parser_test_base.cc b/src/media/formats/common/stream_parser_test_base.cc
index abe7cf9..1d5f4b9 100644 (file)
--- a/src/media/formats/common/stream_parser_test_base.cc
+++ b/src/media/formats/common/stream_parser_test_base.cc
@@ -29,31 +29,33 @@ static std::string BufferQueueToString(
 
 StreamParserTestBase::StreamParserTestBase(
     scoped_ptr<StreamParser> stream_parser)
-    : parser_(stream_parser.Pass()) {}
+    : parser_(stream_parser.Pass()) {
+  parser_->Init(
+      base::Bind(&StreamParserTestBase::OnInitDone, base::Unretained(this)),
+      base::Bind(&StreamParserTestBase::OnNewConfig, base::Unretained(this)),
+      base::Bind(&StreamParserTestBase::OnNewBuffers, base::Unretained(this)),
+      true,
+      base::Bind(&StreamParserTestBase::OnKeyNeeded, base::Unretained(this)),
+      base::Bind(&StreamParserTestBase::OnNewSegment, base::Unretained(this)),
+      base::Bind(&StreamParserTestBase::OnEndOfSegment, base::Unretained(this)),
+      LogCB());
+}
 
 StreamParserTestBase::~StreamParserTestBase() {}
 
 std::string StreamParserTestBase::ParseFile(const std::string& filename,
                                             int append_bytes) {
   results_stream_.clear();
-  InitializeParser();
-
   scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(filename);
   EXPECT_TRUE(
       AppendDataInPieces(buffer->data(), buffer->data_size(), append_bytes));
   return results_stream_.str();
 }
 
-void StreamParserTestBase::InitializeParser() {
-  parser_->Init(
-      base::Bind(&StreamParserTestBase::OnInitDone, base::Unretained(this)),
-      base::Bind(&StreamParserTestBase::OnNewConfig, base::Unretained(this)),
-      base::Bind(&StreamParserTestBase::OnNewBuffers, base::Unretained(this)),
-      true,
-      base::Bind(&StreamParserTestBase::OnKeyNeeded, base::Unretained(this)),
-      base::Bind(&StreamParserTestBase::OnNewSegment, base::Unretained(this)),
-      base::Bind(&StreamParserTestBase::OnEndOfSegment, base::Unretained(this)),
-      LogCB());
+std::string StreamParserTestBase::ParseData(const uint8* data, size_t length) {
+  results_stream_.clear();
+  EXPECT_TRUE(AppendDataInPieces(data, length, length));
+  return results_stream_.str();
 }
 
 bool StreamParserTestBase::AppendDataInPieces(const uint8* data,
@@ -70,13 +72,13 @@ bool StreamParserTestBase::AppendDataInPieces(const uint8* data,
   return true;
 }
 
-void StreamParserTestBase::OnInitDone(bool success,
-                                      base::TimeDelta duration,
-                                      bool auto_update_timestamp_offset) {
-  EXPECT_TRUE(auto_update_timestamp_offset);
+void StreamParserTestBase::OnInitDone(
+    bool success,
+    const StreamParser::InitParameters& params) {
+  EXPECT_TRUE(params.auto_update_timestamp_offset);
   DVLOG(1) << __FUNCTION__ << "(" << success << ", "
-           << duration.InMilliseconds() << ", " << auto_update_timestamp_offset
-           << ")";
+           << params.duration.InMilliseconds() << ", "
+           << params.auto_update_timestamp_offset << ")";
 }
 
 bool StreamParserTestBase::OnNewConfig(
@@ -87,6 +89,7 @@ bool StreamParserTestBase::OnNewConfig(
            << video_config.IsValidConfig() << ")";
   EXPECT_TRUE(audio_config.IsValidConfig());
   EXPECT_FALSE(video_config.IsValidConfig());
+  last_audio_config_ = audio_config;
   return true;
 }