media: Clean up MediaCodecBridge and remove subclasses

components/cdm/browser/cdm_message_filter_android.cc

 // Copyright 2014 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 "components/cdm/browser/cdm_message_filter_android.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "components/cdm/common/cdm_messages_android.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/android/media_drm_bridge.h"
+#include "media/base/audio_codecs.h"
+#include "media/base/video_codecs.h"
 #include "media/media_features.h"
 
 using content::BrowserThread;
 using media::MediaDrmBridge;
 using media::SupportedCodecs;
 
 namespace cdm {
 
 const size_t kMaxKeySystemLength = 256;
 
 enum CodecType {
   CODEC_AUDIO,
   CODEC_VIDEO
 };
 
 struct CodecInfo {
   SupportedCodecs codec;
   CodecType codec_type;
-  const char* codec_name;
+  const std::string mime_type;
   const char* container_mime_type;
 };
 
 const CodecInfo kCodecsToQuery[] = {
-  {media::EME_CODEC_WEBM_OPUS, CODEC_AUDIO, "opus", "video/webm"},

[watk, 2017/02/14 01:40:50]

By passing the mime type instead of names we can remove the name->mime
conversion function from MediaCodecUtil.

-  {media::EME_CODEC_WEBM_VORBIS, CODEC_AUDIO, "vorbis", "video/webm"},
-  {media::EME_CODEC_WEBM_VP8, CODEC_VIDEO, "vp8", "video/webm"},
-  {media::EME_CODEC_WEBM_VP9, CODEC_VIDEO, "vp9", "video/webm"},
+    {media::EME_CODEC_WEBM_OPUS, CODEC_AUDIO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecOpus),
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VORBIS, CODEC_AUDIO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecVorbis),
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VP8, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecVP8),
+     "video/webm"},
+    {media::EME_CODEC_WEBM_VP9, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecVP9),
+     "video/webm"},
 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
-  {media::EME_CODEC_MP4_AAC, CODEC_AUDIO, "mp4a", "video/mp4"},
-  {media::EME_CODEC_MP4_AVC1, CODEC_VIDEO, "avc1", "video/mp4"},
+    {media::EME_CODEC_MP4_AAC, CODEC_AUDIO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecAAC),
+     "video/mp4"},
+    {media::EME_CODEC_MP4_AVC1, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecH264),
+     "video/mp4"},
 #if BUILDFLAG(ENABLE_HEVC_DEMUXING)
-  {media::EME_CODEC_MP4_HEVC, CODEC_VIDEO, "hvc1", "video/mp4"},
+    {media::EME_CODEC_MP4_HEVC, CODEC_VIDEO,
+     media::MediaCodecUtil::CodecToAndroidMimeType(media::kCodecHevc),
+     "video/mp4"},
 #endif
 #endif  // BUILDFLAG(USE_PROPRIETARY_CODECS)
 };
 
 static SupportedCodecs GetSupportedCodecs(
     const SupportedKeySystemRequest& request,
     bool video_must_be_compositable) {
   const std::string& key_system = request.key_system;
   SupportedCodecs supported_codecs = media::EME_CODEC_NONE;
 
   for (size_t i = 0; i < arraysize(kCodecsToQuery); ++i) {
     const CodecInfo& info = kCodecsToQuery[i];
     // TODO(qinmin): Remove the composition logic when secure contents can be
     // composited.
     bool is_secure = (info.codec_type == CODEC_VIDEO)
                          ? (!video_must_be_compositable) : false;
     if ((request.codecs & info.codec) &&
         MediaDrmBridge::IsKeySystemSupportedWithType(
             key_system, info.container_mime_type) &&
-        media::MediaCodecUtil::CanDecode(info.codec_name, is_secure)) {
+        media::MediaCodecUtil::CanDecode(info.mime_type, is_secure)) {
       supported_codecs |= info.codec;
     }
   }
 
   return supported_codecs;
 }
 
 CdmMessageFilterAndroid::CdmMessageFilterAndroid()
     : BrowserMessageFilter(EncryptedMediaMsgStart) {}
 
@@ skipping 43 matching lines @@
   response->is_persistent_license_supported =
       MediaDrmBridge::IsPersistentLicenseTypeSupported(request.key_system);
 }
 
 void CdmMessageFilterAndroid::OnGetPlatformKeySystemNames(
     std::vector<std::string>* key_systems) {
   *key_systems = MediaDrmBridge::GetPlatformKeySystemNames();
 }
 
 }  // namespace cdm