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

Unified Diff: media/filters/source_buffer_stream_unittest.cc

Issue 10696182: Add config change handling to SourceBufferStream & ChunkDemuxer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added copyright headers to manifest files Created 8 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/filters/source_buffer_stream.cc ('k') | media/test/data/bear-320x240-manifest.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/source_buffer_stream_unittest.cc
diff --git a/media/filters/source_buffer_stream_unittest.cc b/media/filters/source_buffer_stream_unittest.cc
index 310af0159b2c0c27ef4fd5727577afd2a4f6bb96..35161c1c1a54e788d55f90d17b2e736ff6531bd6 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -115,7 +115,7 @@ class SourceBufferStreamTest : public testing::Test {
int current_position = starting_position;
for (; current_position <= ending_position; current_position++) {
scoped_refptr<StreamParserBuffer> buffer;
- if (!stream_->GetNextBuffer(&buffer))
+ if (stream_->GetNextBuffer(&buffer) == SourceBufferStream::kNeedBuffer)
break;
if (expect_keyframe && current_position == starting_position)
@@ -139,7 +139,7 @@ class SourceBufferStreamTest : public testing::Test {
void CheckNoNextBuffer() {
scoped_refptr<StreamParserBuffer> buffer;
- EXPECT_FALSE(stream_->GetNextBuffer(&buffer));
+ EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kNeedBuffer);
}
base::TimeDelta frame_duration() const { return frame_duration_; }
@@ -1163,7 +1163,7 @@ TEST_F(SourceBufferStreamTest, Seek_StartOfSegment) {
scoped_refptr<StreamParserBuffer> buffer;
// GetNextBuffer() should return the next buffer at position (5 + |bump|).
- EXPECT_TRUE(stream_->GetNextBuffer(&buffer));
+ EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
EXPECT_EQ(buffer->GetDecodeTimestamp(), 5 * frame_duration() + bump);
// Check rest of buffers.
@@ -1177,7 +1177,7 @@ TEST_F(SourceBufferStreamTest, Seek_StartOfSegment) {
NewSegmentAppend_OffsetFirstBuffer(15, 5, bump);
// GetNextBuffer() should return the next buffer at position (15 + |bump|).
- EXPECT_TRUE(stream_->GetNextBuffer(&buffer));
+ EXPECT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
EXPECT_EQ(buffer->GetDecodeTimestamp(), 15 * frame_duration() + bump);
// Check rest of buffers.
@@ -1509,7 +1509,7 @@ TEST_F(SourceBufferStreamTest, PresentationTimestampIndependence) {
// Check for IBB...BBP pattern.
for (int i = 0; i < 20; i++) {
scoped_refptr<StreamParserBuffer> buffer;
- ASSERT_TRUE(stream_->GetNextBuffer(&buffer));
+ ASSERT_EQ(stream_->GetNextBuffer(&buffer), SourceBufferStream::kSuccess);
if (buffer->IsKeyframe()) {
EXPECT_EQ(buffer->GetTimestamp(), buffer->GetDecodeTimestamp());
« no previous file with comments | « media/filters/source_buffer_stream.cc ('k') | media/test/data/bear-320x240-manifest.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698