Index: media/mojo/common/media_type_converters.cc |
diff --git a/media/mojo/common/media_type_converters.cc b/media/mojo/common/media_type_converters.cc |
index 7725a2edfc59fce1fcf66a5c29f20f9143acaa84..f1bf033cd9e24028f00c82ab2d901a79a7ea889a 100644 |
--- a/media/mojo/common/media_type_converters.cc |
+++ b/media/mojo/common/media_type_converters.cc |
@@ -17,7 +17,6 @@ |
#include "media/base/decrypt_config.h" |
#include "media/base/decryptor.h" |
#include "media/base/demuxer_stream.h" |
-#include "media/base/encryption_scheme.h" |
#include "media/base/media_keys.h" |
#include "media/base/video_decoder_config.h" |
#include "media/base/video_frame.h" |
@@ -222,20 +221,6 @@ |
ASSERT_ENUM_EQ(VideoCodecProfile, , , VP9PROFILE_MAX); |
ASSERT_ENUM_EQ(VideoCodecProfile, , , VIDEO_CODEC_PROFILE_MAX); |
-// CipherMode |
-ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode, |
- EncryptionScheme::CipherMode::CIPHER_MODE_UNENCRYPTED, |
- CipherMode::UNENCRYPTED); |
-ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode, |
- EncryptionScheme::CipherMode::CIPHER_MODE_AES_CTR, |
- CipherMode::AES_CTR); |
-ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode, |
- EncryptionScheme::CipherMode::CIPHER_MODE_AES_CBC, |
- CipherMode::AES_CBC); |
-ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode, |
- EncryptionScheme::CipherMode::CIPHER_MODE_MAX, |
- CipherMode::MAX); |
- |
// Decryptor Status |
ASSERT_ENUM_EQ_RAW(Decryptor::Status, |
Decryptor::kSuccess, |
@@ -309,59 +294,6 @@ |
ASSERT_CDM_MESSAGE_TYPE(LICENSE_REQUEST); |
ASSERT_CDM_MESSAGE_TYPE(LICENSE_RENEWAL); |
ASSERT_CDM_MESSAGE_TYPE(LICENSE_RELEASE); |
- |
-template <> |
-struct TypeConverter<media::interfaces::PatternPtr, |
- media::EncryptionScheme::Pattern> { |
- static media::interfaces::PatternPtr Convert( |
- const media::EncryptionScheme::Pattern& input); |
-}; |
-template <> |
-struct TypeConverter<media::EncryptionScheme::Pattern, |
- media::interfaces::PatternPtr> { |
- static media::EncryptionScheme::Pattern Convert( |
- const media::interfaces::PatternPtr& input); |
-}; |
- |
-// static |
-media::interfaces::PatternPtr |
-TypeConverter<media::interfaces::PatternPtr, media::EncryptionScheme::Pattern>:: |
- Convert(const media::EncryptionScheme::Pattern& input) { |
- media::interfaces::PatternPtr mojo_pattern(media::interfaces::Pattern::New()); |
- mojo_pattern->encrypt_blocks = input.encrypt_blocks(); |
- mojo_pattern->skip_blocks = input.skip_blocks(); |
- return mojo_pattern; |
-} |
- |
-// static |
-media::EncryptionScheme::Pattern |
-TypeConverter<media::EncryptionScheme::Pattern, media::interfaces::PatternPtr>:: |
- Convert(const media::interfaces::PatternPtr& input) { |
- return media::EncryptionScheme::Pattern(input->encrypt_blocks, |
- input->skip_blocks); |
-} |
- |
-// static |
-media::interfaces::EncryptionSchemePtr TypeConverter< |
- media::interfaces::EncryptionSchemePtr, |
- media::EncryptionScheme>::Convert(const media::EncryptionScheme& input) { |
- media::interfaces::EncryptionSchemePtr mojo_encryption_scheme( |
- media::interfaces::EncryptionScheme::New()); |
- mojo_encryption_scheme->mode = |
- static_cast<media::interfaces::CipherMode>(input.mode()); |
- mojo_encryption_scheme->pattern = |
- media::interfaces::Pattern::From(input.pattern()); |
- return mojo_encryption_scheme; |
-} |
- |
-// static |
-media::EncryptionScheme |
-TypeConverter<media::EncryptionScheme, media::interfaces::EncryptionSchemePtr>:: |
- Convert(const media::interfaces::EncryptionSchemePtr& input) { |
- return media::EncryptionScheme( |
- static_cast<media::EncryptionScheme::CipherMode>(input->mode), |
- input->pattern.To<media::EncryptionScheme::Pattern>()); |
-} |
// static |
media::interfaces::SubsampleEntryPtr TypeConverter< |
@@ -503,8 +435,7 @@ |
} |
config->seek_preroll_usec = input.seek_preroll().InMicroseconds(); |
config->codec_delay = input.codec_delay(); |
- config->encryption_scheme = |
- media::interfaces::EncryptionScheme::From(input.encryption_scheme()); |
+ config->is_encrypted = input.is_encrypted(); |
return config; |
} |
@@ -518,7 +449,7 @@ |
static_cast<media::SampleFormat>(input->sample_format), |
static_cast<media::ChannelLayout>(input->channel_layout), |
input->samples_per_second, input->extra_data.storage(), |
- input->encryption_scheme.To<media::EncryptionScheme>(), |
+ input->is_encrypted, |
base::TimeDelta::FromMicroseconds(input->seek_preroll_usec), |
input->codec_delay); |
return config; |
@@ -543,8 +474,7 @@ |
if (!input.extra_data().empty()) { |
config->extra_data = mojo::Array<uint8_t>::From(input.extra_data()); |
} |
- config->encryption_scheme = |
- media::interfaces::EncryptionScheme::From(input.encryption_scheme()); |
+ config->is_encrypted = input.is_encrypted(); |
return config; |
} |
@@ -554,14 +484,14 @@ |
media::interfaces::VideoDecoderConfigPtr>:: |
Convert(const media::interfaces::VideoDecoderConfigPtr& input) { |
media::VideoDecoderConfig config; |
- config.Initialize( |
- static_cast<media::VideoCodec>(input->codec), |
- static_cast<media::VideoCodecProfile>(input->profile), |
- static_cast<media::VideoPixelFormat>(input->format), |
- static_cast<media::ColorSpace>(input->color_space), |
- input->coded_size.To<gfx::Size>(), input->visible_rect.To<gfx::Rect>(), |
- input->natural_size.To<gfx::Size>(), input->extra_data.storage(), |
- input->encryption_scheme.To<media::EncryptionScheme>()); |
+ config.Initialize(static_cast<media::VideoCodec>(input->codec), |
+ static_cast<media::VideoCodecProfile>(input->profile), |
+ static_cast<media::VideoPixelFormat>(input->format), |
+ static_cast<media::ColorSpace>(input->color_space), |
+ input->coded_size.To<gfx::Size>(), |
+ input->visible_rect.To<gfx::Rect>(), |
+ input->natural_size.To<gfx::Size>(), |
+ input->extra_data.storage(), input->is_encrypted); |
return config; |
} |