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

Side by Side Diff: media/filters/decrypting_demuxer_stream.cc

Issue 1171263004: Allow setting memory limits on media::DemuxerStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merged CL that adds get/set buffer size on WMP Created 5 years, 6 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 unified diff | Download patch
« no previous file with comments | « media/filters/decrypting_demuxer_stream.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/filters/decrypting_demuxer_stream.h" 5 #include "media/filters/decrypting_demuxer_stream.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback_helpers.h" 8 #include "base/callback_helpers.h"
9 #include "base/location.h" 9 #include "base/location.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 } 142 }
143 143
144 bool DecryptingDemuxerStream::SupportsConfigChanges() { 144 bool DecryptingDemuxerStream::SupportsConfigChanges() {
145 return demuxer_stream_->SupportsConfigChanges(); 145 return demuxer_stream_->SupportsConfigChanges();
146 } 146 }
147 147
148 VideoRotation DecryptingDemuxerStream::video_rotation() { 148 VideoRotation DecryptingDemuxerStream::video_rotation() {
149 return demuxer_stream_->video_rotation(); 149 return demuxer_stream_->video_rotation();
150 } 150 }
151 151
152 size_t DecryptingDemuxerStream::GetMemoryLimit() const {
153 return demuxer_stream_->GetMemoryLimit();
154 }
155
156 void DecryptingDemuxerStream::SetMemoryLimit(size_t memory_limit) {
157 demuxer_stream_->SetMemoryLimit(memory_limit);
158 }
159
152 DecryptingDemuxerStream::~DecryptingDemuxerStream() { 160 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
153 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_; 161 DVLOG(2) << __FUNCTION__ << " : state_ = " << state_;
154 DCHECK(task_runner_->BelongsToCurrentThread()); 162 DCHECK(task_runner_->BelongsToCurrentThread());
155 163
156 if (state_ == kUninitialized) 164 if (state_ == kUninitialized)
157 return; 165 return;
158 166
159 if (decryptor_) { 167 if (decryptor_) {
160 decryptor_->CancelDecrypt(GetDecryptorStreamType()); 168 decryptor_->CancelDecrypt(GetDecryptorStreamType());
161 decryptor_ = NULL; 169 decryptor_ = NULL;
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 break; 418 break;
411 } 419 }
412 420
413 default: 421 default:
414 NOTREACHED(); 422 NOTREACHED();
415 return; 423 return;
416 } 424 }
417 } 425 }
418 426
419 } // namespace media 427 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decrypting_demuxer_stream.h ('k') | media/filters/ffmpeg_demuxer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698