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

Side by Side Diff: net/base/mime_util.cc

Issue 130853002: Add mime types for HLS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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
« no previous file with comments | « no previous file | net/base/mime_util_unittest.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 (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 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 "video/ogg", 274 "video/ogg",
275 #endif 275 #endif
276 276
277 // WebM. 277 // WebM.
278 "video/webm", 278 "video/webm",
279 "audio/webm", 279 "audio/webm",
280 280
281 // Wav. 281 // Wav.
282 "audio/wav", 282 "audio/wav",
283 "audio/x-wav", 283 "audio/x-wav",
284
285 #if defined(OS_ANDROID)
286 // HLS. Supported by Android ICS and above.
287 "application/vnd.apple.mpegurl",
288 "application/x-mpegurl",
289 #endif
284 }; 290 };
285 291
286 // List of proprietary types only supported by Google Chrome. 292 // List of proprietary types only supported by Google Chrome.
287 static const char* const proprietary_media_types[] = { 293 static const char* const proprietary_media_types[] = {
288 // MPEG-4. 294 // MPEG-4.
289 "video/mp4", 295 "video/mp4",
290 "video/x-m4v", 296 "video/x-m4v",
291 "audio/mp4", 297 "audio/mp4",
292 "audio/x-m4a", 298 "audio/x-m4a",
293 299
(...skipping 724 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 post_data->append("\r\n" + value + "\r\n"); 1024 post_data->append("\r\n" + value + "\r\n");
1019 } 1025 }
1020 1026
1021 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary, 1027 void AddMultipartFinalDelimiterForUpload(const std::string& mime_boundary,
1022 std::string* post_data) { 1028 std::string* post_data) {
1023 DCHECK(post_data); 1029 DCHECK(post_data);
1024 post_data->append("--" + mime_boundary + "--\r\n"); 1030 post_data->append("--" + mime_boundary + "--\r\n");
1025 } 1031 }
1026 1032
1027 } // namespace net 1033 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | net/base/mime_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698