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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/filters/chunk_demuxer_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, 6 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
« media/base/decoder_buffer_unittest.cc ('K') | « media/filters/chunk_demuxer.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | media/filters/ffmpeg_demuxer_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 54285effbdf39b19bdea2f313878bcc5148a0324..77056fbb32d11893757ed7cfc7f73a45ed3f00e8 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -88,18 +88,18 @@ static void WriteInt64(uint8* buffer, int64 number) {
}
MATCHER_P(HasTimestamp, timestamp_in_ms, "") {
- return arg.get() && !arg->IsEndOfStream() &&
- arg->GetTimestamp().InMilliseconds() == timestamp_in_ms;
+ return arg.get() && !arg->is_end_of_stream() &&
+ arg->get_timestamp().InMilliseconds() == timestamp_in_ms;
}
-MATCHER(IsEndOfStream, "") { return arg.get() && arg->IsEndOfStream(); }
+MATCHER(is_end_of_stream, "") { return arg.get() && arg->is_end_of_stream(); }
static void OnReadDone(const base::TimeDelta& expected_time,
bool* called,
DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
EXPECT_EQ(status, DemuxerStream::kOk);
- EXPECT_EQ(expected_time, buffer->GetTimestamp());
+ EXPECT_EQ(expected_time, buffer->get_timestamp());
*called = true;
}
@@ -115,7 +115,7 @@ static void OnReadDone_EOSExpected(bool* called,
DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
EXPECT_EQ(status, DemuxerStream::kOk);
- EXPECT_TRUE(buffer->IsEndOfStream());
+ EXPECT_TRUE(buffer->is_end_of_stream());
*called = true;
}
@@ -184,33 +184,33 @@ class ChunkDemuxerTest : public testing::Test {
if (has_audio) {
audio_track_entry = ReadTestDataFile("webm_vorbis_track_entry");
- tracks_element_size += audio_track_entry->GetDataSize();
+ tracks_element_size += audio_track_entry->get_data_size();
if (is_audio_encrypted) {
audio_content_encodings = ReadTestDataFile("webm_content_encodings");
- tracks_element_size += audio_content_encodings->GetDataSize();
+ tracks_element_size += audio_content_encodings->get_data_size();
}
}
if (has_video) {
video_track_entry = ReadTestDataFile("webm_vp8_track_entry");
- tracks_element_size += video_track_entry->GetDataSize();
+ tracks_element_size += video_track_entry->get_data_size();
if (is_video_encrypted) {
video_content_encodings = ReadTestDataFile("webm_content_encodings");
- tracks_element_size += video_content_encodings->GetDataSize();
+ tracks_element_size += video_content_encodings->get_data_size();
}
}
- *size = ebml_header->GetDataSize() + info->GetDataSize() +
+ *size = ebml_header->get_data_size() + info->get_data_size() +
kTracksHeaderSize + tracks_element_size;
buffer->reset(new uint8[*size]);
uint8* buf = buffer->get();
- memcpy(buf, ebml_header->GetData(), ebml_header->GetDataSize());
- buf += ebml_header->GetDataSize();
+ memcpy(buf, ebml_header->get_data(), ebml_header->get_data_size());
+ buf += ebml_header->get_data_size();
- memcpy(buf, info->GetData(), info->GetDataSize());
- buf += info->GetDataSize();
+ memcpy(buf, info->get_data(), info->get_data_size());
+ buf += info->get_data_size();
memcpy(buf, kTracksHeader, kTracksHeaderSize);
WriteInt64(buf + kTracksSizeOffset, tracks_element_size);
@@ -219,35 +219,35 @@ class ChunkDemuxerTest : public testing::Test {
// TODO(xhwang): Simplify this! Probably have test data files that contain
// ContentEncodings directly instead of trying to create one at run-time.
if (has_audio) {
- memcpy(buf, audio_track_entry->GetData(),
- audio_track_entry->GetDataSize());
+ memcpy(buf, audio_track_entry->get_data(),
+ audio_track_entry->get_data_size());
if (is_audio_encrypted) {
- memcpy(buf + audio_track_entry->GetDataSize(),
- audio_content_encodings->GetData(),
- audio_content_encodings->GetDataSize());
+ memcpy(buf + audio_track_entry->get_data_size(),
+ audio_content_encodings->get_data(),
+ audio_content_encodings->get_data_size());
WriteInt64(buf + kAudioTrackSizeOffset,
- audio_track_entry->GetDataSize() +
- audio_content_encodings->GetDataSize() -
+ audio_track_entry->get_data_size() +
+ audio_content_encodings->get_data_size() -
kAudioTrackEntryHeaderSize);
- buf += audio_content_encodings->GetDataSize();
+ buf += audio_content_encodings->get_data_size();
}
- buf += audio_track_entry->GetDataSize();
+ buf += audio_track_entry->get_data_size();
}
if (has_video) {
- memcpy(buf, video_track_entry->GetData(),
- video_track_entry->GetDataSize());
+ memcpy(buf, video_track_entry->get_data(),
+ video_track_entry->get_data_size());
if (is_video_encrypted) {
- memcpy(buf + video_track_entry->GetDataSize(),
- video_content_encodings->GetData(),
- video_content_encodings->GetDataSize());
+ memcpy(buf + video_track_entry->get_data_size(),
+ video_content_encodings->get_data(),
+ video_content_encodings->get_data_size());
WriteInt64(buf + kVideoTrackSizeOffset,
- video_track_entry->GetDataSize() +
- video_content_encodings->GetDataSize() -
+ video_track_entry->get_data_size() +
+ video_content_encodings->get_data_size() -
kVideoTrackEntryHeaderSize);
- buf += video_content_encodings->GetDataSize();
+ buf += video_content_encodings->get_data_size();
}
- buf += video_track_entry->GetDataSize();
+ buf += video_track_entry->get_data_size();
}
}
@@ -434,7 +434,7 @@ class ChunkDemuxerTest : public testing::Test {
return false;
// Append the whole bear1 file.
- AppendData(bear1->GetData(), bear1->GetDataSize());
+ AppendData(bear1->get_data(), bear1->get_data_size());
CheckExpectedRanges(kSourceId, "{ [0,2737) }");
// Append initialization segment for bear2.
@@ -443,16 +443,16 @@ class ChunkDemuxerTest : public testing::Test {
// media/test/data/bear-320x240-manifest.js which were
// generated from media/test/data/bear-640x360.webm and
// media/test/data/bear-320x240.webm respectively.
- AppendData(bear2->GetData(), 4340);
+ AppendData(bear2->get_data(), 4340);
// Append a media segment that goes from [0.527000, 1.014000).
- AppendData(bear2->GetData() + 55290, 18785);
+ AppendData(bear2->get_data() + 55290, 18785);
CheckExpectedRanges(kSourceId, "{ [0,1028) [1201,2737) }");
// Append initialization segment for bear1 & fill gap with [779-1197)
// segment.
- AppendData(bear1->GetData(), 4370);
- AppendData(bear1->GetData() + 72737, 28183);
+ AppendData(bear1->get_data(), 4370);
+ AppendData(bear1->get_data() + 72737, 28183);
CheckExpectedRanges(kSourceId, "{ [0,2737) }");
demuxer_->EndOfStream(PIPELINE_OK);
@@ -679,13 +679,13 @@ class ChunkDemuxerTest : public testing::Test {
stream->Read(base::Bind(&ChunkDemuxerTest::StoreStatusAndBuffer,
base::Unretained(this), status, &buffer));
base::MessageLoop::current()->RunUntilIdle();
- if (*status == DemuxerStream::kOk && !buffer->IsEndOfStream())
- *last_timestamp = buffer->GetTimestamp();
- } while (*status == DemuxerStream::kOk && !buffer->IsEndOfStream());
+ if (*status == DemuxerStream::kOk && !buffer->is_end_of_stream())
+ *last_timestamp = buffer->get_timestamp();
+ } while (*status == DemuxerStream::kOk && !buffer->is_end_of_stream());
}
void ExpectEndOfStream(DemuxerStream::Type type) {
- EXPECT_CALL(*this, ReadDone(DemuxerStream::kOk, IsEndOfStream()));
+ EXPECT_CALL(*this, ReadDone(DemuxerStream::kOk, is_end_of_stream()));
demuxer_->GetStream(type)->Read(base::Bind(
&ChunkDemuxerTest::ReadDone, base::Unretained(this)));
message_loop_.RunUntilIdle();
@@ -739,7 +739,7 @@ class ChunkDemuxerTest : public testing::Test {
// Read a WebM file into memory and send the data to the demuxer.
scoped_refptr<DecoderBuffer> buffer = ReadTestDataFile(filename);
- AppendDataInPieces(buffer->GetData(), buffer->GetDataSize(), 512);
+ AppendDataInPieces(buffer->get_data(), buffer->get_data_size(), 512);
// Verify that the timestamps on the first few packets match what we
// expect.
@@ -1167,7 +1167,7 @@ class EndOfStreamHelper {
DemuxerStream::Status status,
const scoped_refptr<DecoderBuffer>& buffer) {
EXPECT_EQ(status, DemuxerStream::kOk);
- EXPECT_TRUE(buffer->IsEndOfStream());
+ EXPECT_TRUE(buffer->is_end_of_stream());
*called = true;
}
« media/base/decoder_buffer_unittest.cc ('K') | « media/filters/chunk_demuxer.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | media/filters/ffmpeg_demuxer_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698