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 <algorithm> | 5 #include <algorithm> |
6 #include <iterator> | 6 #include <iterator> |
7 #include <map> | 7 #include <map> |
8 #include <string> | 8 #include <string> |
9 | 9 |
10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 // for more information. | 298 // for more information. |
299 // | 299 // |
300 // The codecs for WAV are integers as defined in Appendix A of RFC2361: | 300 // The codecs for WAV are integers as defined in Appendix A of RFC2361: |
301 // http://tools.ietf.org/html/rfc2361 | 301 // http://tools.ietf.org/html/rfc2361 |
302 static const char* const common_media_codecs[] = { | 302 static const char* const common_media_codecs[] = { |
303 #if defined(ENABLE_MEDIA_CODEC_THEORA) | 303 #if defined(ENABLE_MEDIA_CODEC_THEORA) |
304 "theora", | 304 "theora", |
305 #endif | 305 #endif |
306 "vorbis", | 306 "vorbis", |
307 "vp8", | 307 "vp8", |
| 308 "vp9", |
308 "1" // WAVE_FORMAT_PCM. | 309 "1" // WAVE_FORMAT_PCM. |
309 }; | 310 }; |
310 | 311 |
311 // List of proprietary codecs only supported by Google Chrome. | 312 // List of proprietary codecs only supported by Google Chrome. |
312 static const char* const proprietary_media_codecs[] = { | 313 static const char* const proprietary_media_codecs[] = { |
313 "avc1", | 314 "avc1", |
314 "mp4a" | 315 "mp4a" |
315 }; | 316 }; |
316 | 317 |
317 // Note: does not include javascript types list (see supported_javascript_types) | 318 // Note: does not include javascript types list (see supported_javascript_types) |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
403 "text/jscript", | 404 "text/jscript", |
404 "text/livescript" | 405 "text/livescript" |
405 }; | 406 }; |
406 | 407 |
407 struct MediaFormatStrict { | 408 struct MediaFormatStrict { |
408 const char* mime_type; | 409 const char* mime_type; |
409 const char* codecs_list; | 410 const char* codecs_list; |
410 }; | 411 }; |
411 | 412 |
412 static const MediaFormatStrict format_codec_mappings[] = { | 413 static const MediaFormatStrict format_codec_mappings[] = { |
413 { "video/webm", "vorbis,vp8,vp8.0" }, | 414 { "video/webm", "vorbis,vp8,vp8.0,vp9,vp9.0" }, |
414 { "audio/webm", "vorbis" }, | 415 { "audio/webm", "vorbis" }, |
415 { "audio/wav", "1" } | 416 { "audio/wav", "1" } |
416 }; | 417 }; |
417 | 418 |
418 MimeUtil::MimeUtil() { | 419 MimeUtil::MimeUtil() { |
419 InitializeMimeTypeMaps(); | 420 InitializeMimeTypeMaps(); |
420 } | 421 } |
421 | 422 |
422 // static | 423 // static |
423 bool MimeUtil::AreSupportedCodecs(const MimeMappings& supported_codecs, | 424 bool MimeUtil::AreSupportedCodecs(const MimeMappings& supported_codecs, |
(...skipping 578 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1002 post_data->append("\r\n" + value + "\r\n"); | 1003 post_data->append("\r\n" + value + "\r\n"); |
1003 } | 1004 } |
1004 | 1005 |
1005 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary, | 1006 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary, |
1006 std::string* post_data) { | 1007 std::string* post_data) { |
1007 DCHECK(post_data); | 1008 DCHECK(post_data); |
1008 post_data->append("--" + mime_boundary + "--\r\n"); | 1009 post_data->append("--" + mime_boundary + "--\r\n"); |
1009 } | 1010 } |
1010 | 1011 |
1011 } // namespace net | 1012 } // namespace net |
OLD | NEW |