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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2076673005: MSE: Plumb ChunkDemuxer appendData failures into append Error algorithm (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the layout test Created 4 years, 6 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/chunk_demuxer_unittest.cc ('k') | third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-errors.html » ('j') | third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-errors.html » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/test/pipeline_integration_test.cc
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index f3830b8f3da75e502f2a2cd5a07fb0b6ddde5383..f5026abbce5e97a3da4aad68eda17b14e4187773 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -548,19 +548,21 @@ class MockMediaSource {
DCHECK_LT(current_position_, file_data_->data_size());
DCHECK_LE(current_position_ + size, file_data_->data_size());
- chunk_demuxer_->AppendData(
+ ASSERT_TRUE(chunk_demuxer_->AppendData(
kSourceId, file_data_->data() + current_position_, size,
- base::TimeDelta(), kInfiniteDuration(), &last_timestamp_offset_);
+ base::TimeDelta(), kInfiniteDuration(), &last_timestamp_offset_));
current_position_ += size;
}
- void AppendAtTime(base::TimeDelta timestamp_offset,
+ bool AppendAtTime(base::TimeDelta timestamp_offset,
const uint8_t* pData,
int size) {
CHECK(!chunk_demuxer_->IsParsingMediaSegment(kSourceId));
- chunk_demuxer_->AppendData(kSourceId, pData, size, base::TimeDelta(),
- kInfiniteDuration(), &timestamp_offset);
+ bool success =
+ chunk_demuxer_->AppendData(kSourceId, pData, size, base::TimeDelta(),
+ kInfiniteDuration(), &timestamp_offset);
last_timestamp_offset_ = timestamp_offset;
+ return success;
}
void AppendAtTimeWithWindow(base::TimeDelta timestamp_offset,
@@ -569,8 +571,9 @@ class MockMediaSource {
const uint8_t* pData,
int size) {
CHECK(!chunk_demuxer_->IsParsingMediaSegment(kSourceId));
- chunk_demuxer_->AppendData(kSourceId, pData, size, append_window_start,
- append_window_end, &timestamp_offset);
+ ASSERT_TRUE(
+ chunk_demuxer_->AppendData(kSourceId, pData, size, append_window_start,
+ append_window_end, &timestamp_offset));
last_timestamp_offset_ = timestamp_offset;
}
@@ -1191,8 +1194,9 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_WebM) {
EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(640, 360))).Times(1);
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-640x360.webm");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_TRUE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
Play();
@@ -1253,7 +1257,8 @@ TEST_F(PipelineIntegrationTest, MediaSource_FillUp_Buffer) {
// Ask MediaSource to evict buffered data if buffering limit has been
// reached (the data will be evicted from the front of the buffered range).
source.EvictCodedFrames(media_time, file->data_size());
- source.AppendAtTime(media_time, file->data(), file->data_size());
+ ASSERT_TRUE(
+ source.AppendAtTime(media_time, file->data(), file->data_size()));
message_loop_.RunUntilIdle();
buffered_ranges = pipeline_->GetBufferedTimeRanges();
@@ -1276,8 +1281,9 @@ TEST_F(PipelineIntegrationTest,
EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(640, 360))).Times(1);
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-640x360-av_enc-av.webm");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_TRUE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
Play();
@@ -1304,8 +1310,9 @@ TEST_F(PipelineIntegrationTest,
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-640x360-av_enc-av.webm");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_FALSE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
@@ -1336,8 +1343,9 @@ TEST_F(PipelineIntegrationTest,
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-640x360.webm");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_FALSE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
@@ -1554,8 +1562,9 @@ TEST_F(PipelineIntegrationTest, MediaSource_ConfigChange_MP4) {
EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(1280, 720))).Times(1);
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-1280x720-av_frag.mp4");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_TRUE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
Play();
@@ -1581,8 +1590,9 @@ TEST_F(PipelineIntegrationTest,
EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(1280, 720))).Times(1);
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_TRUE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
Play();
@@ -1609,8 +1619,9 @@ TEST_F(PipelineIntegrationTest,
EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(1280, 720))).Times(1);
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-1280x720-v_frag-cenc-key_rotation.mp4");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_TRUE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
Play();
@@ -1638,8 +1649,9 @@ TEST_F(PipelineIntegrationTest,
EXPECT_CALL(*this, OnVideoNaturalSizeChange(gfx::Size(1280, 720))).Times(1);
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-1280x720-v_frag-cenc.mp4");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_FALSE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
@@ -1670,8 +1682,9 @@ TEST_F(PipelineIntegrationTest,
scoped_refptr<DecoderBuffer> second_file =
ReadTestDataFile("bear-1280x720-av_frag.mp4");
- source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
- second_file->data(), second_file->data_size());
+ ASSERT_FALSE(source.AppendAtTime(base::TimeDelta::FromSeconds(kAppendTimeSec),
+ second_file->data(),
+ second_file->data_size()));
source.EndOfStream();
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-errors.html » ('j') | third_party/WebKit/LayoutTests/http/tests/media/media-source/mediasource-errors.html » ('J')

Powered by Google App Engine
This is Rietveld 408576698