OLD | NEW |
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/video_decoder_selector.h" | 5 #include "media/filters/video_decoder_selector.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/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop_proxy.h" | 10 #include "base/message_loop/message_loop_proxy.h" |
11 #include "media/base/bind_to_loop.h" | 11 #include "media/base/bind_to_loop.h" |
12 #include "media/base/demuxer_stream.h" | 12 #include "media/base/demuxer_stream.h" |
13 #include "media/base/pipeline.h" | 13 #include "media/base/pipeline.h" |
14 #include "media/base/video_decoder_config.h" | 14 #include "media/base/video_decoder_config.h" |
15 #include "media/filters/decrypting_demuxer_stream.h" | 15 #include "media/filters/decrypting_demuxer_stream.h" |
16 #include "media/filters/decrypting_video_decoder.h" | 16 #include "media/filters/decrypting_video_decoder.h" |
17 | 17 |
18 namespace media { | 18 namespace media { |
19 | 19 |
20 VideoDecoderSelector::VideoDecoderSelector( | 20 VideoDecoderSelector::VideoDecoderSelector( |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 } | 140 } |
141 | 141 |
142 scoped_ptr<VideoDecoder> video_decoder(*iter); | 142 scoped_ptr<VideoDecoder> video_decoder(*iter); |
143 decoders_.weak_erase(iter); | 143 decoders_.weak_erase(iter); |
144 | 144 |
145 base::ResetAndReturn(&select_decoder_cb_).Run(video_decoder.Pass(), | 145 base::ResetAndReturn(&select_decoder_cb_).Run(video_decoder.Pass(), |
146 decrypted_stream_.Pass()); | 146 decrypted_stream_.Pass()); |
147 } | 147 } |
148 | 148 |
149 } // namespace media | 149 } // namespace media |
OLD | NEW |