Index: media/base/decoder_buffer_unittest.cc |
diff --git a/media/base/decoder_buffer_unittest.cc b/media/base/decoder_buffer_unittest.cc |
index 42551a48a3bbeb019f6f55e7fb73d874e3c147f9..c5a03b78450e0f4f7ab9eee029c6acb0f2619dee 100644 |
--- a/media/base/decoder_buffer_unittest.cc |
+++ b/media/base/decoder_buffer_unittest.cc |
@@ -10,19 +10,19 @@ namespace media { |
TEST(DecoderBufferTest, Constructors) { |
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(0)); |
- EXPECT_TRUE(buffer->GetData()); |
- EXPECT_EQ(0, buffer->GetDataSize()); |
- EXPECT_FALSE(buffer->IsEndOfStream()); |
+ EXPECT_TRUE(buffer->data()); |
+ EXPECT_EQ(0, buffer->data_size()); |
+ EXPECT_FALSE(buffer->end_of_stream()); |
const int kTestSize = 10; |
scoped_refptr<DecoderBuffer> buffer3(new DecoderBuffer(kTestSize)); |
ASSERT_TRUE(buffer3.get()); |
- EXPECT_EQ(kTestSize, buffer3->GetDataSize()); |
+ EXPECT_EQ(kTestSize, buffer3->data_size()); |
} |
TEST(DecoderBufferTest, CreateEOSBuffer) { |
scoped_refptr<DecoderBuffer> buffer(DecoderBuffer::CreateEOSBuffer()); |
- EXPECT_TRUE(buffer->IsEndOfStream()); |
+ EXPECT_TRUE(buffer->end_of_stream()); |
} |
TEST(DecoderBufferTest, CopyFrom) { |
@@ -31,21 +31,21 @@ TEST(DecoderBufferTest, CopyFrom) { |
scoped_refptr<DecoderBuffer> buffer2(DecoderBuffer::CopyFrom( |
reinterpret_cast<const uint8*>(&kData), kDataSize)); |
ASSERT_TRUE(buffer2.get()); |
- EXPECT_NE(kData, buffer2->GetData()); |
- EXPECT_EQ(buffer2->GetDataSize(), kDataSize); |
- EXPECT_EQ(0, memcmp(buffer2->GetData(), kData, kDataSize)); |
- EXPECT_FALSE(buffer2->IsEndOfStream()); |
+ EXPECT_NE(kData, buffer2->data()); |
+ EXPECT_EQ(buffer2->data_size(), kDataSize); |
+ EXPECT_EQ(0, memcmp(buffer2->data(), kData, kDataSize)); |
+ EXPECT_FALSE(buffer2->end_of_stream()); |
scoped_refptr<DecoderBuffer> buffer3(DecoderBuffer::CopyFrom( |
reinterpret_cast<const uint8*>(&kData), kDataSize, |
reinterpret_cast<const uint8*>(&kData), kDataSize)); |
ASSERT_TRUE(buffer3.get()); |
- EXPECT_NE(kData, buffer3->GetData()); |
- EXPECT_EQ(buffer3->GetDataSize(), kDataSize); |
- EXPECT_EQ(0, memcmp(buffer3->GetData(), kData, kDataSize)); |
- EXPECT_NE(kData, buffer3->GetSideData()); |
- EXPECT_EQ(buffer3->GetSideDataSize(), kDataSize); |
- EXPECT_EQ(0, memcmp(buffer3->GetSideData(), kData, kDataSize)); |
- EXPECT_FALSE(buffer3->IsEndOfStream()); |
+ EXPECT_NE(kData, buffer3->data()); |
+ EXPECT_EQ(buffer3->data_size(), kDataSize); |
+ EXPECT_EQ(0, memcmp(buffer3->data(), kData, kDataSize)); |
+ EXPECT_NE(kData, buffer3->side_data()); |
+ EXPECT_EQ(buffer3->side_data_size(), kDataSize); |
+ EXPECT_EQ(0, memcmp(buffer3->side_data(), kData, kDataSize)); |
+ EXPECT_FALSE(buffer3->end_of_stream()); |
} |
#if !defined(OS_ANDROID) |
@@ -58,20 +58,20 @@ TEST(DecoderBufferTest, PaddingAlignment) { |
// Padding data should always be zeroed. |
for(int i = 0; i < DecoderBuffer::kPaddingSize; i++) |
- EXPECT_EQ((buffer2->GetData() + kDataSize)[i], 0); |
+ EXPECT_EQ((buffer2->data() + kDataSize)[i], 0); |
// If the data is padded correctly we should be able to read and write past |
// the end of the data by DecoderBuffer::kPaddingSize bytes without crashing |
// or Valgrind/ASAN throwing errors. |
const uint8 kFillChar = 0xFF; |
memset( |
- buffer2->GetWritableData() + kDataSize, kFillChar, |
+ buffer2->writable_data() + kDataSize, kFillChar, |
DecoderBuffer::kPaddingSize); |
for(int i = 0; i < DecoderBuffer::kPaddingSize; i++) |
- EXPECT_EQ((buffer2->GetData() + kDataSize)[i], kFillChar); |
+ EXPECT_EQ((buffer2->data() + kDataSize)[i], kFillChar); |
EXPECT_EQ(0u, reinterpret_cast<uintptr_t>( |
- buffer2->GetData()) & (DecoderBuffer::kAlignmentSize - 1)); |
+ buffer2->data()) & (DecoderBuffer::kAlignmentSize - 1)); |
} |
#endif |
@@ -82,19 +82,19 @@ TEST(DecoderBufferTest, ReadingWriting) { |
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(kDataSize)); |
ASSERT_TRUE(buffer.get()); |
- uint8* data = buffer->GetWritableData(); |
+ uint8* data = buffer->writable_data(); |
ASSERT_TRUE(data); |
- ASSERT_EQ(kDataSize, buffer->GetDataSize()); |
+ ASSERT_EQ(kDataSize, buffer->data_size()); |
memcpy(data, kData, kDataSize); |
- const uint8* read_only_data = buffer->GetData(); |
+ const uint8* read_only_data = buffer->data(); |
ASSERT_EQ(data, read_only_data); |
ASSERT_EQ(0, memcmp(read_only_data, kData, kDataSize)); |
- EXPECT_FALSE(buffer->IsEndOfStream()); |
+ EXPECT_FALSE(buffer->end_of_stream()); |
} |
TEST(DecoderBufferTest, GetDecryptConfig) { |
scoped_refptr<DecoderBuffer> buffer(new DecoderBuffer(0)); |
- EXPECT_FALSE(buffer->GetDecryptConfig()); |
+ EXPECT_FALSE(buffer->decrypt_config()); |
} |
} // namespace media |