Commit a70cd7b5 authored by Cheng Chen's avatar Cheng Chen Committed by Tom Finegan

Bug fix

Remove BLOCK_2X2, BLOCK_2X4, BLOCK_4X2, which has been removed
from codebase.

Change-Id: I1c4ac7d148b7e95b1b104df7b9664cbb31928ddc
parent 8e3110ff
...@@ -1683,13 +1683,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { ...@@ -1683,13 +1683,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) {
aom_highbd_sad4x4x4d_bits8, aom_highbd_jnt_sad4x4_avg_bits8, aom_highbd_sad4x4x4d_bits8, aom_highbd_jnt_sad4x4_avg_bits8,
aom_highbd_8_jnt_sub_pixel_avg_variance4x4) aom_highbd_8_jnt_sub_pixel_avg_variance4x4)
HIGHBD_BFP(BLOCK_2X2, NULL, NULL, aom_highbd_8_variance2x2, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
HIGHBD_BFP(BLOCK_4X2, NULL, NULL, aom_highbd_8_variance4x2, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
HIGHBD_BFP(BLOCK_2X4, NULL, NULL, aom_highbd_8_variance2x4, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
HIGHBD_BFP( HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits8, BLOCK_128X128, aom_highbd_sad128x128_bits8,
...@@ -2200,13 +2193,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { ...@@ -2200,13 +2193,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) {
aom_highbd_jnt_sad4x4_avg_bits10, aom_highbd_jnt_sad4x4_avg_bits10,
aom_highbd_10_jnt_sub_pixel_avg_variance4x4); aom_highbd_10_jnt_sub_pixel_avg_variance4x4);
HIGHBD_BFP(BLOCK_2X2, NULL, NULL, aom_highbd_10_variance2x2, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
HIGHBD_BFP(BLOCK_4X2, NULL, NULL, aom_highbd_10_variance4x2, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
HIGHBD_BFP(BLOCK_2X4, NULL, NULL, aom_highbd_10_variance2x4, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
HIGHBD_BFP( HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits10, BLOCK_128X128, aom_highbd_sad128x128_bits10,
...@@ -2724,13 +2710,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) { ...@@ -2724,13 +2710,6 @@ static void highbd_set_var_fns(AV1_COMP *const cpi) {
aom_highbd_jnt_sad4x4_avg_bits12, aom_highbd_jnt_sad4x4_avg_bits12,
aom_highbd_12_jnt_sub_pixel_avg_variance4x4); aom_highbd_12_jnt_sub_pixel_avg_variance4x4);
HIGHBD_BFP(BLOCK_2X2, NULL, NULL, aom_highbd_12_variance2x2, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
HIGHBD_BFP(BLOCK_4X2, NULL, NULL, aom_highbd_12_variance4x2, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
HIGHBD_BFP(BLOCK_2X4, NULL, NULL, aom_highbd_12_variance2x4, NULL, NULL,
NULL, NULL, NULL, NULL, NULL)
#if CONFIG_EXT_PARTITION #if CONFIG_EXT_PARTITION
HIGHBD_BFP( HIGHBD_BFP(
BLOCK_128X128, aom_highbd_sad128x128_bits12, BLOCK_128X128, aom_highbd_sad128x128_bits12,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment