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

Unified Diff: media/filters/audio_renderer_base_unittest.cc

Issue 164403: Implemented end-of-stream callback for media::PipelineImpl. (Closed)
Patch Set: Baz Created 11 years, 4 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/audio_renderer_base.cc ('k') | media/filters/video_renderer_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_base_unittest.cc
diff --git a/media/filters/audio_renderer_base_unittest.cc b/media/filters/audio_renderer_base_unittest.cc
index cf2856b535a5605c74a371a8337c17174ceaa01d..c5e55c1f81c3b1425d753157fc0385037b007396 100644
--- a/media/filters/audio_renderer_base_unittest.cc
+++ b/media/filters/audio_renderer_base_unittest.cc
@@ -176,12 +176,14 @@ TEST_F(AudioRendererBaseTest, OneCompleteReadCycle) {
// Now satisfy the read requests. Our callback should be executed after
// exiting this loop.
const size_t kDataSize = 1024;
+ size_t bytes_buffered = 0;
while (!read_queue_.empty()) {
scoped_refptr<DataBuffer> buffer = new DataBuffer(kDataSize);
buffer->SetDataSize(kDataSize);
read_queue_.front()->Run(buffer);
delete read_queue_.front();
read_queue_.pop_front();
+ bytes_buffered += kDataSize;
}
MockFilterCallback play_callback;
@@ -198,6 +200,7 @@ TEST_F(AudioRendererBaseTest, OneCompleteReadCycle) {
for (size_t i = 0; i < kMaxQueueSize; ++i) {
EXPECT_EQ(kDataSize,
renderer_->FillBuffer(buffer, kDataSize, base::TimeDelta()));
+ bytes_buffered -= kDataSize;
}
// Make sure the read request queue is full.
@@ -209,8 +212,26 @@ TEST_F(AudioRendererBaseTest, OneCompleteReadCycle) {
delete read_queue_.front();
read_queue_.pop_front();
+ // We shouldn't report ended until all data has been flushed out.
+ EXPECT_FALSE(renderer_->HasEnded());
+
// We should have one less read request in the queue.
EXPECT_EQ(kMaxQueueSize - 1, read_queue_.size());
+
+ // Flush the entire internal buffer, which should notify the host we've ended.
+ EXPECT_EQ(0u, bytes_buffered % kDataSize);
+ EXPECT_CALL(host_, NotifyEnded());
+ while (bytes_buffered > 0) {
+ EXPECT_EQ(kDataSize,
+ renderer_->FillBuffer(buffer, kDataSize, base::TimeDelta()));
+ bytes_buffered -= kDataSize;
+ }
+
+ // We should now report ended.
+ EXPECT_TRUE(renderer_->HasEnded());
+
+ // Further reads should return muted audio and not notify any more.
+ EXPECT_EQ(0u, renderer_->FillBuffer(buffer, kDataSize, base::TimeDelta()));
}
} // namespace media
« no previous file with comments | « media/filters/audio_renderer_base.cc ('k') | media/filters/video_renderer_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698