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

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

Issue 2698713003: Remove enabled/set_enabled from DemuxerStream interface (Closed)
Patch Set: cast_shell build fix Created 3 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 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 146 }
147 147
148 bool DecryptingDemuxerStream::SupportsConfigChanges() { 148 bool DecryptingDemuxerStream::SupportsConfigChanges() {
149 return demuxer_stream_->SupportsConfigChanges(); 149 return demuxer_stream_->SupportsConfigChanges();
150 } 150 }
151 151
152 VideoRotation DecryptingDemuxerStream::video_rotation() { 152 VideoRotation DecryptingDemuxerStream::video_rotation() {
153 return demuxer_stream_->video_rotation(); 153 return demuxer_stream_->video_rotation();
154 } 154 }
155 155
156 bool DecryptingDemuxerStream::enabled() const {
157 return demuxer_stream_->enabled();
158 }
159
160 void DecryptingDemuxerStream::set_enabled(bool enabled,
161 base::TimeDelta timestamp) {
162 demuxer_stream_->set_enabled(enabled, timestamp);
163 }
164
165 DecryptingDemuxerStream::~DecryptingDemuxerStream() { 156 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
166 DVLOG(2) << __func__ << " : state_ = " << state_; 157 DVLOG(2) << __func__ << " : state_ = " << state_;
167 DCHECK(task_runner_->BelongsToCurrentThread()); 158 DCHECK(task_runner_->BelongsToCurrentThread());
168 159
169 if (state_ == kUninitialized) 160 if (state_ == kUninitialized)
170 return; 161 return;
171 162
172 if (decryptor_) { 163 if (decryptor_) {
173 decryptor_->CancelDecrypt(GetDecryptorStreamType()); 164 decryptor_->CancelDecrypt(GetDecryptorStreamType());
174 decryptor_ = NULL; 165 decryptor_ = NULL;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 break; 377 break;
387 } 378 }
388 379
389 default: 380 default:
390 NOTREACHED(); 381 NOTREACHED();
391 return; 382 return;
392 } 383 }
393 } 384 }
394 385
395 } // namespace media 386 } // 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