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

Unified Diff: media/base/decoder_buffer_queue_unittest.cc

Issue 164233005: Cap the memory usage in FFMpegDemuxer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments from patch set #8. Created 6 years, 10 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/base/decoder_buffer_queue.cc ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/decoder_buffer_queue_unittest.cc
diff --git a/media/base/decoder_buffer_queue_unittest.cc b/media/base/decoder_buffer_queue_unittest.cc
index 32e62db06b1dc79a0efbf9e69f337a88b435c643..5eb06d2152dcc1d4247ccf7ccb202fd3e8ca2676 100644
--- a/media/base/decoder_buffer_queue_unittest.cc
+++ b/media/base/decoder_buffer_queue_unittest.cc
@@ -25,6 +25,13 @@ static scoped_refptr<DecoderBuffer> CreateBuffer(int timestamp) {
return buffer;
}
+static scoped_refptr<DecoderBuffer> CreateBuffer(int timestamp, int size) {
+ scoped_refptr<DecoderBuffer> buffer = new DecoderBuffer(size);
+ buffer->set_timestamp(ToTimeDelta(timestamp));
+ buffer->set_duration(ToTimeDelta(0));
+ return buffer;
+}
+
TEST(DecoderBufferQueueTest, IsEmpty) {
DecoderBufferQueue queue;
EXPECT_TRUE(queue.IsEmpty());
@@ -135,4 +142,28 @@ TEST(DecoderBufferQueueTest, Duration_NoTimestamp) {
EXPECT_EQ(0, queue.Duration().InSeconds());
}
+TEST(DecoderBufferQueueTest, DataSize) {
+ DecoderBufferQueue queue;
+ EXPECT_EQ(queue.data_size(), 0u);
+
+ queue.Push(CreateBuffer(0, 1200u));
+ EXPECT_EQ(queue.data_size(), 1200u);
+
+ queue.Push(CreateBuffer(1, 1000u));
+ EXPECT_EQ(queue.data_size(), 2200u);
+
+ queue.Pop();
+ EXPECT_EQ(queue.data_size(), 1000u);
+
+ queue.Push(CreateBuffer(2, 999u));
+ queue.Push(CreateBuffer(3, 999u));
+ EXPECT_EQ(queue.data_size(), 2998u);
+
+ queue.Clear();
+ EXPECT_EQ(queue.data_size(), 0u);
+
+ queue.Push(CreateBuffer(4, 1400u));
+ EXPECT_EQ(queue.data_size(), 1400u);
+}
+
} // namespace media
« no previous file with comments | « media/base/decoder_buffer_queue.cc ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698