| 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_stream.h" | 5 #include "media/filters/decoder_stream.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" |
| (...skipping 28 matching lines...) Expand all Loading... |
| 39 | 39 |
| 40 template <> | 40 template <> |
| 41 const char* GetTraceString<DemuxerStream::AUDIO>() { | 41 const char* GetTraceString<DemuxerStream::AUDIO>() { |
| 42 return "DecoderStream<AUDIO>::Decode"; | 42 return "DecoderStream<AUDIO>::Decode"; |
| 43 } | 43 } |
| 44 | 44 |
| 45 template <DemuxerStream::Type StreamType> | 45 template <DemuxerStream::Type StreamType> |
| 46 DecoderStream<StreamType>::DecoderStream( | 46 DecoderStream<StreamType>::DecoderStream( |
| 47 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, | 47 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| 48 ScopedVector<Decoder> decoders, | 48 ScopedVector<Decoder> decoders, |
| 49 const scoped_refptr<MediaLog>& media_log) | 49 MediaLog* media_log) |
| 50 : traits_(media_log), | 50 : traits_(media_log), |
| 51 task_runner_(task_runner), | 51 task_runner_(task_runner), |
| 52 media_log_(media_log), | 52 media_log_(media_log), |
| 53 state_(STATE_UNINITIALIZED), | 53 state_(STATE_UNINITIALIZED), |
| 54 stream_(NULL), | 54 stream_(NULL), |
| 55 cdm_context_(nullptr), | 55 cdm_context_(nullptr), |
| 56 decoder_selector_(new DecoderSelector<StreamType>(task_runner, | 56 decoder_selector_(new DecoderSelector<StreamType>(task_runner, |
| 57 std::move(decoders), | 57 std::move(decoders), |
| 58 media_log)), | 58 media_log)), |
| 59 decoded_frames_since_fallback_(0), | 59 decoded_frames_since_fallback_(0), |
| (...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 782 } | 782 } |
| 783 | 783 |
| 784 // The resetting process will be continued in OnDecoderReinitialized(). | 784 // The resetting process will be continued in OnDecoderReinitialized(). |
| 785 ReinitializeDecoder(); | 785 ReinitializeDecoder(); |
| 786 } | 786 } |
| 787 | 787 |
| 788 template class DecoderStream<DemuxerStream::VIDEO>; | 788 template class DecoderStream<DemuxerStream::VIDEO>; |
| 789 template class DecoderStream<DemuxerStream::AUDIO>; | 789 template class DecoderStream<DemuxerStream::AUDIO>; |
| 790 | 790 |
| 791 } // namespace media | 791 } // namespace media |
| OLD | NEW |