commit 54e197749ded8645f0ce70cdda5cc921a25d002f
author Tristan Matthews <tmatth@videolan.org> Wed Jan 25 14:29:54 2017 -0500
committer Tristan Matthews <le.businessman@gmail.com> Wed Jan 25 21:18:14 2017 +0000
tree e84becb4ece23080f4c29095fa212ad2a014889c
parent e2a703e3409d7269b73a0bc9041d5b585083ebbe

pvq: skip gshift calculation in float pvq case

Cherry-picked from daala commit 28de40bfcd84e7df3fbd64de7b89dd7fd889bb27

Change-Id: I31af05f07514c023c5be84f7e2ae353ab7d276f0

av1/common/pvq.c

diff --git a/av1/common/pvq.c b/av1/common/pvq.c
index 28de41a..327d8ed 100644
--- a/av1/common/pvq.c
+++ b/av1/common/pvq.c
@@ -951,17 +951,21 @@
   int yy;
   od_val32 scale;
   int nn;
+#if !defined(OD_FLOAT_PVQ)
   int gshift;
   int qshift;
+#endif
   OD_ASSERT(g != 0);
   nn = n-(!noref); /* when noref==0, vector in is sized n-1 */
   yy = 0;
   for (i = 0; i < nn; i++)
     yy += ypulse[i]*(int32_t)ypulse[i];
+#if !defined(OD_FLOAT_PVQ)
   /* Shift required for the magnitude of the pre-qm synthesis to be guaranteed
      to fit in 16 bits. In practice, the range will be 8192-16384 after scaling
      most of the time. */
   gshift = OD_MAXI(0, OD_ILOG(g) - 14);
+#endif
   /*scale is g/sqrt(yy) in Q(16-gshift) so that x[]*scale has a norm that fits
      in 16 bits.*/
   if (yy == 0) scale = 0;
@@ -969,8 +973,6 @@
   else {
     scale = g/sqrt(yy);
   }
-  OD_UNUSED(gshift);
-  OD_UNUSED(qshift);
 #else
   else {
     int rsqrt_shift;