| 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 "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/callback_helpers.h" | 8 #include "base/callback_helpers.h" |
| 9 #include "base/location.h" | 9 #include "base/location.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| 11 #include "base/single_thread_task_runner.h" | 11 #include "base/single_thread_task_runner.h" |
| 12 #include "base/trace_event/trace_event.h" | 12 #include "base/trace_event/trace_event.h" |
| 13 #include "media/base/audio_decoder.h" | |
| 14 #include "media/base/bind_to_current_loop.h" | 13 #include "media/base/bind_to_current_loop.h" |
| 15 #include "media/base/decoder_buffer.h" | 14 #include "media/base/decoder_buffer.h" |
| 16 #include "media/base/demuxer_stream.h" | |
| 17 #include "media/base/video_decoder.h" | 15 #include "media/base/video_decoder.h" |
| 18 #include "media/filters/decrypting_demuxer_stream.h" | 16 #include "media/filters/decrypting_demuxer_stream.h" |
| 19 | 17 |
| 20 namespace media { | 18 namespace media { |
| 21 | 19 |
| 22 // TODO(rileya): Devise a better way of specifying trace/UMA/etc strings for | 20 // TODO(rileya): Devise a better way of specifying trace/UMA/etc strings for |
| 23 // templated classes such as this. | 21 // templated classes such as this. |
| 24 template <DemuxerStream::Type StreamType> | 22 template <DemuxerStream::Type StreamType> |
| 25 static const char* GetTraceString(); | 23 static const char* GetTraceString(); |
| 26 | 24 |
| (...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 } | 583 } |
| 586 | 584 |
| 587 // The resetting process will be continued in OnDecoderReinitialized(). | 585 // The resetting process will be continued in OnDecoderReinitialized(). |
| 588 ReinitializeDecoder(); | 586 ReinitializeDecoder(); |
| 589 } | 587 } |
| 590 | 588 |
| 591 template class DecoderStream<DemuxerStream::VIDEO>; | 589 template class DecoderStream<DemuxerStream::VIDEO>; |
| 592 template class DecoderStream<DemuxerStream::AUDIO>; | 590 template class DecoderStream<DemuxerStream::AUDIO>; |
| 593 | 591 |
| 594 } // namespace media | 592 } // namespace media |
| OLD | NEW |