Commit 36328a6c authored by John Rummell's avatar John Rummell Committed by Commit Bot

Remove unused type converters

AudioDecoderConfig was changed to a type map a while back. EncryptionPattern
has no implementation anyway.

BUG=611224
TEST=media_mojo_unittests passes

Change-Id: I20a83d4ca20819447c563fd19207914fe04f0381
Reviewed-on: https://chromium-review.googlesource.com/1011360Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Reviewed-by: default avatarDaniel Cheng <dcheng@chromium.org>
Commit-Queue: John Rummell <jrummell@chromium.org>
Cr-Commit-Position: refs/heads/master@{#550644}
parent bdf5ef7c
......@@ -10,30 +10,14 @@
#include "base/numerics/safe_conversions.h"
#include "media/base/audio_buffer.h"
#include "media/base/audio_decoder_config.h"
#include "media/base/cdm_key_information.h"
#include "media/base/decoder_buffer.h"
#include "media/base/decrypt_config.h"
#include "media/base/encryption_pattern.h"
#include "media/base/encryption_scheme.h"
#include "media/base/subsample_entry.h"
#include "mojo/public/cpp/system/buffer.h"
namespace mojo {
template <>
struct TypeConverter<media::mojom::EncryptionPatternPtr,
media::EncryptionPattern> {
static media::mojom::EncryptionPatternPtr Convert(
const media::EncryptionPattern& input);
};
template <>
struct TypeConverter<media::EncryptionPattern,
media::mojom::EncryptionPatternPtr> {
static media::EncryptionPattern Convert(
const media::mojom::EncryptionPatternPtr& input);
};
// static
media::mojom::DecryptConfigPtr
TypeConverter<media::mojom::DecryptConfigPtr, media::DecryptConfig>::Convert(
......@@ -128,35 +112,6 @@ TypeConverter<scoped_refptr<media::DecoderBuffer>,
return buffer;
}
// static
media::mojom::AudioDecoderConfigPtr
TypeConverter<media::mojom::AudioDecoderConfigPtr, media::AudioDecoderConfig>::
Convert(const media::AudioDecoderConfig& input) {
media::mojom::AudioDecoderConfigPtr config(
media::mojom::AudioDecoderConfig::New());
config->codec = input.codec();
config->sample_format = input.sample_format();
config->channel_layout = input.channel_layout();
config->samples_per_second = input.samples_per_second();
config->extra_data = input.extra_data();
config->seek_preroll = input.seek_preroll();
config->codec_delay = input.codec_delay();
config->encryption_scheme = input.encryption_scheme();
return config;
}
// static
media::AudioDecoderConfig
TypeConverter<media::AudioDecoderConfig, media::mojom::AudioDecoderConfigPtr>::
Convert(const media::mojom::AudioDecoderConfigPtr& input) {
media::AudioDecoderConfig config;
config.Initialize(input->codec, input->sample_format, input->channel_layout,
input->samples_per_second, input->extra_data,
input->encryption_scheme, input->seek_preroll,
input->codec_delay);
return config;
}
// static
media::mojom::CdmKeyInformationPtr TypeConverter<
media::mojom::CdmKeyInformationPtr,
......
......@@ -14,7 +14,6 @@
namespace media {
class AudioBuffer;
class AudioDecoderConfig;
class DecoderBuffer;
class DecryptConfig;
struct CdmKeyInformation;
......@@ -48,19 +47,6 @@ struct TypeConverter<scoped_refptr<media::DecoderBuffer>,
const media::mojom::DecoderBufferPtr& input);
};
template <>
struct TypeConverter<media::mojom::AudioDecoderConfigPtr,
media::AudioDecoderConfig> {
static media::mojom::AudioDecoderConfigPtr Convert(
const media::AudioDecoderConfig& input);
};
template <>
struct TypeConverter<media::AudioDecoderConfig,
media::mojom::AudioDecoderConfigPtr> {
static media::AudioDecoderConfig Convert(
const media::mojom::AudioDecoderConfigPtr& input);
};
template <>
struct TypeConverter<media::mojom::CdmKeyInformationPtr,
media::CdmKeyInformation> {
......
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