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

Unified Diff: content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 389383002: Revert 277386 "Fix: Adding list of supported codecs for MP4 cont..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/2062/src/
Patch Set: Created 6 years, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/child/assert_matching_enums.cc ('k') | net/base/mime_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_webkitplatformsupport_impl.cc
===================================================================
--- content/renderer/renderer_webkitplatformsupport_impl.cc (revision 282961)
+++ content/renderer/renderer_webkitplatformsupport_impl.cc (working copy)
@@ -424,7 +424,8 @@
std::string key_system_ascii =
GetUnprefixedKeySystemName(base::UTF16ToASCII(key_system));
std::vector<std::string> strict_codecs;
- net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, true);
+ bool strip_suffix = !net::IsStrictMediaMimeType(mime_type_ascii);
+ net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, strip_suffix);
if (!IsSupportedKeySystemWithMediaMimeType(
mime_type_ascii, strict_codecs, key_system_ascii)) {
@@ -439,8 +440,14 @@
// Check if the codecs are a perfect match.
std::vector<std::string> strict_codecs;
net::ParseCodecString(ToASCIIOrEmpty(codecs), &strict_codecs, false);
- return static_cast<WebMimeRegistry::SupportsType> (
- net::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs));
+ if (net::IsSupportedStrictMediaMimeType(mime_type_ascii, strict_codecs))
+ return IsSupported;
+
+ // We support the container, but no codecs were specified.
+ if (codecs.isNull())
+ return MayBeSupported;
+
+ return IsNotSupported;
}
// If we don't recognize the codec, it's possible we support it.
« no previous file with comments | « content/child/assert_matching_enums.cc ('k') | net/base/mime_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698