Bug 1147744 - Part 1: Round down display size. r=k17e, a=lizzard
authorJean-Yves Avenard <jyavenard@mozilla.com>
Wed, 08 Apr 2015 14:26:35 +1000
changeset 254949 40a427f948c9218710bac9ae2720cb56216e461d
parent 254948 8d2d128ce671f8b977dc07d265e47ec43a01c02a
child 254950 21784d04ac243e559b150b1fb50d2792fce3670e
push id7906
push userryanvm@gmail.com
push dateFri, 10 Apr 2015 19:45:00 +0000
treeherdermozilla-aurora@9a51ebc0490a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersk17e, lizzard
bugs1147744
milestone39.0a2
Bug 1147744 - Part 1: Round down display size. r=k17e, a=lizzard
media/libstagefright/binding/H264.cpp
--- a/media/libstagefright/binding/H264.cpp
+++ b/media/libstagefright/binding/H264.cpp
@@ -4,17 +4,16 @@
 
 #include "mozilla/ArrayUtils.h"
 #include "mozilla/PodOperations.h"
 #include "mp4_demuxer/AnnexB.h"
 #include "mp4_demuxer/ByteReader.h"
 #include "mp4_demuxer/ByteWriter.h"
 #include "mp4_demuxer/H264.h"
 #include <media/stagefright/foundation/ABitReader.h>
-#include <cmath>
 
 using namespace mozilla;
 
 namespace mp4_demuxer
 {
 
 class BitReader
 {
@@ -127,17 +126,17 @@ H264::DecodeNALUnit(const ByteBuffer* aN
   return rbsp.forget();
 }
 
 static int32_t
 ConditionDimension(float aValue)
 {
   // This will exclude NaNs and too-big values.
   if (aValue > 1.0 && aValue <= INT32_MAX)
-    return int32_t(round(aValue));
+    return int32_t(aValue);
   return 0;
 }
 
 /* static */ bool
 H264::DecodeSPS(const ByteBuffer* aSPS, SPSData& aDest)
 {
   MOZ_ASSERT(aSPS);
   BitReader br(*aSPS);