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

Unified Diff: media/blink/multibuffer_data_source_unittest.cc

Issue 2910553002: fully cache small audio/video (Closed)
Patch Set: comment added Created 3 years, 7 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/blink/multibuffer_data_source.cc ('k') | media/blink/resource_multibuffer_data_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/blink/multibuffer_data_source_unittest.cc
diff --git a/media/blink/multibuffer_data_source_unittest.cc b/media/blink/multibuffer_data_source_unittest.cc
index 90a6cea7ae16d287639939a6b6d0434a321cf5aa..1ade72939d986510477c94390c1c12712e7d3e13 100644
--- a/media/blink/multibuffer_data_source_unittest.cc
+++ b/media/blink/multibuffer_data_source_unittest.cc
@@ -239,14 +239,15 @@ class MultibufferDataSourceTest : public testing::Test {
void InitializeWithCORS(const char* url,
bool expected,
- UrlData::CORSMode cors_mode) {
+ UrlData::CORSMode cors_mode,
+ size_t file_size = kFileSize) {
GURL gurl(url);
data_source_.reset(new MockMultibufferDataSource(
gurl, cors_mode, message_loop_.task_runner(), url_index_,
view_->MainFrame()->ToWebLocalFrame(), &host_));
data_source_->SetPreload(preload_);
- response_generator_.reset(new TestResponseGenerator(gurl, kFileSize));
+ response_generator_.reset(new TestResponseGenerator(gurl, file_size));
EXPECT_CALL(*this, OnInitialize(expected));
data_source_->Initialize(base::Bind(
&MultibufferDataSourceTest::OnInitialize, base::Unretained(this)));
@@ -256,8 +257,10 @@ class MultibufferDataSourceTest : public testing::Test {
EXPECT_EQ(data_source_->downloading(), false);
}
- void Initialize(const char* url, bool expected) {
- InitializeWithCORS(url, expected, UrlData::CORS_UNSPECIFIED);
+ void Initialize(const char* url,
+ bool expected,
+ size_t file_size = kFileSize) {
+ InitializeWithCORS(url, expected, UrlData::CORS_UNSPECIFIED, file_size);
}
// Helper to initialize tests with a valid 200 response.
@@ -272,8 +275,8 @@ class MultibufferDataSourceTest : public testing::Test {
}
// Helper to initialize tests with a valid 206 response.
- void InitializeWith206Response() {
- Initialize(kHttpUrl, true);
+ void InitializeWith206Response(size_t file_size = kFileSize) {
+ Initialize(kHttpUrl, true, file_size);
EXPECT_CALL(host_, SetTotalBytes(response_generator_->content_length()));
Respond(response_generator_->Generate206(0));
@@ -1515,7 +1518,7 @@ TEST_F(MultibufferDataSourceTest, EtagTest) {
}
TEST_F(MultibufferDataSourceTest, CheckBufferSizes) {
- InitializeWith206Response();
+ InitializeWith206Response(1 << 30); // 1 gb
data_source_->SetBitrate(1 << 20); // 1 mbit / s
base::RunLoop().RunUntilIdle();
@@ -1563,6 +1566,28 @@ TEST_F(MultibufferDataSourceTest, CheckBufferSizes) {
EXPECT_EQ(71 << 20, buffer_size());
}
+TEST_F(MultibufferDataSourceTest, CheckBufferSizeForSmallFiles) {
+ InitializeWith206Response();
+
+ data_source_->SetBitrate(1 << 20); // 1 mbit / s
+ base::RunLoop().RunUntilIdle();
+ EXPECT_EQ(1 << 20, data_source_bitrate());
+ EXPECT_EQ(2 << 20, preload_low());
+ EXPECT_EQ(3 << 20, preload_high());
+ EXPECT_EQ(25 << 20, max_buffer_forward());
+ EXPECT_EQ(kFileSize * 2, max_buffer_backward());
+ EXPECT_EQ(5013504 /* file size rounted up to blocks size */, buffer_size());
+
+ data_source_->SetBitrate(80 << 20); // 80 mbit / s
+ base::RunLoop().RunUntilIdle();
+ EXPECT_EQ(80 << 20, data_source_bitrate());
+ EXPECT_EQ(50 << 20, preload_low());
+ EXPECT_EQ(51 << 20, preload_high());
+ EXPECT_EQ(51 << 20, max_buffer_forward());
+ EXPECT_EQ(20 << 20, max_buffer_backward());
+ EXPECT_EQ(5013504 /* file size rounted up to blocks size */, buffer_size());
+}
+
// Provoke an edge case where the loading state may not end up transitioning
// back to "idle" when we're done loading.
TEST_F(MultibufferDataSourceTest, Http_CheckLoadingTransition) {
« no previous file with comments | « media/blink/multibuffer_data_source.cc ('k') | media/blink/resource_multibuffer_data_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698