Skip to content

GitLab

T
tangled
Commit b826c0e4 authored by Ted Meyer's avatar Ted Meyer Committed by Commit Bot
Browse files
Options

Code Cleanup: remove "media::" from unneeded places in media_serializers 

these structs are already in the media namespace, they dont need media::

Change-Id: I2844d35cf27d46b860b4969ea5e1960d522f3d0e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2339390Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Ted Meyer <tmathmeyer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#795329}
parent 2597f3b4
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 40 deletions
media/base/media_serializers.h
View file @ b826c0e4
...@@ -133,56 +133,56 @@ struct MediaSerializer<base::TimeDelta> { ...@@ -133,56 +133,56 @@ struct MediaSerializer<base::TimeDelta> {
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::AudioCodec> { struct MediaSerializer<AudioCodec> {
static inline base::Value Serialize(media::AudioCodec value) { static inline base::Value Serialize(AudioCodec value) {
return base::Value(GetCodecName(value)); return base::Value(GetCodecName(value));
} }
}; };
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::AudioCodecProfile> { struct MediaSerializer<AudioCodecProfile> {
static inline base::Value Serialize(media::AudioCodecProfile value) { static inline base::Value Serialize(AudioCodecProfile value) {
return base::Value(GetProfileName(value)); return base::Value(GetProfileName(value));
} }
}; };
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::VideoCodec> { struct MediaSerializer<VideoCodec> {
static inline base::Value Serialize(media::VideoCodec value) { static inline base::Value Serialize(VideoCodec value) {
return base::Value(GetCodecName(value)); return base::Value(GetCodecName(value));
} }
}; };
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::VideoCodecProfile> { struct MediaSerializer<VideoCodecProfile> {
static inline base::Value Serialize(media::VideoCodecProfile value) { static inline base::Value Serialize(VideoCodecProfile value) {
return base::Value(GetProfileName(value)); return base::Value(GetProfileName(value));
} }
}; };
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::ChannelLayout> { struct MediaSerializer<ChannelLayout> {
static inline base::Value Serialize(media::ChannelLayout value) { static inline base::Value Serialize(ChannelLayout value) {
return base::Value(ChannelLayoutToString(value)); return base::Value(ChannelLayoutToString(value));
} }
}; };
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::SampleFormat> { struct MediaSerializer<SampleFormat> {
static inline base::Value Serialize(media::SampleFormat value) { static inline base::Value Serialize(SampleFormat value) {
return base::Value(SampleFormatToString(value)); return base::Value(SampleFormatToString(value));
} }
}; };
// Enum (complex) // Enum (complex)
template <> template <>
struct MediaSerializer<media::EncryptionScheme> { struct MediaSerializer<EncryptionScheme> {
static base::Value Serialize(const media::EncryptionScheme& value) { static base::Value Serialize(const EncryptionScheme& value) {
std::ostringstream encryptionSchemeString; std::ostringstream encryptionSchemeString;
encryptionSchemeString << value; encryptionSchemeString << value;
return base::Value(encryptionSchemeString.str()); return base::Value(encryptionSchemeString.str());
...@@ -191,8 +191,8 @@ struct MediaSerializer<media::EncryptionScheme> { ...@@ -191,8 +191,8 @@ struct MediaSerializer<media::EncryptionScheme> {
// Class (complex) // Class (complex)
template <> template <>
struct MediaSerializer<media::VideoTransformation> { struct MediaSerializer<VideoTransformation> {
static base::Value Serialize(const media::VideoTransformation& value) { static base::Value Serialize(const VideoTransformation& value) {
std::string rotation = VideoRotationToString(value.rotation); std::string rotation = VideoRotationToString(value.rotation);
if (value.mirrored) if (value.mirrored)
rotation += ", mirrored"; rotation += ", mirrored";
...@@ -202,16 +202,16 @@ struct MediaSerializer<media::VideoTransformation> { ...@@ -202,16 +202,16 @@ struct MediaSerializer<media::VideoTransformation> {
// Class (simple) // Class (simple)
template <> template <>
struct MediaSerializer<media::VideoColorSpace> { struct MediaSerializer<VideoColorSpace> {
static inline base::Value Serialize(const media::VideoColorSpace& value) { static inline base::Value Serialize(const VideoColorSpace& value) {
return base::Value(value.ToGfxColorSpace().ToString()); return base::Value(value.ToGfxColorSpace().ToString());
} }
}; };
// Class (complex) // Class (complex)
template <> template <>
struct MediaSerializer<media::HDRMetadata> { struct MediaSerializer<HDRMetadata> {
static base::Value Serialize(const media::HDRMetadata& value) { static base::Value Serialize(const HDRMetadata& value) {
// TODO(tmathmeyer) serialize more fields here potentially. // TODO(tmathmeyer) serialize more fields here potentially.
base::Value result(base::Value::Type::DICTIONARY); base::Value result(base::Value::Type::DICTIONARY);
FIELD_SERIALIZE("luminance range", FIELD_SERIALIZE("luminance range",
...@@ -235,8 +235,8 @@ struct MediaSerializer<media::HDRMetadata> { ...@@ -235,8 +235,8 @@ struct MediaSerializer<media::HDRMetadata> {
// Class (complex) // Class (complex)
template <> template <>
struct MediaSerializer<media::AudioDecoderConfig> { struct MediaSerializer<AudioDecoderConfig> {
static base::Value Serialize(const media::AudioDecoderConfig& value) { static base::Value Serialize(const AudioDecoderConfig& value) {
base::Value result(base::Value::Type::DICTIONARY); base::Value result(base::Value::Type::DICTIONARY);
FIELD_SERIALIZE("codec", value.codec()); FIELD_SERIALIZE("codec", value.codec());
FIELD_SERIALIZE("profile", value.profile()); FIELD_SERIALIZE("profile", value.profile());
...@@ -265,9 +265,8 @@ struct MediaSerializer<media::AudioDecoderConfig> { ...@@ -265,9 +265,8 @@ struct MediaSerializer<media::AudioDecoderConfig> {
// Enum (simple) // Enum (simple)
template <> template <>
struct MediaSerializer<media::VideoDecoderConfig::AlphaMode> { struct MediaSerializer<VideoDecoderConfig::AlphaMode> {
static inline base::Value Serialize( static inline base::Value Serialize(VideoDecoderConfig::AlphaMode value) {
media::VideoDecoderConfig::AlphaMode value) {
return base::Value(value == VideoDecoderConfig::AlphaMode::kHasAlpha return base::Value(value == VideoDecoderConfig::AlphaMode::kHasAlpha
? "has_alpha" ? "has_alpha"
: "is_opaque"); : "is_opaque");
...@@ -276,8 +275,8 @@ struct MediaSerializer<media::VideoDecoderConfig::AlphaMode> { ...@@ -276,8 +275,8 @@ struct MediaSerializer<media::VideoDecoderConfig::AlphaMode> {
// Class (complex) // Class (complex)
template <> template <>
struct MediaSerializer<media::VideoDecoderConfig> { struct MediaSerializer<VideoDecoderConfig> {
static base::Value Serialize(const media::VideoDecoderConfig& value) { static base::Value Serialize(const VideoDecoderConfig& value) {
base::Value result(base::Value::Type::DICTIONARY); base::Value result(base::Value::Type::DICTIONARY);
FIELD_SERIALIZE("codec", value.codec()); FIELD_SERIALIZE("codec", value.codec());
FIELD_SERIALIZE("profile", value.profile()); FIELD_SERIALIZE("profile", value.profile());
...@@ -296,9 +295,9 @@ struct MediaSerializer<media::VideoDecoderConfig> { ...@@ -296,9 +295,9 @@ struct MediaSerializer<media::VideoDecoderConfig> {
// enum (simple) // enum (simple)
template <> template <>
struct MediaSerializer<media::BufferingState> { struct MediaSerializer<BufferingState> {
static inline base::Value Serialize(const media::BufferingState value) { static inline base::Value Serialize(const BufferingState value) {
return base::Value(value == media::BufferingState::BUFFERING_HAVE_ENOUGH return base::Value(value == BufferingState::BUFFERING_HAVE_ENOUGH
? "BUFFERING_HAVE_ENOUGH" ? "BUFFERING_HAVE_ENOUGH"
: "BUFFERING_HAVE_NOTHING"); : "BUFFERING_HAVE_NOTHING");
} }
...@@ -306,8 +305,8 @@ struct MediaSerializer<media::BufferingState> { ...@@ -306,8 +305,8 @@ struct MediaSerializer<media::BufferingState> {
// enum (complex) // enum (complex)
template <> template <>
struct MediaSerializer<media::BufferingStateChangeReason> { struct MediaSerializer<BufferingStateChangeReason> {
static base::Value Serialize(const media::BufferingStateChangeReason value) { static base::Value Serialize(const BufferingStateChangeReason value) {
switch (value) { switch (value) {
case DEMUXER_UNDERFLOW: case DEMUXER_UNDERFLOW:
return base::Value("DEMUXER_UNDERFLOW"); return base::Value("DEMUXER_UNDERFLOW");
...@@ -322,10 +321,9 @@ struct MediaSerializer<media::BufferingStateChangeReason> { ...@@ -322,10 +321,9 @@ struct MediaSerializer<media::BufferingStateChangeReason> {
}; };
// Class (complex) // Class (complex)
template <media::SerializableBufferingStateType T> template <SerializableBufferingStateType T>
struct MediaSerializer<media::SerializableBufferingState<T>> { struct MediaSerializer<SerializableBufferingState<T>> {
static base::Value Serialize( static base::Value Serialize(const SerializableBufferingState<T>& value) {
const media::SerializableBufferingState<T>& value) {
base::Value result(base::Value::Type::DICTIONARY); base::Value result(base::Value::Type::DICTIONARY);
FIELD_SERIALIZE("state", value.state); FIELD_SERIALIZE("state", value.state);
...@@ -350,16 +348,16 @@ struct MediaSerializer<media::SerializableBufferingState<T>> { ...@@ -350,16 +348,16 @@ struct MediaSerializer<media::SerializableBufferingState<T>> {
// enum (simple) // enum (simple)
template <> template <>
struct MediaSerializer<media::StatusCode> { struct MediaSerializer<StatusCode> {
static inline base::Value Serialize(media::StatusCode code) { static inline base::Value Serialize(StatusCode code) {
return base::Value(static_cast<int>(code)); return base::Value(static_cast<int>(code));
} }
}; };
// Class (complex) // Class (complex)
template <> template <>
struct MediaSerializer<media::Status> { struct MediaSerializer<Status> {
static base::Value Serialize(const media::Status& status) { static base::Value Serialize(const Status& status) {
if (status.is_ok()) if (status.is_ok())
return base::Value("Ok"); return base::Value("Ok");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment