| Index: content/common/media/media_param_traits.cc
|
| diff --git a/content/common/media/media_param_traits.cc b/content/common/media/media_param_traits.cc
|
| index 18058d8ffa81edf41e522fc6e2a73e7a55062893..0bdd3c510940841c12d11c695d99293d4117617c 100644
|
| --- a/content/common/media/media_param_traits.cc
|
| +++ b/content/common/media/media_param_traits.cc
|
| @@ -11,8 +11,6 @@
|
|
|
| using media::AudioParameters;
|
| using media::ChannelLayout;
|
| -using media::VideoCaptureFormat;
|
| -using media::VideoCaptureSessionId;
|
|
|
| namespace IPC {
|
|
|
| @@ -54,35 +52,4 @@ void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
|
| l->append(base::StringPrintf("<AudioParameters>"));
|
| }
|
|
|
| -void ParamTraits<VideoCaptureFormat>::Write(Message* m,
|
| - const VideoCaptureFormat& p) {
|
| - m->WriteInt(p.width);
|
| - m->WriteInt(p.height);
|
| - m->WriteInt(p.frame_rate);
|
| - m->WriteInt(static_cast<int>(p.frame_size_type));
|
| -}
|
| -
|
| -bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
|
| - PickleIterator* iter,
|
| - VideoCaptureFormat* r) {
|
| - int frame_size_type;
|
| - if (!m->ReadInt(iter, &r->width) ||
|
| - !m->ReadInt(iter, &r->height) ||
|
| - !m->ReadInt(iter, &r->frame_rate) ||
|
| - !m->ReadInt(iter, &frame_size_type))
|
| - return false;
|
| -
|
| - r->frame_size_type =
|
| - static_cast<media::VideoCaptureResolutionType>(
|
| - frame_size_type);
|
| - if (!r->IsValid())
|
| - return false;
|
| - return true;
|
| -}
|
| -
|
| -void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
|
| - std::string* l) {
|
| - l->append(base::StringPrintf("<VideoCaptureFormat>"));
|
| -}
|
| -
|
| }
|
|
|