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

Unified Diff: media/mp4/mp4_stream_parser_unittest.cc

Issue 17408005: Refactored DecoderBuffer to use unix_hacker_style naming. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@localrefactor
Patch Set: 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/tools/demuxer_bench/demuxer_bench.cc » ('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 c271a8028dcdcd04bd2a3cff403e0b75df2064be..07697a5f87db6d36f5b70a3c8c2d40355119c93f 100644
--- a/media/mp4/mp4_stream_parser_unittest.cc
+++ b/media/mp4/mp4_stream_parser_unittest.cc
@@ -75,9 +75,9 @@ class MP4StreamParserTest : public testing::Test {
for (StreamParser::BufferQueue::const_iterator buf = bufs.begin();
buf != bufs.end(); buf++) {
DVLOG(3) << " n=" << buf - bufs.begin()
- << ", size=" << (*buf)->GetDataSize()
- << ", dur=" << (*buf)->GetDuration().InMilliseconds();
- EXPECT_GE((*buf)->GetTimestamp(), segment_start_);
+ << ", size=" << (*buf)->data_size()
+ << ", dur=" << (*buf)->duration().InMilliseconds();
+ EXPECT_GE((*buf)->timestamp(), segment_start_);
}
return true;
}
@@ -131,8 +131,8 @@ class MP4StreamParserTest : public testing::Test {
InitializeParser();
scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(filename);
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
- buffer->GetDataSize(),
+ EXPECT_TRUE(AppendDataInPieces(buffer->data(),
+ buffer->data_size(),
append_bytes));
return true;
}
@@ -161,10 +161,10 @@ TEST_F(MP4StreamParserTest, TestFlush) {
scoped_refptr<DecoderBuffer> buffer =
ReadTestDataFile("bear-1280x720-av_frag.mp4");
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData(), 65536, 512));
+ EXPECT_TRUE(AppendDataInPieces(buffer->data(), 65536, 512));
parser_->Flush();
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
- buffer->GetDataSize(),
+ EXPECT_TRUE(AppendDataInPieces(buffer->data(),
+ buffer->data_size(),
512));
}
@@ -173,11 +173,11 @@ TEST_F(MP4StreamParserTest, TestReinitialization) {
scoped_refptr<DecoderBuffer> buffer =
ReadTestDataFile("bear-1280x720-av_frag.mp4");
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
- buffer->GetDataSize(),
+ EXPECT_TRUE(AppendDataInPieces(buffer->data(),
+ buffer->data_size(),
512));
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
- buffer->GetDataSize(),
+ EXPECT_TRUE(AppendDataInPieces(buffer->data(),
+ buffer->data_size(),
512));
}
@@ -194,14 +194,14 @@ TEST_F(MP4StreamParserTest, TestNoMoovAfterFlush) {
scoped_refptr<DecoderBuffer> buffer =
ReadTestDataFile("bear-1280x720-av_frag.mp4");
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData(),
- buffer->GetDataSize(),
+ EXPECT_TRUE(AppendDataInPieces(buffer->data(),
+ buffer->data_size(),
512));
parser_->Flush();
const int kFirstMoofOffset = 1307;
- EXPECT_TRUE(AppendDataInPieces(buffer->GetData() + kFirstMoofOffset,
- buffer->GetDataSize() - kFirstMoofOffset,
+ EXPECT_TRUE(AppendDataInPieces(buffer->data() + kFirstMoofOffset,
+ buffer->data_size() - kFirstMoofOffset,
512));
}
« no previous file with comments | « media/mp4/mp4_stream_parser.cc ('k') | media/tools/demuxer_bench/demuxer_bench.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698