Configure MediaCodec with CDM in ADVA

media/base/video_decoder_config.h

 // 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.
 
 #ifndef MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
 #define MEDIA_BASE_VIDEO_DECODER_CONFIG_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 47 matching lines @@
   // Returns true if all fields in |config| match this config.
   // Note: The contents of |extra_data_| are compared not the raw pointers.
   bool Matches(const VideoDecoderConfig& config) const;
 
   // Returns a human-readable string describing |*this|.  For debugging & test
   // output only.
   std::string AsHumanReadableString() const;
 
   std::string GetHumanReadableCodecName() const;
 
+  static std::string GetHumanReadableProfile(VideoCodecProfile profile);

[xhwang, 2015/12/07 22:14:15]

A static function seems to belong to media/base/video_codecs.h. If we do this,
we can make a static GetHumanReadableCodecName() in video_codec.h as well. So
the GetHumanReadableCodecName() at line 66 can be as simple as GetCodecName().

Also nit: GetHumanReadableProfileName() to be consistent with the codec one?

[Tima Vaisburd, 2015/12/08 02:12:24]

Created separate functions GetCodecName() and GetProfileName(). I also put them
into new file video_codec.cc

I hope the cleanup is in the right direction, but the scope of this CL has
expanded because of this change.

+
   VideoCodec codec() const { return codec_; }
   VideoCodecProfile profile() const { return profile_; }
 
   // Video format used to determine YUV buffer sizes.
   VideoPixelFormat format() const { return format_; }
 
   // The default color space of the decoded frames. Decoders should output
   // frames tagged with this color space unless they find a different value in
   // the bitstream.
   ColorSpace color_space() const { return color_space_; }
@@ skipping 34 matching lines @@
   bool is_encrypted_;
 
   // Not using DISALLOW_COPY_AND_ASSIGN here intentionally to allow the compiler
   // generated copy constructor and assignment operator. Since the extra data is
   // typically small, the performance impact is minimal.
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_VIDEO_DECODER_CONFIG_H_