Add support for avc3 codec string.

chrome/renderer/media/chrome_key_systems.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/media/chrome_key_systems.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 18 matching lines @@
 
 const char kAudioWebM[] = "audio/webm";
 const char kVideoWebM[] = "video/webm";
 const char kVorbis[] = "vorbis";
 const char kVorbisVP8[] = "vorbis,vp8,vp8.0";
 
 #if defined(USE_PROPRIETARY_CODECS)
 const char kAudioMp4[] = "audio/mp4";
 const char kVideoMp4[] = "video/mp4";
 const char kMp4a[] = "mp4a";
-const char kAvc1[] = "avc1";
-const char kMp4aAvc1[] = "mp4a,avc1";
+const char kAvc1Avc3[] = "avc1,avc3";
+const char kMp4aAvc1Avc3[] = "mp4a,avc1,avc3";
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)
 static bool IsPepperCdmRegistered(const std::string& pepper_type) {
   bool is_registered = false;
   content::RenderThread::Get()->Send(
       new ChromeViewHostMsg_IsInternalPluginRegisteredForMimeType(
           pepper_type, &is_registered));
 
   return is_registered;
 }
 
 // External Clear Key (used for testing).
 static void AddExternalClearKey(
     std::vector<KeySystemInfo>* concrete_key_systems) {
   static const char kExternalClearKeyKeySystem[] =
       "org.chromium.externalclearkey";
   static const char kExternalClearKeyPepperType[] =
       "application/x-ppapi-clearkey-cdm";
 
   if (!IsPepperCdmRegistered(kExternalClearKeyPepperType))
     return;
 
   KeySystemInfo info(kExternalClearKeyKeySystem);
 
   info.supported_types.push_back(std::make_pair(kAudioWebM, kVorbis));
   info.supported_types.push_back(std::make_pair(kVideoWebM, kVorbisVP8));
 #if defined(USE_PROPRIETARY_CODECS)
   info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a));
-  info.supported_types.push_back(std::make_pair(kVideoMp4, kMp4aAvc1));
+  info.supported_types.push_back(std::make_pair(kVideoMp4, kMp4aAvc1Avc3));
 #endif  // defined(USE_PROPRIETARY_CODECS)
   info.pepper_type = kExternalClearKeyPepperType;
 
   concrete_key_systems->push_back(info);
 
   // A key system that Chrome thinks is supported by ClearKeyCdm, but actually
   // will be refused by ClearKeyCdm. This is to test the CDM initialization
   // failure case.
   info.key_system += ".initializefail";
   concrete_key_systems->push_back(info);
@@ skipping 75 matching lines @@
   if (supported_codecs & WEBM_VP8_AND_VORBIS) {
     info.supported_types.push_back(std::make_pair(kAudioWebM, kVorbis));
     info.supported_types.push_back(std::make_pair(kVideoWebM, kVorbisVP8));
   }
 
 #if defined(USE_PROPRIETARY_CODECS)
   if (supported_codecs & MP4_AAC)
     info.supported_types.push_back(std::make_pair(kAudioMp4, kMp4a));
 
   if (supported_codecs & MP4_AVC1) {
-    const char* video_codecs = (supported_codecs & MP4_AAC) ? kMp4aAvc1 : kAvc1;
+    const char* video_codecs =
+        (supported_codecs & MP4_AAC) ? kMp4aAvc1Avc3 : kAvc1Avc3;
     info.supported_types.push_back(std::make_pair(kVideoMp4, video_codecs));
   }
 #endif  // defined(USE_PROPRIETARY_CODECS)
 
 #if defined(ENABLE_PEPPER_CDMS)
   info.pepper_type = kWidevineCdmPluginMimeType;
 #elif defined(OS_ANDROID)
   info.uuid.assign(kWidevineUuid, kWidevineUuid + arraysize(kWidevineUuid));
 #endif  // defined(ENABLE_PEPPER_CDMS)
 
@@ skipping 72 matching lines @@
 
 #if defined(WIDEVINE_CDM_AVAILABLE)
 #if defined(ENABLE_PEPPER_CDMS)
   AddPepperBasedWidevine(key_systems_info);
 #elif defined(OS_ANDROID)
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kEnableMediaDrm))
     AddAndroidWidevine(key_systems_info);
 #endif
 #endif
 }