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

Unified Diff: media/filters/source_buffer_stream_unittest.cc

Issue 222783007: Consider text tracks in the frame processor for new media segments. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/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 3a92732e5fe97f432d7db8d418633d81a9e68aa1..db0186acefbd71b9a72afc02aa695e422a892aa4 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -327,12 +327,8 @@ class SourceBufferStreamTest : public testing::Test {
bool expect_success,
const uint8* data,
int size) {
- if (begin_media_segment)
- stream_->OnNewMediaSegment(starting_position * frame_duration_);
-
- int keyframe_interval = frames_per_second_ / keyframes_per_second_;
-
BufferQueue queue;
+ int keyframe_interval = frames_per_second_ / keyframes_per_second_;
for (int i = 0; i < number_of_buffers; i++) {
int position = starting_position + i;
bool is_keyframe = position % keyframe_interval == 0;
@@ -365,8 +361,14 @@ class SourceBufferStreamTest : public testing::Test {
queue.push_back(buffer);
}
- if (!queue.empty())
+
+ if (!queue.empty()) {
+ if (begin_media_segment)
+ stream_->OnNewMediaSegment(queue.front()->timestamp());
wolenetz 2014/04/02 22:54:45 queue.front() must also be a keyframe, correct? Is
DaleCurtis 2014/04/02 23:02:27 Well the test that is failing this is adding a non
EXPECT_EQ(expect_success, stream_->Append(queue));
+ } else {
+ DCHECK(!begin_media_segment);
+ }
}
// StringToBufferQueue() allows for the generation of StreamParserBuffers from
« media/filters/source_buffer_stream.cc ('K') | « media/filters/source_buffer_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698