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

Unified Diff: media/filters/source_buffer_stream_unittest.cc

Issue 213283003: Move splice frame setting to ChunkDemuxer(). Disable for now. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Default off everywhere. 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
« no previous file with comments | « media/filters/source_buffer_stream.cc ('k') | no next file » | 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 a41fb9c6f726497a9a479c9fa6a2b3fa54f4f8bb..8ad3389f29c8fa4a672186ea0975c5bba1fbabd0 100644
--- a/media/filters/source_buffer_stream_unittest.cc
+++ b/media/filters/source_buffer_stream_unittest.cc
@@ -35,7 +35,7 @@ class SourceBufferStreamTest : public testing::Test {
: accurate_durations_(false) {
video_config_ = TestVideoConfig::Normal();
SetStreamInfo(kDefaultFramesPerSecond, kDefaultKeyframesPerSecond);
- stream_.reset(new SourceBufferStream(video_config_, log_cb()));
+ stream_.reset(new SourceBufferStream(video_config_, log_cb(), true));
}
void SetMemoryLimit(int buffers_of_data) {
@@ -51,7 +51,7 @@ class SourceBufferStreamTest : public testing::Test {
void SetTextStream() {
video_config_ = TestVideoConfig::Invalid();
TextTrackConfig config(kTextSubtitles, "", "", "");
- stream_.reset(new SourceBufferStream(config, LogCB()));
+ stream_.reset(new SourceBufferStream(config, LogCB(), true));
SetStreamInfo(2, 2);
}
@@ -65,7 +65,7 @@ class SourceBufferStreamTest : public testing::Test {
NULL,
0,
false);
- stream_.reset(new SourceBufferStream(config, LogCB()));
+ stream_.reset(new SourceBufferStream(config, LogCB(), true));
// Equivalent to 2ms per frame.
SetStreamInfo(500, 500);
@@ -3195,7 +3195,7 @@ TEST_F(SourceBufferStreamTest, SameTimestamp_Video_Overlap_3) {
TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) {
AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
44100, NULL, 0, false);
- stream_.reset(new SourceBufferStream(config, log_cb()));
+ stream_.reset(new SourceBufferStream(config, log_cb(), true));
Seek(0);
NewSegmentAppend("0K 0K 30K 30 60 60");
CheckExpectedBuffers("0K 0K 30K 30 60 60");
@@ -3204,7 +3204,7 @@ TEST_F(SourceBufferStreamTest, SameTimestamp_Audio) {
TEST_F(SourceBufferStreamTest, SameTimestamp_Audio_Invalid_1) {
AudioDecoderConfig config(kCodecMP3, kSampleFormatF32, CHANNEL_LAYOUT_STEREO,
44100, NULL, 0, false);
- stream_.reset(new SourceBufferStream(config, log_cb()));
+ stream_.reset(new SourceBufferStream(config, log_cb(), true));
Seek(0);
NewSegmentAppend_ExpectFailure("0K 30 30K 60");
}
« no previous file with comments | « media/filters/source_buffer_stream.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698