Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(245)

Unified Diff: media/mp4/mp4_stream_parser_unittest.cc

Issue 20123002: Add Chromium-side support for SourceBuffer.appendWindowStart and SourceBuffer.appendWindowEnd. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and remove URL in comment to make presubmit happy. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/mp4/mp4_stream_parser.cc ('k') | media/mp4/track_run_iterator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..199dab6218d5366fee7cee3d4fa5d8f8119026ee 100644
--- a/media/mp4/mp4_stream_parser_unittest.cc
+++ b/media/mp4/mp4_stream_parser_unittest.cc
@@ -38,7 +38,6 @@ class MP4StreamParserTest : public testing::Test {
protected:
scoped_ptr<MP4StreamParser> parser_;
- base::TimeDelta segment_start_;
bool configs_received_;
bool AppendData(const uint8* data, size_t length) {
@@ -70,15 +69,22 @@ 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;
}
@@ -102,9 +108,8 @@ class MP4StreamParserTest : public testing::Test {
return scoped_ptr<TextTrack>();
}
- void NewSegmentF(TimeDelta start_dts) {
- DVLOG(1) << "NewSegmentF: " << start_dts.InMilliseconds();
- segment_start_ = start_dts;
+ void NewSegmentF() {
+ DVLOG(1) << "NewSegmentF";
}
void EndOfSegmentF() {
@@ -116,7 +121,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)),
« no previous file with comments | « media/mp4/mp4_stream_parser.cc ('k') | media/mp4/track_run_iterator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698