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

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: 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
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 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 SetDecryptorReadyCB set_decryptor_ready_cb_; 85 SetDecryptorReadyCB set_decryptor_ready_cb_;
86 86
87 DemuxerStream* input_stream_; 87 DemuxerStream* input_stream_;
88 SelectDecoderCB select_decoder_cb_; 88 SelectDecoderCB select_decoder_cb_;
89 89
90 StatisticsCB statistics_cb_; 90 StatisticsCB statistics_cb_;
91 91
92 scoped_ptr<Decoder> decoder_; 92 scoped_ptr<Decoder> decoder_;
93 scoped_ptr<DecryptingDemuxerStream> decrypted_stream_; 93 scoped_ptr<DecryptingDemuxerStream> decrypted_stream_;
94 94
95 // NOTE: This must always be last so it's invalidated before other member
96 // variables might be accessed.
95 base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_; 97 base::WeakPtrFactory<DecoderSelector> weak_ptr_factory_;
96 98
97 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector); 99 DISALLOW_IMPLICIT_CONSTRUCTORS(DecoderSelector);
98 }; 100 };
99 101
100 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector; 102 typedef DecoderSelector<DemuxerStream::VIDEO> VideoDecoderSelector;
101 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector; 103 typedef DecoderSelector<DemuxerStream::AUDIO> AudioDecoderSelector;
102 104
103 template <> 105 template <>
104 void AudioDecoderSelector::DoInitializeDecoder( 106 void AudioDecoderSelector::DoInitializeDecoder(
105 const PipelineStatusCB& status_cb); 107 const PipelineStatusCB& status_cb);
106 108
107 } // namespace media 109 } // namespace media
108 110
109 #endif // MEDIA_FILTERS_DECODER_SELECTOR_H_ 111 #endif // MEDIA_FILTERS_DECODER_SELECTOR_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698