| OLD | NEW |
| 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 <stddef.h> |
| 8 |
| 7 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" |
| 8 #include "base/metrics/histogram.h" | 11 #include "base/metrics/histogram.h" |
| 9 #include "base/strings/pattern.h" | 12 #include "base/strings/pattern.h" |
| 10 #include "base/strings/string_number_conversions.h" | 13 #include "base/strings/string_number_conversions.h" |
| 11 #include "base/strings/string_split.h" | 14 #include "base/strings/string_split.h" |
| 12 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" |
| 16 #include "build/build_config.h" |
| 13 #include "media/base/media_switches.h" | 17 #include "media/base/media_switches.h" |
| 14 #include "media/formats/mpeg/adts_stream_parser.h" | 18 #include "media/formats/mpeg/adts_stream_parser.h" |
| 15 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" | 19 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h" |
| 16 #include "media/formats/webm/webm_stream_parser.h" | 20 #include "media/formats/webm/webm_stream_parser.h" |
| 17 | 21 |
| 18 #if defined(OS_ANDROID) | 22 #if defined(OS_ANDROID) |
| 19 #include "base/android/build_info.h" | 23 #include "base/android/build_info.h" |
| 20 #endif | 24 #endif |
| 21 | 25 |
| 22 #if defined(USE_PROPRIETARY_CODECS) | 26 #if defined(USE_PROPRIETARY_CODECS) |
| (...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 428 CodecInfo::HISTOGRAM_MAX + 1); | 432 CodecInfo::HISTOGRAM_MAX + 1); |
| 429 } | 433 } |
| 430 | 434 |
| 431 stream_parser.reset(factory_function(codecs, media_log)); | 435 stream_parser.reset(factory_function(codecs, media_log)); |
| 432 } | 436 } |
| 433 | 437 |
| 434 return stream_parser.Pass(); | 438 return stream_parser.Pass(); |
| 435 } | 439 } |
| 436 | 440 |
| 437 } // namespace media | 441 } // namespace media |
| OLD | NEW |