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

Unified Diff: media/filters/pipeline_integration_test.cc

Issue 196173002: MSE: Lift timestampOffset and appendWindow[Start,End] storage to WebSourceBufferImpl (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/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 86e661fc11cc927d6747d6ce86d52e7215b956f1..eddf00e924a553df282d8fb2b367150a625267be 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -300,16 +300,20 @@ class MockMediaSource {
// TODO(wolenetz): Test timestamp offset updating once "sequence" append
// mode processing is implemented. See http://crbug.com/249422.
+ base::TimeDelta timestamp_offset;
chunk_demuxer_->AppendData(
- kSourceId, file_data_->data() + current_position_, size, NULL);
+ kSourceId, file_data_->data() + current_position_, size,
+ base::TimeDelta(), kInfiniteDuration(), &timestamp_offset);
current_position_ += size;
}
void AppendAtTime(const base::TimeDelta& timestampOffset,
const uint8* pData, int size) {
- CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, timestampOffset));
- chunk_demuxer_->AppendData(kSourceId, pData, size, NULL);
- CHECK(chunk_demuxer_->SetTimestampOffset(kSourceId, base::TimeDelta()));
+ base::TimeDelta timestamp_offset = timestampOffset;
+ CHECK(!chunk_demuxer_->IsParsingMediaSegment(kSourceId));
+ chunk_demuxer_->AppendData(kSourceId, pData, size,
+ base::TimeDelta(), kInfiniteDuration(),
+ &timestamp_offset);
}
void EndOfStream() {
« media/filters/chunk_demuxer_unittest.cc ('K') | « media/filters/chunk_demuxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698