Configure MediaCodec with CDM in ADVA

media/base/android/demuxer_stream_player_params.cc

 // Copyright (c) 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 "media/base/android/demuxer_stream_player_params.h"
 #include <iomanip>
 
 namespace media {
 
 DemuxerConfigs::DemuxerConfigs()
@@ skipping 28 matching lines @@
       return "VIDEO";
     case DemuxerStream::TEXT:
       return "TEXT";
     case DemuxerStream::NUM_TYPES:
       return "NUM_TYPES";
   }
   NOTREACHED();
   return nullptr;  // crash early
 }
 
-#undef RETURN_STRING
-#define RETURN_STRING(x) \
-  case x:                \
-    return #x;
-
-const char* AsString(AudioCodec codec) {
-  switch (codec) {
-    RETURN_STRING(kUnknownAudioCodec);
-    RETURN_STRING(kCodecAAC);
-    RETURN_STRING(kCodecMP3);
-    RETURN_STRING(kCodecPCM);
-    RETURN_STRING(kCodecVorbis);
-    RETURN_STRING(kCodecFLAC);
-    RETURN_STRING(kCodecAMR_NB);
-    RETURN_STRING(kCodecAMR_WB);
-    RETURN_STRING(kCodecPCM_MULAW);
-    RETURN_STRING(kCodecGSM_MS);
-    RETURN_STRING(kCodecPCM_S16BE);
-    RETURN_STRING(kCodecPCM_S24BE);
-    RETURN_STRING(kCodecOpus);
-    RETURN_STRING(kCodecEAC3);
-    RETURN_STRING(kCodecPCM_ALAW);
-    RETURN_STRING(kCodecALAC);
-    RETURN_STRING(kCodecAC3);
-  }
-  NOTREACHED();
-  return nullptr;  // crash early
-}
-
-const char* AsString(VideoCodec codec) {
-  switch (codec) {
-    RETURN_STRING(kUnknownVideoCodec);
-    RETURN_STRING(kCodecH264);
-    RETURN_STRING(kCodecHEVC);
-    RETURN_STRING(kCodecVC1);
-    RETURN_STRING(kCodecMPEG2);
-    RETURN_STRING(kCodecMPEG4);
-    RETURN_STRING(kCodecTheora);
-    RETURN_STRING(kCodecVP8);
-    RETURN_STRING(kCodecVP9);
-  }
-  NOTREACHED();
-  return nullptr;  // crash early
-}
-
 const char* AsString(DemuxerStream::Status status) {
   switch (status) {
     case DemuxerStream::kOk:
       return "kOk";
     case DemuxerStream::kAborted:
       return "kAborted";
     case DemuxerStream::kConfigChanged:
       return "kConfigChanged";
   }
   NOTREACHED();
   return nullptr;  // crash early
 }
 
-#undef RETURN_STRING
-
 }  // namespace (anonymous)
 
 }  // namespace media
 
 std::ostream& operator<<(std::ostream& os, media::DemuxerStream::Type type) {
   os << media::AsString(type);
   return os;
 }
 
 std::ostream& operator<<(std::ostream& os, const media::AccessUnit& au) {
   os << "status:" << media::AsString(au.status)
      << (au.is_end_of_stream ? " EOS" : "")
      << (au.is_key_frame ? " KEY_FRAME" : "") << " pts:" << au.timestamp
      << " size:" << au.data.size();
   return os;
 }
 
 std::ostream& operator<<(std::ostream& os, const media::DemuxerConfigs& conf) {
   os << "duration:" << conf.duration;
 
   if (conf.audio_codec == media::kUnknownAudioCodec &&
       conf.video_codec == media::kUnknownVideoCodec) {
     os << " no audio, no video";
     return os;
   }
 
   if (conf.audio_codec != media::kUnknownAudioCodec) {
-    os << " audio:" << media::AsString(conf.audio_codec)
+    os << " audio:" << media::GetCodecName(conf.audio_codec)
        << " channels:" << conf.audio_channels
        << " rate:" << conf.audio_sampling_rate
        << (conf.is_audio_encrypted ? " encrypted" : "")
        << " delay (ns):" << conf.audio_codec_delay_ns
        << " preroll (ns):" << conf.audio_seek_preroll_ns;
 
     if (!conf.audio_extra_data.empty()) {
       os << " extra:{" << std::hex;
       for (uint8_t byte : conf.audio_extra_data)
         os << " " << std::setfill('0') << std::setw(2) << (int)byte;
       os << "}" << std::dec;
     }
   }
 
   if (conf.video_codec != media::kUnknownVideoCodec) {
-    os << " video:" << media::AsString(conf.video_codec) << " "
+    os << " video:" << media::GetCodecName(conf.video_codec) << " "
        << conf.video_size.width() << "x" << conf.video_size.height()
        << (conf.is_video_encrypted ? " encrypted" : "");
   }
 
   return os;
 }