media/blink/key_system_config_selector.cc - Issue 1129643002: Moved media mime type and codec checks to media/base/mime_util.*

Unified Diff: media/blink/key_system_config_selector.cc

Issue 1129643002: Moved media mime type and codec checks to media/base/mime_util.* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: More build fixes Created 5 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 side-by-side diff with in-line comments

Download patch

Index: media/blink/key_system_config_selector.cc

diff --git a/media/blink/key_system_config_selector.cc b/media/blink/key_system_config_selector.cc

index 67a13e26ec0ab363d2b528dab09ead9a4ef51bd0..49745ab385ce3a2d9aaf9869de51837818cc9ece 100644

--- a/media/blink/key_system_config_selector.cc

+++ b/media/blink/key_system_config_selector.cc

@@ -10,8 +10,8 @@

#include "base/strings/utf_string_conversions.h"

#include "media/base/key_systems.h"

#include "media/base/media_permission.h"

+#include "media/base/mime_util.h"

#include "media/blink/webmediaplayer_util.h"

-#include "net/base/mime_util.h"

#include "third_party/WebKit/public/platform/WebMediaKeySystemConfiguration.h"

#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"

#include "third_party/WebKit/public/platform/WebString.h"

@@ -265,7 +265,7 @@ bool KeySystemConfigSelector::IsSupportedContentType(

// This check does not handle extended codecs, so extended codec information

// is stripped.

std::vector<std::string> codec_vector;

- net::ParseCodecString(codecs, &codec_vector, true);

+ media::ParseCodecString(codecs, &codec_vector, true);

if (!key_systems_->IsSupportedCodecCombination(

key_system, media_type, container_lower, codec_vector)) {

return false;

@@ -273,7 +273,7 @@ bool KeySystemConfigSelector::IsSupportedContentType(

// Check that |container_mime_type| is supported by Chrome. This can only

// happen if the CDM declares support for a container that Chrome does not.

- if (!net::IsSupportedMediaMimeType(container_lower)) {

+ if (!media::IsSupportedMediaMimeType(container_lower)) {

NOTREACHED();

return false;

}

@@ -285,9 +285,9 @@ bool KeySystemConfigSelector::IsSupportedContentType(

if (codec_vector.empty())

return true;

codec_vector.clear();

- net::ParseCodecString(codecs, &codec_vector, false);

- return (net::IsSupportedStrictMediaMimeType(container_lower, codec_vector) ==

- net::IsSupported);

+ media::ParseCodecString(codecs, &codec_vector, false);

+ return (media::IsSupportedStrictMediaMimeType(container_lower, codec_vector)

+ == media::IsSupported);

Ryan Sleevi 2015/05/06 00:59:13 is this git cl formatted?

servolk 2015/05/06 01:13:39 No, for some reason it's broken on my machine, and

}

bool KeySystemConfigSelector::GetSupportedCapabilities(

« media/base/mime_util_unittest.cc ('K') | « media/base/mime_util_unittest.cc ('k') | media/media.gyp » ('j') | no next file with comments »