diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /media/base/decoder_buffer_unittest.cc | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'media/base/decoder_buffer_unittest.cc')
| -rw-r--r-- | media/base/decoder_buffer_unittest.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/media/base/decoder_buffer_unittest.cc b/media/base/decoder_buffer_unittest.cc index 32c38d011d..7880a80f6c 100644 --- a/media/base/decoder_buffer_unittest.cc +++ b/media/base/decoder_buffer_unittest.cc @@ -35,6 +35,17 @@ TEST(DecoderBufferTest, CopyFrom) { EXPECT_EQ(buffer2->GetDataSize(), kDataSize); EXPECT_EQ(0, memcmp(buffer2->GetData(), kData, kDataSize)); EXPECT_FALSE(buffer2->IsEndOfStream()); + scoped_refptr<DecoderBuffer> buffer3(DecoderBuffer::CopyFrom( + reinterpret_cast<const uint8*>(&kData), kDataSize, + reinterpret_cast<const uint8*>(&kData), kDataSize)); + ASSERT_TRUE(buffer3); + 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()); } #if !defined(OS_ANDROID) |