diff options
| author | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 17:41:25 +0000 |
|---|---|---|
| committer | xhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-21 17:41:25 +0000 |
| commit | 3f412f7f324f4486ef11c54505e80fe2d307e8ad (patch) | |
| tree | c448c4073eca7a10639b6fff3114364d6e09ebf3 /android_webview | |
| parent | 0a1b1e6acb78b8680a42d50513114dc1c3c36477 (diff) | |
| download | chromium_src-3f412f7f324f4486ef11c54505e80fe2d307e8ad.zip chromium_src-3f412f7f324f4486ef11c54505e80fe2d307e8ad.tar.gz chromium_src-3f412f7f324f4486ef11c54505e80fe2d307e8ad.tar.bz2 | |
Use ContainerCodecsMap in KeySystemInfo.
This replaces std::vector<ContainerCodecsPair> and avoids unnecessary string
splits.
BUG=354612
Review URL: https://codereview.chromium.org/237513005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@265018 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/renderer/aw_key_systems.cc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/android_webview/renderer/aw_key_systems.cc b/android_webview/renderer/aw_key_systems.cc index dc61bf9..ec976f0 100644 --- a/android_webview/renderer/aw_key_systems.cc +++ b/android_webview/renderer/aw_key_systems.cc @@ -8,7 +8,6 @@ #include "base/command_line.h" #include "base/logging.h" -#include "base/strings/string_split.h" #include "third_party/widevine/cdm/widevine_cdm_common.h" using content::KeySystemInfo; @@ -18,7 +17,8 @@ namespace { const char kAudioMp4[] = "audio/mp4"; const char kVideoMp4[] = "video/mp4"; const char kMp4a[] = "mp4a"; -const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3"; +const char kAvc1[] = "avc1"; +const char kAvc3[] = "avc3"; // Return |name|'s parent key system. std::string GetDirectParentName(const std::string& name) { @@ -35,8 +35,10 @@ void AddWidevineWithCodecs(const std::string& key_system_name, if (add_parent_name) info.parent_key_system = GetDirectParentName(key_system_name); - info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a)); - info.supported_types.push_back(std::make_pair(kVideoMp4, kMp4aAvc1Avc3)); + info.supported_types[kAudioMp4].insert(kMp4a); + info.supported_types[kVideoMp4] = info.supported_types[kAudioMp4]; + info.supported_types[kVideoMp4].insert(kAvc1); + info.supported_types[kVideoMp4].insert(kAvc3); concrete_key_systems->push_back(info); } |