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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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.h ('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 "decoder_selector.h" 5 #include "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/single_thread_task_runner.h" 10 #include "base/single_thread_task_runner.h"
11 #include "build/build_config.h"
11 #include "media/base/audio_decoder.h" 12 #include "media/base/audio_decoder.h"
12 #include "media/base/bind_to_current_loop.h" 13 #include "media/base/bind_to_current_loop.h"
13 #include "media/base/demuxer_stream.h" 14 #include "media/base/demuxer_stream.h"
14 #include "media/base/media_log.h" 15 #include "media/base/media_log.h"
15 #include "media/base/pipeline.h" 16 #include "media/base/pipeline.h"
16 #include "media/base/video_decoder.h" 17 #include "media/base/video_decoder.h"
17 #include "media/filters/decoder_stream_traits.h" 18 #include "media/filters/decoder_stream_traits.h"
18 #include "media/filters/decrypting_demuxer_stream.h" 19 #include "media/filters/decrypting_demuxer_stream.h"
19 20
20 #if !defined(OS_ANDROID) 21 #if !defined(OS_ANDROID)
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 234
234 // These forward declarations tell the compiler that we will use 235 // These forward declarations tell the compiler that we will use
235 // DecoderSelector with these arguments, allowing us to keep these definitions 236 // DecoderSelector with these arguments, allowing us to keep these definitions
236 // in our .cc without causing linker errors. This also means if anyone tries to 237 // in our .cc without causing linker errors. This also means if anyone tries to
237 // instantiate a DecoderSelector with anything but these two specializations 238 // instantiate a DecoderSelector with anything but these two specializations
238 // they'll most likely get linker errors. 239 // they'll most likely get linker errors.
239 template class DecoderSelector<DemuxerStream::AUDIO>; 240 template class DecoderSelector<DemuxerStream::AUDIO>;
240 template class DecoderSelector<DemuxerStream::VIDEO>; 241 template class DecoderSelector<DemuxerStream::VIDEO>;
241 242
242 } // namespace media 243 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/decoder_selector.h ('k') | media/filters/decrypting_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698