Fix loopfilter function usage

Here we should use aom_lpf_horizontal_16 function instead of
aom_lpf_horizontal_16_dual function.

aom_lpf_horizontal_16_dual works for two horizontal blocks,
also fixed.

Change-Id: Icc991d3f98bb182fa30497f120021aeb17839d21
diff --git a/aom_dsp/loopfilter.c b/aom_dsp/loopfilter.c
index fb4fb4d..6705140 100644
--- a/aom_dsp/loopfilter.c
+++ b/aom_dsp/loopfilter.c
@@ -543,11 +543,7 @@
 
 void aom_lpf_horizontal_16_dual_c(uint8_t *s, int p, const uint8_t *blimit,
                                   const uint8_t *limit, const uint8_t *thresh) {
-#if CONFIG_PARALLEL_DEBLOCKING
-  mb_lpf_horizontal_edge_w(s, p, blimit, limit, thresh, 1);
-#else
   mb_lpf_horizontal_edge_w(s, p, blimit, limit, thresh, 2);
-#endif
 }
 
 static void mb_lpf_vertical_edge_w(uint8_t *s, int p, const uint8_t *blimit,
diff --git a/av1/common/av1_loopfilter.c b/av1/common/av1_loopfilter.c
index 8a7cd1a..fafe2de 100644
--- a/av1/common/av1_loopfilter.c
+++ b/av1/common/av1_loopfilter.c
@@ -2354,21 +2354,21 @@
           if (cm->use_highbitdepth)
 #if CONFIG_DEBLOCK_13TAP
             // TODO(olah): Remove _c once SIMD for 13-tap is available
-            aom_highbd_lpf_horizontal_16_dual_c(
-                CONVERT_TO_SHORTPTR(p), dst_stride, params.mblim, params.lim,
-                params.hev_thr, cm->bit_depth);
+            aom_highbd_lpf_horizontal_16_c(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                           params.mblim, params.lim,
+                                           params.hev_thr, cm->bit_depth);
 #else
-            aom_highbd_lpf_horizontal_16_dual(
-                CONVERT_TO_SHORTPTR(p), dst_stride, params.mblim, params.lim,
-                params.hev_thr, cm->bit_depth);
+            aom_highbd_lpf_horizontal_16(CONVERT_TO_SHORTPTR(p), dst_stride,
+                                         params.mblim, params.lim,
+                                         params.hev_thr, cm->bit_depth);
 #endif
           else
 #if CONFIG_DEBLOCK_13TAP
-            aom_lpf_horizontal_16_dual_c(p, dst_stride, params.mblim,
-                                         params.lim, params.hev_thr);
+            aom_lpf_horizontal_16_c(p, dst_stride, params.mblim, params.lim,
+                                    params.hev_thr);
 #else
-            aom_lpf_horizontal_16_dual(p, dst_stride, params.mblim, params.lim,
-                                       params.hev_thr);
+            aom_lpf_horizontal_16(p, dst_stride, params.mblim, params.lim,
+                                  params.hev_thr);
 #endif
           break;
         // no filtering