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

Unified Diff: net/base/mime_util.cc

Issue 796663002: Update from https://crrev.com/307758 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Updates for SkCanvas::NewRaster deprecation Created 6 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 side-by-side diff with in-line comments
Download patch
Index: net/base/mime_util.cc
diff --git a/net/base/mime_util.cc b/net/base/mime_util.cc
index c35e24c84f857c7ce9d3cc00b957c3c8ef722291..cba37a452b78662f3304120741f1ad840046010c 100644
--- a/net/base/mime_util.cc
+++ b/net/base/mime_util.cc
@@ -530,17 +530,22 @@ struct MediaFormatStrict {
// mp4a.69 - MPEG-2 extension to MPEG-1
// mp4a.6B - MPEG-1 audio
// mp4a.40.2 - MPEG-4 AAC LC
+// mp4a.40.02 - MPEG-4 AAC LC (leading 0 in aud-oti for compatibility)
// mp4a.40.5 - MPEG-4 HE-AAC v1 (AAC LC + SBR)
+// mp4a.40.05 - MPEG-4 HE-AAC v1 (AAC LC + SBR) (leading 0 in aud-oti for
+// compatibility)
// mp4a.40.29 - MPEG-4 HE-AAC v2 (AAC LC + SBR + PS)
//
// avc1.42E0xx - H.264 Baseline
// avc1.4D40xx - H.264 Main
// avc1.6400xx - H.264 High
static const char kMP4AudioCodecsExpression[] =
- "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.5,mp4a.40.29";
+ "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.02,mp4a.40.5,"
+ "mp4a.40.05,mp4a.40.29";
static const char kMP4VideoCodecsExpression[] =
- "avc1.42E00A,avc1.4D400A,avc1.64000A," \
- "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.5,mp4a.40.29";
+ "avc1.42E00A,avc1.4D400A,avc1.64000A,"
+ "mp4a.66,mp4a.67,mp4a.68,mp4a.69,mp4a.6B,mp4a.40.2,mp4a.40.02,mp4a.40.5,"
+ "mp4a.40.05,mp4a.40.29";
static const MediaFormatStrict format_codec_mappings[] = {
{ "video/webm", "opus,vorbis,vp8,vp8.0,vp9,vp9.0" },
@@ -571,24 +576,25 @@ struct CodecIDMappings {
//
// The "mp4a" strings come from RFC 6381.
static const CodecIDMappings kUnambiguousCodecIDs[] = {
- { "1", MimeUtil::PCM }, // We only allow this for WAV so it isn't ambiguous.
- { "mp3", MimeUtil::MP3 },
- { "mp4a.66", MimeUtil::MPEG2_AAC_MAIN },
- { "mp4a.67", MimeUtil::MPEG2_AAC_LC },
- { "mp4a.68", MimeUtil::MPEG2_AAC_SSR },
- { "mp4a.69", MimeUtil::MP3 },
- { "mp4a.6B", MimeUtil::MP3 },
- { "mp4a.40.2", MimeUtil::MPEG4_AAC_LC },
- { "mp4a.40.5", MimeUtil::MPEG4_AAC_SBR_v1 },
- { "mp4a.40.29", MimeUtil::MPEG4_AAC_SBR_PS_v2 },
- { "vorbis", MimeUtil::VORBIS },
- { "opus", MimeUtil::OPUS },
- { "vp8", MimeUtil::VP8 },
- { "vp8.0", MimeUtil::VP8 },
- { "vp9", MimeUtil::VP9 },
- { "vp9.0", MimeUtil::VP9 },
- { "theora", MimeUtil::THEORA }
-};
+ {"1", MimeUtil::PCM}, // We only allow this for WAV so it isn't ambiguous.
+ {"mp3", MimeUtil::MP3},
+ {"mp4a.66", MimeUtil::MPEG2_AAC_MAIN},
+ {"mp4a.67", MimeUtil::MPEG2_AAC_LC},
+ {"mp4a.68", MimeUtil::MPEG2_AAC_SSR},
+ {"mp4a.69", MimeUtil::MP3},
+ {"mp4a.6B", MimeUtil::MP3},
+ {"mp4a.40.2", MimeUtil::MPEG4_AAC_LC},
+ {"mp4a.40.02", MimeUtil::MPEG4_AAC_LC},
+ {"mp4a.40.5", MimeUtil::MPEG4_AAC_SBR_v1},
+ {"mp4a.40.05", MimeUtil::MPEG4_AAC_SBR_v1},
+ {"mp4a.40.29", MimeUtil::MPEG4_AAC_SBR_PS_v2},
+ {"vorbis", MimeUtil::VORBIS},
+ {"opus", MimeUtil::OPUS},
+ {"vp8", MimeUtil::VP8},
+ {"vp8.0", MimeUtil::VP8},
+ {"vp9", MimeUtil::VP9},
+ {"vp9.0", MimeUtil::VP9},
+ {"theora", MimeUtil::THEORA}};
// List of codec IDs that are ambiguous and don't provide
// enough information to determine the codec and profile.
« no previous file with comments | « net/base/elements_upload_data_stream_unittest.cc ('k') | sky/engine/platform/graphics/DeferredImageDecoderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698