]> granicus.if.org Git - libvpx/commitdiff
Fixed calling of highbd transform.
authorPeter de Rivaz <peter.derivaz@gmail.com>
Wed, 22 Oct 2014 08:26:39 +0000 (09:26 +0100)
committerPeter de Rivaz <peter.derivaz@gmail.com>
Wed, 22 Oct 2014 08:26:39 +0000 (09:26 +0100)
This patch does not change behaviour because
vp9_fwht4x4 is identical to vp9_highbd_fwht4x4,
but it becomes important when accelerations are made
to vp9_highbd_fwht4x4 in a later patch.

Change-Id: I2b790316cdd498727c4951a9e591edb291de3ac8

vp9/encoder/vp9_encodeframe.c

index 79946ca9278a464da478bff67f7c2d24bcf44d7b..b323a8067b873460f10969fe777935f74068b5df 100644 (file)
@@ -3414,9 +3414,9 @@ static void encode_frame_internal(VP9_COMP *cpi) {
 
 #if CONFIG_VP9_HIGHBITDEPTH
   if (cm->use_highbitdepth)
-    x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4;
-  else
     x->fwd_txm4x4 = xd->lossless ? vp9_highbd_fwht4x4 : vp9_highbd_fdct4x4;
+  else
+    x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4;
   x->highbd_itxm_add = xd->lossless ? vp9_highbd_iwht4x4_add :
                                       vp9_highbd_idct4x4_add;
 #else