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

Unified Diff: media/filters/decoder_stream.h

Issue 1904213003: Convert //media/filters from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove include Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decoder_stream.h
diff --git a/media/filters/decoder_stream.h b/media/filters/decoder_stream.h
index a7f084fa3f6f806caff60e210708abe6a86ec85a..f562b900501186e71dc558d74f962328bce6db49 100644
--- a/media/filters/decoder_stream.h
+++ b/media/filters/decoder_stream.h
@@ -140,8 +140,8 @@ class MEDIA_EXPORT DecoderStream {
// |decrypting_demuxer_stream| was also populated if a DecryptingDemuxerStream
// is created to help decrypt the encrypted stream.
void OnDecoderSelected(
- scoped_ptr<Decoder> selected_decoder,
- scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
+ std::unique_ptr<Decoder> selected_decoder,
+ std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream);
// Satisfy pending |read_cb_| with |status| and |output|.
void SatisfyRead(Status status,
@@ -192,16 +192,16 @@ class MEDIA_EXPORT DecoderStream {
DemuxerStream* stream_;
- scoped_ptr<DecoderSelector<StreamType> > decoder_selector_;
+ std::unique_ptr<DecoderSelector<StreamType>> decoder_selector_;
- scoped_ptr<Decoder> decoder_;
+ std::unique_ptr<Decoder> decoder_;
// When falling back from H/W decoding to S/W decoding, destructing the
// GpuVideoDecoder too early results in black frames being displayed.
// |previous_decoder_| is used to keep it alive. It is destroyed once we've
// decoded at least media::limits::kMaxVideoFrames frames after fallback.
int decoded_frames_since_fallback_;
- scoped_ptr<Decoder> previous_decoder_;
- scoped_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
+ std::unique_ptr<Decoder> previous_decoder_;
+ std::unique_ptr<DecryptingDemuxerStream> decrypting_demuxer_stream_;
SpliceObserverCB splice_observer_cb_;
ConfigChangeObserverCB config_change_observer_cb_;
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698