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

Unified Diff: media/filters/ffmpeg_demuxer.cc

Issue 164233005: Cap the memory usage in FFMpegDemuxer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert to IsMaxMemoryUsage api style in FFMpegDemuxer. 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
« media/filters/ffmpeg_demuxer.h ('K') | « media/filters/ffmpeg_demuxer.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/ffmpeg_demuxer.cc
diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
index 0dec8b8822229cadc076436b04304c0209a1fbfb..b2e88257b11d35ddc1292b5d4423b4175eeabc88 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;
}
+int FFmpegDemuxerStream::MemoryUsage() const {
+ 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 int kDemuxerMemoryLimit = 150 * 1024 * 1024;
+
//
// 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());
+ int memory_left = kDemuxerMemoryLimit;
+ for (StreamVector::const_iterator iter = streams_.begin();
+ iter != streams_.end(); ++iter) {
+ if (!(*iter))
+ continue;
+
+ int 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;
« media/filters/ffmpeg_demuxer.h ('K') | « media/filters/ffmpeg_demuxer.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698