| OLD | NEW |
| 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_selector.h" | 5 #include "media/filters/decoder_selector.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" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/single_thread_task_runner.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "build/build_config.h" | 13 #include "build/build_config.h" |
| 14 #include "media/base/audio_decoder.h" | 14 #include "media/base/audio_decoder.h" |
| 15 #include "media/base/bind_to_current_loop.h" | 15 #include "media/base/bind_to_current_loop.h" |
| 16 #include "media/base/cdm_context.h" | 16 #include "media/base/cdm_context.h" |
| 17 #include "media/base/demuxer_stream.h" | 17 #include "media/base/demuxer_stream.h" |
| 18 #include "media/base/media_log.h" | 18 #include "media/base/media_log.h" |
| 19 #include "media/base/pipeline.h" | |
| 20 #include "media/base/video_decoder.h" | 19 #include "media/base/video_decoder.h" |
| 21 #include "media/filters/decoder_stream_traits.h" | 20 #include "media/filters/decoder_stream_traits.h" |
| 22 #include "media/filters/decrypting_demuxer_stream.h" | 21 #include "media/filters/decrypting_demuxer_stream.h" |
| 23 | 22 |
| 24 #if !defined(OS_ANDROID) | 23 #if !defined(OS_ANDROID) |
| 25 #include "media/filters/decrypting_audio_decoder.h" | 24 #include "media/filters/decrypting_audio_decoder.h" |
| 26 #include "media/filters/decrypting_video_decoder.h" | 25 #include "media/filters/decrypting_video_decoder.h" |
| 27 #endif | 26 #endif |
| 28 | 27 |
| 29 namespace media { | 28 namespace media { |
| (...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 238 | 237 |
| 239 // These forward declarations tell the compiler that we will use | 238 // These forward declarations tell the compiler that we will use |
| 240 // DecoderSelector with these arguments, allowing us to keep these definitions | 239 // DecoderSelector with these arguments, allowing us to keep these definitions |
| 241 // in our .cc without causing linker errors. This also means if anyone tries to | 240 // in our .cc without causing linker errors. This also means if anyone tries to |
| 242 // instantiate a DecoderSelector with anything but these two specializations | 241 // instantiate a DecoderSelector with anything but these two specializations |
| 243 // they'll most likely get linker errors. | 242 // they'll most likely get linker errors. |
| 244 template class DecoderSelector<DemuxerStream::AUDIO>; | 243 template class DecoderSelector<DemuxerStream::AUDIO>; |
| 245 template class DecoderSelector<DemuxerStream::VIDEO>; | 244 template class DecoderSelector<DemuxerStream::VIDEO>; |
| 246 | 245 |
| 247 } // namespace media | 246 } // namespace media |
| OLD | NEW |