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

Unified Diff: media/renderers/audio_renderer_impl_unittest.cc

Issue 1409123005: Add methods for telling V8 how much memory audio/video is using. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix html viewer. Created 5 years, 2 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/renderers/audio_renderer_impl.cc ('k') | media/renderers/video_renderer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/renderers/audio_renderer_impl_unittest.cc
diff --git a/media/renderers/audio_renderer_impl_unittest.cc b/media/renderers/audio_renderer_impl_unittest.cc
index 2367c420f4a79c3fd4aef687c31ea83897be9930..d26c0d817785b90678ff6cd84988e3cad0a565cf 100644
--- a/media/renderers/audio_renderer_impl_unittest.cc
+++ b/media/renderers/audio_renderer_impl_unittest.cc
@@ -113,7 +113,10 @@ class AudioRendererImplTest : public ::testing::Test {
.WillOnce(DoAll(SaveArg<2>(&output_cb_), RunCallback<1>(false)));
}
- MOCK_METHOD1(OnStatistics, void(const PipelineStatistics&));
+ void OnStatistics(const PipelineStatistics& stats) {
+ last_statistics_.audio_memory_usage += stats.audio_memory_usage;
+ }
+
MOCK_METHOD1(OnBufferingStateChange, void(BufferingState));
MOCK_METHOD1(OnError, void(PipelineStatus));
MOCK_METHOD0(OnWaitingForDecryptionKey, void(void));
@@ -276,6 +279,8 @@ class AudioRendererImplTest : public ::testing::Test {
base::Bind(base::ResetAndReturn(&decode_cb_), AudioDecoder::kOk));
base::RunLoop().RunUntilIdle();
+ EXPECT_EQ(last_statistics_.audio_memory_usage,
+ renderer_->algorithm_->GetMemoryUsage());
}
// Delivers frames until |renderer_|'s internal buffer is full and no longer
@@ -359,6 +364,7 @@ class AudioRendererImplTest : public ::testing::Test {
scoped_refptr<FakeAudioRendererSink> sink_;
AudioHardwareConfig hardware_config_;
base::SimpleTestTickClock* tick_clock_;
+ PipelineStatistics last_statistics_;
private:
void DecodeDecoder(const scoped_refptr<DecoderBuffer>& buffer,
@@ -393,6 +399,7 @@ class AudioRendererImplTest : public ::testing::Test {
void DeliverBuffer(AudioDecoder::Status status,
const scoped_refptr<AudioBuffer>& buffer) {
CHECK(!decode_cb_.is_null());
+
if (buffer.get() && !buffer->end_of_stream())
output_cb_.Run(buffer);
base::ResetAndReturn(&decode_cb_).Run(status);
« no previous file with comments | « media/renderers/audio_renderer_impl.cc ('k') | media/renderers/video_renderer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698