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

Side by Side Diff: media/filters/decoder_stream.cc

Issue 1083883003: Move BindToCurrentLoop from media/base/ to base/ Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix media/base/callback_holder.h compile Created 5 years, 8 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
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #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" 13 #include "media/base/audio_decoder.h"
14 #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" 15 #include "media/base/demuxer_stream.h"
17 #include "media/base/video_decoder.h" 16 #include "media/base/video_decoder.h"
18 #include "media/filters/decrypting_demuxer_stream.h" 17 #include "media/filters/decrypting_demuxer_stream.h"
19 18
20 namespace media { 19 namespace media {
21 20
22 // TODO(rileya): Devise a better way of specifying trace/UMA/etc strings for 21 // TODO(rileya): Devise a better way of specifying trace/UMA/etc strings for
23 // templated classes such as this. 22 // templated classes such as this.
24 template <DemuxerStream::Type StreamType> 23 template <DemuxerStream::Type StreamType>
(...skipping 560 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 } 584 }
586 585
587 // The resetting process will be continued in OnDecoderReinitialized(). 586 // The resetting process will be continued in OnDecoderReinitialized().
588 ReinitializeDecoder(); 587 ReinitializeDecoder();
589 } 588 }
590 589
591 template class DecoderStream<DemuxerStream::VIDEO>; 590 template class DecoderStream<DemuxerStream::VIDEO>;
592 template class DecoderStream<DemuxerStream::AUDIO>; 591 template class DecoderStream<DemuxerStream::AUDIO>;
593 592
594 } // namespace media 593 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decoder_selector.cc ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698