Configure MediaCodec with CDM in ADVA

media/filters/chunk_demuxer.cc

 // Copyright (c) 2012 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/filters/chunk_demuxer.h"
 
 #include <algorithm>
 #include <limits>
 #include <list>
 #include <utility>
@@ skipping 670 matching lines @@
   }
 
   bool success = true;
   if (audio_config.IsValidConfig()) {
     if (!audio_) {
       media_log_->SetBooleanProperty("found_audio_stream", true);
     }
     if (!audio_ ||
         audio_->audio_decoder_config().codec() != audio_config.codec()) {
       media_log_->SetStringProperty("audio_codec_name",
-                                    audio_config.GetHumanReadableCodecName());
+                                    GetCodecName(audio_config.codec()));
     }
 
     if (!audio_) {
       audio_ = create_demuxer_stream_cb_.Run(DemuxerStream::AUDIO);
 
       if (!audio_) {
         DVLOG(1) << "Failed to create an audio stream.";
         return false;
       }
 
       if (!frame_processor_->AddTrack(FrameProcessor::kAudioTrackId, audio_)) {
         DVLOG(1) << "Failed to add audio track to frame processor.";
         return false;
       }
     }
 
     frame_processor_->OnPossibleAudioConfigUpdate(audio_config);
     success &= audio_->UpdateAudioConfig(audio_config, media_log_);
   }
 
   if (video_config.IsValidConfig()) {
     if (!video_) {
       media_log_->SetBooleanProperty("found_video_stream", true);
     }
     if (!video_ ||
         video_->video_decoder_config().codec() != video_config.codec()) {
       media_log_->SetStringProperty("video_codec_name",
-                                    video_config.GetHumanReadableCodecName());
+                                    GetCodecName(video_config.codec()));
     }
 
     if (!video_) {
       video_ = create_demuxer_stream_cb_.Run(DemuxerStream::VIDEO);
 
       if (!video_) {
         DVLOG(1) << "Failed to create a video stream.";
         return false;
       }
 
@@ skipping 1237 matching lines @@
 }
 
 void ChunkDemuxer::ShutdownAllStreams() {
   for (SourceStateMap::iterator itr = source_state_map_.begin();
        itr != source_state_map_.end(); ++itr) {
     itr->second->Shutdown();
   }
 }
 
 }  // namespace media