commit 6796e7f134d2ae5fa9e09c1d04a9fdb822c11f60
author Urvang Joshi <urvang@google.com> Fri Jul 15 12:47:01 2016 -0700
committer Urvang Joshi <urvang@google.com> Sat Aug 27 01:08:08 2016 +0000
tree ee480b9594b7bec35f206e3b8fb315975374f82f
parent 764d1266a67c9364091a432ee959a52115dbb72a

Remove some useless casts

Change-Id: I8af087d97cadb0c2a9e37a4e4723246cdd397995

av1/av1_dx_iface.c

diff --git a/av1/av1_dx_iface.c b/av1/av1_dx_iface.c
index 60d5a45..912e8d7 100644
--- a/av1/av1_dx_iface.c
+++ b/av1/av1_dx_iface.c
@@ -784,7 +784,7 @@
 
 static aom_codec_err_t ctrl_copy_reference(aom_codec_alg_priv_t *ctx,
                                            va_list args) {
-  aom_ref_frame_t *data = va_arg(args, aom_ref_frame_t *);
+  const aom_ref_frame_t *const frame = va_arg(args, aom_ref_frame_t *);
 
   // Only support this function in serial decode.
   if (ctx->frame_parallel_decode) {
@@ -792,8 +792,7 @@
     return AOM_CODEC_INCAPABLE;
   }
 
-  if (data) {
-    aom_ref_frame_t *frame = (aom_ref_frame_t *)data;
+  if (frame) {
     YV12_BUFFER_CONFIG sd;
     AVxWorker *const worker = ctx->frame_workers;
     FrameWorkerData *const frame_worker_data = (FrameWorkerData *)worker->data1;

test/variance_test.cc

diff --git a/test/variance_test.cc b/test/variance_test.cc
index 8d260ed..844a1d0 100644
--- a/test/variance_test.cc
+++ b/test/variance_test.cc
@@ -102,8 +102,7 @@
   }
   RoundHighBitDepth(bit_depth, &se, &sse);
   *sse_ptr = static_cast<uint32_t>(sse);
-  return static_cast<uint32_t>(
-      sse - ((static_cast<int64_t>(se) * se) >> (l2w + l2h)));
+  return static_cast<uint32_t>(sse - ((se * se) >> (l2w + l2h)));
 }
 
 /* The subpel reference functions differ from the codec version in one aspect:
@@ -158,8 +157,7 @@
   }
   RoundHighBitDepth(bit_depth, &se, &sse);
   *sse_ptr = static_cast<uint32_t>(sse);
-  return static_cast<uint32_t>(
-      sse - ((static_cast<int64_t>(se) * se) >> (l2w + l2h)));
+  return static_cast<uint32_t>(sse - ((se * se) >> (l2w + l2h)));
 }
 
 class SumOfSquaresTest : public ::testing::TestWithParam<SumOfSquaresFunction> {
@@ -523,8 +521,7 @@
   }
   RoundHighBitDepth(bit_depth, &se, &sse);
   *sse_ptr = static_cast<uint32_t>(sse);
-  return static_cast<uint32_t>(
-      sse - ((static_cast<int64_t>(se) * se) >> (l2w + l2h)));
+  return static_cast<uint32_t>(sse - ((se * se) >> (l2w + l2h)));
 }
 
 template <typename SubpelVarianceFunctionType>