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

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

Issue 16684003: Use a direct include of strings headers in ipc/, jingle/, media/. (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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/stream_parser_factory.h" 5 #include "media/filters/stream_parser_factory.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "media/base/media_log.h" 11 #include "media/base/media_log.h"
12 #include "media/base/media_switches.h" 12 #include "media/base/media_switches.h"
13 #include "media/webm/webm_stream_parser.h" 13 #include "media/webm/webm_stream_parser.h"
14 14
15 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS) 15 #if defined(GOOGLE_CHROME_BUILD) || defined(USE_PROPRIETARY_CODECS)
16 #include "media/mp4/es_descriptor.h" 16 #include "media/mp4/es_descriptor.h"
17 #include "media/mp4/mp4_stream_parser.h" 17 #include "media/mp4/mp4_stream_parser.h"
18 #endif 18 #endif
19 19
20 namespace media { 20 namespace media {
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 "Media.MSE.VideoCodec", video_codecs[i], CodecInfo::HISTOGRAM_MAX); 329 "Media.MSE.VideoCodec", video_codecs[i], CodecInfo::HISTOGRAM_MAX);
330 } 330 }
331 331
332 stream_parser.reset(factory_function(codecs, log_cb)); 332 stream_parser.reset(factory_function(codecs, log_cb));
333 } 333 }
334 334
335 return stream_parser.Pass(); 335 return stream_parser.Pass();
336 } 336 }
337 337
338 } // namespace media 338 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/source_buffer_stream_unittest.cc ('k') | media/filters/video_renderer_base_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698