media/filters/audio_decoder_selector.cc - Issue 16514006: Update includes of message_loop_proxy.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 16514006: Update includes of message_loop_proxy. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 6 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 | Annotate | Revision Log

« no previous file with comments | « media/base/serial_runner.cc ('k') | media/filters/audio_renderer_impl.cc » ('j') | no next file with comments »

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/audio_decoder_selector.h"	5 #include "media/filters/audio_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/audio_decoder_config.h"	11 #include "media/base/audio_decoder_config.h"

12 #include "media/base/bind_to_loop.h"	12 #include "media/base/bind_to_loop.h"

13 #include "media/base/demuxer_stream.h"	13 #include "media/base/demuxer_stream.h"

14 #include "media/base/pipeline.h"	14 #include "media/base/pipeline.h"

15 #include "media/filters/decrypting_audio_decoder.h"	15 #include "media/filters/decrypting_audio_decoder.h"

16 #include "media/filters/decrypting_demuxer_stream.h"	16 #include "media/filters/decrypting_demuxer_stream.h"

17	17

18 namespace media {	18 namespace media {

19	19

20 AudioDecoderSelector::AudioDecoderSelector(	20 AudioDecoderSelector::AudioDecoderSelector(

(...skipping 121 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 }	142 }

143	143

144 scoped_ptr<AudioDecoder> audio_decoder(*iter);	144 scoped_ptr<AudioDecoder> audio_decoder(*iter);

145 decoders_.weak_erase(iter);	145 decoders_.weak_erase(iter);

146	146

147 base::ResetAndReturn(&select_decoder_cb_).Run(audio_decoder.Pass(),	147 base::ResetAndReturn(&select_decoder_cb_).Run(audio_decoder.Pass(),

148 decrypted_stream_.Pass());	148 decrypted_stream_.Pass());

149 }	149 }

150	150

151 } // namespace media	151 } // namespace media

OLD	NEW