Cap the memory usage in FFMpegDemuxer.

media/filters/ffmpeg_demuxer.cc

Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 0dec8b8822229cadc076436b04304c0209a1fbfb..6d134adbbbc4da1e9b7eeb0cd954b15a94eee13b 100644
--- a/media/filters/ffmpeg_demuxer.cc
+++ b/media/filters/ffmpeg_demuxer.cc
@@ -323,6 +323,10 @@ bool FFmpegDemuxerStream::HasAvailableCapacity() {
   return buffer_queue_.IsEmpty() || buffer_queue_.Duration() < kCapacity;
 }
 
+size_t FFmpegDemuxerStream::MemoryUsage() const {

[DaleCurtis, 2014/02/19 20:56:21]

You can declare this inline as memory_usage() if you prefer.

[damienv1, 2014/02/19 22:07:28]

Prefer to keep the current approach (similar to HasAvailableCapacity).

+  return buffer_queue_.data_size();
+}
+
 TextKind FFmpegDemuxerStream::GetTextKind() const {
   DCHECK_EQ(type_, DemuxerStream::TEXT);
 
@@ -353,6 +357,9 @@ base::TimeDelta FFmpegDemuxerStream::ConvertStreamTimestamp(
   return ConvertFromTimeBase(time_base, timestamp);
 }
 
+// Max allowed memory usage, all streams combined.
+static const size_t kDemuxerMemoryLimit = 150 * 1024 * 1024;

[DaleCurtis, 2014/02/19 20:56:21]

Since this is only used in one spot, just stick it down below inside the
function using it.

[damienv1, 2014/02/19 22:07:28]

Done.

+
 //
 // FFmpegDemuxer
 //
@@ -800,7 +807,10 @@ void FFmpegDemuxer::OnReadFrameDone(ScopedAVPacket packet, int result) {
     return;
   }
 
-  if (result < 0) {
+  // Consider the stream as ended if:
+  // - either underlying ffmpeg returned an error
+  // - or FFMpegDemuxer reached the maximum allowed memory usage.
+  if (result < 0 || IsMaxMemoryUsageReached()) {
     // Update the duration based on the highest elapsed time across all streams
     // if it was previously unknown.
     if (!duration_known_) {
@@ -907,6 +917,22 @@ bool FFmpegDemuxer::StreamsHaveAvailableCapacity() {
   return false;
 }
 
+bool FFmpegDemuxer::IsMaxMemoryUsageReached() const {
+  DCHECK(task_runner_->BelongsToCurrentThread());
+  size_t memory_left = kDemuxerMemoryLimit;
+  for (StreamVector::const_iterator iter = streams_.begin();
+       iter != streams_.end(); ++iter) {
+    if (!(*iter))
+      continue;
+
+    size_t stream_memory_usage = (*iter)->MemoryUsage();
+    if (stream_memory_usage > memory_left)
+      return true;
+    memory_left -= stream_memory_usage;
+  }
+  return false;
+}
+
 void FFmpegDemuxer::StreamHasEnded() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   StreamVector::iterator iter;