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

Side by Side Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 254983006: Fix: Adding list of supported codecs for MP4 containers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Making IsSupportedStrictMediaMimeType return enum Created 6 years, 7 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
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 "content/renderer/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
428 } 428 }
429 429
430 // Continue processing the mime_type and codecs. 430 // Continue processing the mime_type and codecs.
431 } 431 }
432 432
433 // Check list of strict codecs to see if it is supported. 433 // Check list of strict codecs to see if it is supported.
434 if (net::IsStrictMediaMimeType(mime_type_ascii)) { 434 if (net::IsStrictMediaMimeType(mime_type_ascii)) {
435 // Check if the codecs are a perfect match. 435 // Check if the codecs are a perfect match.
436 std::vector<std::string> strict_codecs; 436 std::vector<std::string> strict_codecs;
437 net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, false); 437 net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, false);
438 if (net::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs)) 438 return static_cast<WebMimeRegistry::SupportsType> (
439 return IsSupported; 439 net::IsSupportedStrictMediaMimeType(mime_type_ascii,strict_codecs));
440
441 // We support the container, but no codecs were specified.
442 if (codecs.isNull())
443 return MayBeSupported;
444
445 return IsNotSupported;
446 } 440 }
447 441
448 // If we don't recognize the codec, it's possible we support it. 442 // If we don't recognize the codec, it's possible we support it.
449 std::vector<std::string> parsed_codecs; 443 std::vector<std::string> parsed_codecs;
450 net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codecs, true); 444 net::ParseCodecString(ToASCIIOrEmpty(codecs), &parsed_codecs, true);
451 if (!net::AreSupportedMediaCodecs(parsed_codecs)) 445 if (!net::AreSupportedMediaCodecs(parsed_codecs))
452 return MayBeSupported; 446 return MayBeSupported;
453 447
454 // Otherwise we have a perfect match. 448 // Otherwise we have a perfect match.
455 return IsSupported; 449 return IsSupported;
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
1176 return; 1170 return;
1177 QuotaDispatcher::ThreadSpecificInstance( 1171 QuotaDispatcher::ThreadSpecificInstance(
1178 thread_safe_sender_.get(), 1172 thread_safe_sender_.get(),
1179 quota_message_filter_.get())->QueryStorageUsageAndQuota( 1173 quota_message_filter_.get())->QueryStorageUsageAndQuota(
1180 storage_partition, 1174 storage_partition,
1181 static_cast<quota::StorageType>(type), 1175 static_cast<quota::StorageType>(type),
1182 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); 1176 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
1183 } 1177 }
1184 1178
1185 } // namespace content 1179 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698