diff options
| author | timav <timav@chromium.org> | 2016-01-11 13:48:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-11 21:49:22 +0000 |
| commit | 39cbd4546d7a6300afde7e8c1816541323a1abb5 (patch) | |
| tree | 3ed60b2b2ffe20162e6778e3ac60717c93f5c307 /media/base/video_decoder_config.h | |
| parent | e32c23d735f8b3caa72bea1baccf9a4d5f4b5f00 (diff) | |
| download | chromium_src-39cbd4546d7a6300afde7e8c1816541323a1abb5.zip chromium_src-39cbd4546d7a6300afde7e8c1816541323a1abb5.tar.gz chromium_src-39cbd4546d7a6300afde7e8c1816541323a1abb5.tar.bz2 | |
Configure MediaCodec with CDM in ADVA
Implemented SetCdm() by retrieving the CDM object from mojo
(it should be MediaDrmBridge), registering this bridge
with nesessary callbacks and postponing the MediaCodec configuration
till we get the MediaCrypto object.
After MediaCrypto object is obtained we configure MediaCodec
and only then report the SetCdm() status by NotifyCdmAttached(bool).
With this approach any failure in MediaCodec creation is reported as
a CDM failure.
BUG=542417
Review URL: https://codereview.chromium.org/1469353010
Cr-Commit-Position: refs/heads/master@{#368679}
Diffstat (limited to 'media/base/video_decoder_config.h')
| -rw-r--r-- | media/base/video_decoder_config.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/base/video_decoder_config.h b/media/base/video_decoder_config.h index 8806bf2..ae9340a 100644 --- a/media/base/video_decoder_config.h +++ b/media/base/video_decoder_config.h @@ -67,6 +67,8 @@ class MEDIA_EXPORT VideoDecoderConfig { std::string GetHumanReadableCodecName() const; + static std::string GetHumanReadableProfile(VideoCodecProfile profile); + VideoCodec codec() const { return codec_; } VideoCodecProfile profile() const { return profile_; } |