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

Unified Diff: media/base/seekable_buffer_unittest.cc

Issue 2140001: Removed PushSource::Packet. SeekableBuffer.current_time() fixed to return (Closed)
Patch Set: - Created 10 years, 7 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
Index: media/base/seekable_buffer_unittest.cc
diff --git a/media/base/seekable_buffer_unittest.cc b/media/base/seekable_buffer_unittest.cc
index 72e193362aeecb50161f39f144c3bedf530d64a2..286580bf88d8004d3468a489ce437eca8f49def8 100644
--- a/media/base/seekable_buffer_unittest.cc
+++ b/media/base/seekable_buffer_unittest.cc
@@ -291,6 +291,9 @@ TEST_F(SeekableBufferTest, AllMethods) {
TEST_F(SeekableBufferTest, GetTime) {
+ const base::TimeDelta kInvalidTimestamp =
+ media::StreamSample::kInvalidTimestamp;
+
const struct {
int64 first_time_useconds;
int64 duration_useconds;
@@ -298,15 +301,15 @@ TEST_F(SeekableBufferTest, GetTime) {
int64 expected_time;
} tests[] = {
// Timestamps of 0 are treated as garbage.
- { 0, 1000000, 0, 0 },
- { 0, 4000000, 0, 0 },
- { 0, 8000000, 0, 0 },
- { 0, 1000000, 4, 0 },
- { 0, 4000000, 4, 0 },
- { 0, 8000000, 4, 0 },
- { 0, 1000000, kWriteSize, 0 },
- { 0, 4000000, kWriteSize, 0 },
- { 0, 8000000, kWriteSize, 0 },
+ { 0, 1000000, 0, kInvalidTimestamp.ToInternalValue() },
+ { 0, 4000000, 0, kInvalidTimestamp.ToInternalValue() },
+ { 0, 8000000, 0, kInvalidTimestamp.ToInternalValue() },
+ { 0, 1000000, 4, kInvalidTimestamp.ToInternalValue() },
+ { 0, 4000000, 4, kInvalidTimestamp.ToInternalValue() },
+ { 0, 8000000, 4, kInvalidTimestamp.ToInternalValue() },
+ { 0, 1000000, kWriteSize, kInvalidTimestamp.ToInternalValue() },
+ { 0, 4000000, kWriteSize, kInvalidTimestamp.ToInternalValue() },
+ { 0, 8000000, kWriteSize, kInvalidTimestamp.ToInternalValue() },
{ 5, 1000000, 0, 5 },
{ 5, 4000000, 0, 5 },
{ 5, 8000000, 0, 5 },
@@ -318,6 +321,10 @@ TEST_F(SeekableBufferTest, GetTime) {
{ 5, 8000000, kWriteSize, 8000005 },
};
+ // current_time() must initially return kInvalidTimestamp.
+ EXPECT_EQ(kInvalidTimestamp.ToInternalValue(),
+ buffer_.current_time().ToInternalValue());
+
scoped_refptr<media::DataBuffer> buffer = new media::DataBuffer(kWriteSize);
memcpy(buffer->GetWritableData(), data_, kWriteSize);
buffer->SetDataSize(kWriteSize);

Powered by Google App Engine
This is Rietveld 408576698