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

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

Issue 1609923002: Fix remaining incompatibilities between scoped_ptr and unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/decoder_stream.h" 5 #include "media/filters/decoder_stream.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after
267 MEDIA_LOG(ERROR, media_log_) << GetStreamTypeString() 267 MEDIA_LOG(ERROR, media_log_) << GetStreamTypeString()
268 << " decoder initialization failed"; 268 << " decoder initialization failed";
269 base::ResetAndReturn(&init_cb_).Run(false); 269 base::ResetAndReturn(&init_cb_).Run(false);
270 } else { 270 } else {
271 CompleteDecoderReinitialization(false); 271 CompleteDecoderReinitialization(false);
272 } 272 }
273 return; 273 return;
274 } 274 }
275 275
276 media_log_->SetBooleanProperty(GetStreamTypeString() + "_dds", 276 media_log_->SetBooleanProperty(GetStreamTypeString() + "_dds",
277 decrypting_demuxer_stream_); 277 !!decrypting_demuxer_stream_);
278 media_log_->SetStringProperty(GetStreamTypeString() + "_decoder", 278 media_log_->SetStringProperty(GetStreamTypeString() + "_decoder",
279 decoder_->GetDisplayName()); 279 decoder_->GetDisplayName());
280 280
281 if (state_ == STATE_REINITIALIZING_DECODER) { 281 if (state_ == STATE_REINITIALIZING_DECODER) {
282 CompleteDecoderReinitialization(true); 282 CompleteDecoderReinitialization(true);
283 return; 283 return;
284 } 284 }
285 285
286 // Initialization succeeded. 286 // Initialization succeeded.
287 state_ = STATE_NORMAL; 287 state_ = STATE_NORMAL;
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
618 } 618 }
619 619
620 // The resetting process will be continued in OnDecoderReinitialized(). 620 // The resetting process will be continued in OnDecoderReinitialized().
621 ReinitializeDecoder(); 621 ReinitializeDecoder();
622 } 622 }
623 623
624 template class DecoderStream<DemuxerStream::VIDEO>; 624 template class DecoderStream<DemuxerStream::VIDEO>;
625 template class DecoderStream<DemuxerStream::AUDIO>; 625 template class DecoderStream<DemuxerStream::AUDIO>;
626 626
627 } // namespace media 627 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698