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

Side by Side Diff: media/filters/decoder_selector.h

Issue 193303002: WeakPtr destruction order cleanup: media edition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « media/filters/audio_renderer_impl.cc ('k') | media/filters/decoder_stream.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 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 #ifndef MEDIA_FILTERS_DECODER_SELECTOR_H_ 5 #ifndef MEDIA_FILTERS_DECODER_SELECTOR_H_
6 #define MEDIA_FILTERS_DECODER_SELECTOR_H_ 6 #define MEDIA_FILTERS_DECODER_SELECTOR_H_
7 7
8 #include "media/filters/decoder_selector.h" 8 #include "media/filters/decoder_selector.h"
9 9
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 scoped_refptr<base::SingleThreadTaskRunner> task_runner_; 81 scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
82 ScopedVector<Decoder> decoders_; 82 ScopedVector<Decoder> decoders_;
83 SetDecryptorReadyCB set_decryptor_ready_cb_; 83 SetDecryptorReadyCB set_decryptor_ready_cb_;
84 84
85 DemuxerStream* input_stream_; 85 DemuxerStream* input_stream_;
86 SelectDecoderCB select_decoder_cb_; 86 SelectDecoderCB select_decoder_cb_;
87 87
88 scoped_ptr<Decoder> decoder_; 88 scoped_ptr<Decoder> decoder_;
89 scoped_ptr<DecryptingDemuxerStream> decrypted_stream_; 89 scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
90 90
91 // NOTE: Weak pointers must be invalidated before all other member variables.
91 base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_; 92 base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
92 93
93 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector); 94 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
94 }; 95 };
95 96
96 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector; 97 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
97 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector; 98 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
98 99
99 } // namespace media 100 } // namespace media
100 101
101 #endif // MEDIA_FILTERS_DECODER_SELECTOR_H_ 102 #endif // MEDIA_FILTERS_DECODER_SELECTOR_H_
OLDNEW
« no previous file with comments | « media/filters/audio_renderer_impl.cc ('k') | media/filters/decoder_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698