From ab0a50979b9eb4dfa3320eff7e187e41efedf7a9 Mon Sep 17 00:00:00 2001 From: Jocelyn Turcotte Date: Fri, 8 Aug 2014 14:30:41 +0200 Subject: Update Chromium to beta version 37.0.2062.68 Change-Id: I188e3b5aff1bec75566014291b654eb19f5bc8ca Reviewed-by: Andras Becsi --- chromium/content/common/media/media_param_traits.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'chromium/content/common/media/media_param_traits.cc') 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::Log(const AudioParameters& p, void ParamTraits::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(p.pixel_format)); } @@ -72,7 +73,7 @@ bool ParamTraits::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; -- cgit v1.2.3