Index: media/mp4/mp4_stream_parser_unittest.cc |
diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/mp4/mp4_stream_parser_unittest.cc |
index 07697a5f87db6d36f5b70a3c8c2d40355119c93f..7adc9e55787ee9fd957c02830da5032f694c6c53 100644 |
--- a/media/mp4/mp4_stream_parser_unittest.cc |
+++ b/media/mp4/mp4_stream_parser_unittest.cc |
@@ -70,15 +70,23 @@ class MP4StreamParserTest : public testing::Test { |
return true; |
} |
- bool NewBuffersF(const StreamParser::BufferQueue& bufs) { |
- DVLOG(2) << "NewBuffersF: " << bufs.size() << " buffers"; |
- for (StreamParser::BufferQueue::const_iterator buf = bufs.begin(); |
- buf != bufs.end(); buf++) { |
- DVLOG(3) << " n=" << buf - bufs.begin() |
+ |
+ void DumpBuffers(const std::string& label, |
+ const StreamParser::BufferQueue& buffers) { |
+ DVLOG(2) << "DumpBuffers: " << label << " size " << buffers.size(); |
+ for (StreamParser::BufferQueue::const_iterator buf = buffers.begin(); |
+ buf != buffers.end(); buf++) { |
+ DVLOG(3) << " n=" << buf - buffers.begin() |
<< ", size=" << (*buf)->data_size() |
<< ", dur=" << (*buf)->duration().InMilliseconds(); |
EXPECT_GE((*buf)->timestamp(), segment_start_); |
} |
+ } |
+ |
+ bool NewBuffersF(const StreamParser::BufferQueue& audio_buffers, |
+ const StreamParser::BufferQueue& video_buffers) { |
+ DumpBuffers("audio_buffers", audio_buffers); |
+ DumpBuffers("video_buffers", video_buffers); |
return true; |
} |
@@ -116,7 +124,6 @@ class MP4StreamParserTest : public testing::Test { |
base::Bind(&MP4StreamParserTest::InitF, base::Unretained(this)), |
base::Bind(&MP4StreamParserTest::NewConfigF, base::Unretained(this)), |
base::Bind(&MP4StreamParserTest::NewBuffersF, base::Unretained(this)), |
- base::Bind(&MP4StreamParserTest::NewBuffersF, base::Unretained(this)), |
base::Bind(&MP4StreamParserTest::NewTextBuffersF, |
base::Unretained(this)), |
base::Bind(&MP4StreamParserTest::KeyNeededF, base::Unretained(this)), |