summaryrefslogtreecommitdiffstats
path: root/chromium/content/common/media/media_param_traits.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/content/common/media/media_param_traits.cc')
-rw-r--r--chromium/content/common/media/media_param_traits.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/content/common/media/media_param_traits.cc b/chromium/content/common/media/media_param_traits.cc
index 3ec6a25994c..345f838119b 100644
--- a/chromium/content/common/media/media_param_traits.cc
+++ b/chromium/content/common/media/media_param_traits.cc
@@ -60,9 +60,10 @@ void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
void ParamTraits<VideoCaptureFormat>::Write(Message* m,
const VideoCaptureFormat& p) {
+ // Crash during Send rather than have a failure at the message handler.
m->WriteInt(p.frame_size.width());
m->WriteInt(p.frame_size.height());
- m->WriteInt(p.frame_rate);
+ m->WriteFloat(p.frame_rate);
m->WriteInt(static_cast<int>(p.pixel_format));
}
@@ -72,7 +73,7 @@ bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
int frame_size_width, frame_size_height, pixel_format;
if (!m->ReadInt(iter, &frame_size_width) ||
!m->ReadInt(iter, &frame_size_height) ||
- !m->ReadInt(iter, &r->frame_rate) ||
+ !m->ReadFloat(iter, &r->frame_rate) ||
!m->ReadInt(iter, &pixel_format))
return false;