Chromium Code Reviews| Index: media/filters/ffmpeg_demuxer.cc |
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc |
| index bc6ae8c96a62d60741bdf9a5cbc8e7b034052fe2..96a411c7053edcc7d1f9db954ec09e1f9283f060 100644 |
| --- a/media/filters/ffmpeg_demuxer.cc |
| +++ b/media/filters/ffmpeg_demuxer.cc |
| @@ -481,6 +481,25 @@ VideoRotation FFmpegDemuxerStream::video_rotation() { |
| return video_rotation_; |
| } |
| +size_t FFmpegDemuxerStream::GetMemoryLimit() const { |
| + // TODO(servolk): Implement better memory limit control for FFMpegDemuxer, |
| + // currently is has a hard-coded limit of 150Mb across all streams (see |
|
wolenetz
2015/06/16 23:17:17
nit: s/is/it/
servolk
2015/06/16 23:27:07
Done.
|
| + // IsMaxMemoryUsageReached and crbug.com/343304). |
| + // Also FFmpegDemuxer is always used with media::BufferDataSource, perhaps |
| + // we should control buffer size via that for FFmpeg. |
| + NOTIMPLEMENTED(); |
| + return 0; |
| +} |
| + |
| +void FFmpegDemuxerStream::SetMemoryLimit(size_t memory_limit) { |
| + // TODO(servolk): Implement better memory limit control for FFMpegDemuxer, |
| + // currently is has a hard-coded limit of 150Mb across all streams (see |
|
wolenetz
2015/06/16 23:17:16
nit ditto
servolk
2015/06/16 23:27:07
Done.
|
| + // IsMaxMemoryUsageReached and crbug.com/343304). |
| + // Also FFmpegDemuxer is always used with media::BufferDataSource, perhaps |
| + // we should control buffer size via that for FFmpeg. |
| + NOTIMPLEMENTED(); |
| +} |
| + |
| void FFmpegDemuxerStream::SetLiveness(Liveness liveness) { |
| DCHECK(task_runner_->BelongsToCurrentThread()); |
| DCHECK_EQ(liveness_, LIVENESS_UNKNOWN); |