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

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

Issue 2199913002: Notify demux stream clients when a stream is disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't pass DemuxerStream into the status callback Created 4 years, 4 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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 154
155 bool DecryptingDemuxerStream::enabled() const { 155 bool DecryptingDemuxerStream::enabled() const {
156 return demuxer_stream_->enabled(); 156 return demuxer_stream_->enabled();
157 } 157 }
158 158
159 void DecryptingDemuxerStream::set_enabled(bool enabled, 159 void DecryptingDemuxerStream::set_enabled(bool enabled,
160 base::TimeDelta timestamp) { 160 base::TimeDelta timestamp) {
161 demuxer_stream_->set_enabled(enabled, timestamp); 161 demuxer_stream_->set_enabled(enabled, timestamp);
162 } 162 }
163 163
164 void DecryptingDemuxerStream::SetStreamRestartedCB( 164 void DecryptingDemuxerStream::SetStreamStatusChangeCB(
165 const StreamRestartedCB& cb) { 165 const StreamStatusChangeCB& cb) {
166 demuxer_stream_->SetStreamRestartedCB(cb); 166 demuxer_stream_->SetStreamStatusChangeCB(cb);
167 } 167 }
168 168
169 DecryptingDemuxerStream::~DecryptingDemuxerStream() { 169 DecryptingDemuxerStream::~DecryptingDemuxerStream() {
170 DVLOG(2) << __func__ << " : state_ = " << state_; 170 DVLOG(2) << __func__ << " : state_ = " << state_;
171 DCHECK(task_runner_->BelongsToCurrentThread()); 171 DCHECK(task_runner_->BelongsToCurrentThread());
172 172
173 if (state_ == kUninitialized) 173 if (state_ == kUninitialized)
174 return; 174 return;
175 175
176 if (decryptor_) { 176 if (decryptor_) {
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
383 break; 383 break;
384 } 384 }
385 385
386 default: 386 default:
387 NOTREACHED(); 387 NOTREACHED();
388 return; 388 return;
389 } 389 }
390 } 390 }
391 391
392 } // namespace media 392 } // 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