Commit 0aa2eb2c authored by Debargha Mukherjee's avatar Debargha Mukherjee

Fix some formatting errors in resize.c

Change-Id: Ib1145bf79222b40a11018fb64a6121aecfc3c152
parent f5b8068a
...@@ -230,7 +230,6 @@ static const interp_kernel filteredinterp_filters1000[(1 << SUBPEL_BITS_RS)] = { ...@@ -230,7 +230,6 @@ static const interp_kernel filteredinterp_filters1000[(1 << SUBPEL_BITS_RS)] = {
static const int16_t filter_normative[( static const int16_t filter_normative[(
1 << SUBPEL_BITS_RS)][UPSCALE_NORMATIVE_TAPS] = { 1 << SUBPEL_BITS_RS)][UPSCALE_NORMATIVE_TAPS] = {
#if UPSCALE_NORMATIVE_TAPS == 2 #if UPSCALE_NORMATIVE_TAPS == 2
>>>>>>> Implement 1D upscaler differently
{ 128, 0 }, { 126, 2 }, { 124, 4 }, { 122, 6 }, { 120, 8 }, { 118, 10 }, { 128, 0 }, { 126, 2 }, { 124, 4 }, { 122, 6 }, { 120, 8 }, { 118, 10 },
{ 116, 12 }, { 114, 14 }, { 112, 16 }, { 110, 18 }, { 108, 20 }, { 106, 22 }, { 116, 12 }, { 114, 14 }, { 112, 16 }, { 110, 18 }, { 108, 20 }, { 106, 22 },
{ 104, 24 }, { 102, 26 }, { 100, 28 }, { 98, 30 }, { 96, 32 }, { 94, 34 }, { 104, 24 }, { 102, 26 }, { 100, 28 }, { 98, 30 }, { 96, 32 }, { 94, 34 },
...@@ -243,93 +242,94 @@ static const int16_t filter_normative[( ...@@ -243,93 +242,94 @@ static const int16_t filter_normative[(
{ 20, 108 }, { 18, 110 }, { 16, 112 }, { 14, 114 }, { 12, 116 }, { 10, 118 }, { 20, 108 }, { 18, 110 }, { 16, 112 }, { 14, 114 }, { 12, 116 }, { 10, 118 },
{ 8, 120 }, { 6, 122 }, { 4, 124 }, { 2, 126 }, { 8, 120 }, { 6, 122 }, { 4, 124 }, { 2, 126 },
#elif UPSCALE_NORMATIVE_TAPS == 4 #elif UPSCALE_NORMATIVE_TAPS == 4
{ 0, 128, 0, 0 }, { -1, 128, 2, -1 }, { -2, 127, 4, -1 }, { -3, 126, 7, -2 }, { 0, 128, 0, 0 }, { -1, 128, 2, -1 }, { -2, 127, 4, -1 },
{ -4, 125, 9, -2 }, { -5, 125, 11, -3 }, { -6, 124, 13, -3 }, { -3, 126, 7, -2 }, { -4, 125, 9, -2 }, { -5, 125, 11, -3 },
{ -7, 123, 16, -4 }, { -7, 122, 18, -5 }, { -8, 121, 20, -5 }, { -6, 124, 13, -3 }, { -7, 123, 16, -4 }, { -7, 122, 18, -5 },
{ -9, 120, 23, -6 }, { -9, 118, 25, -6 }, { -10, 117, 28, -7 }, { -8, 121, 20, -5 }, { -9, 120, 23, -6 }, { -9, 118, 25, -6 },
{ -11, 116, 30, -7 }, { -11, 114, 33, -8 }, { -12, 113, 35, -8 }, { -10, 117, 28, -7 }, { -11, 116, 30, -7 }, { -11, 114, 33, -8 },
{ -12, 111, 38, -9 }, { -13, 109, 41, -9 }, { -13, 108, 43, -10 }, { -12, 113, 35, -8 }, { -12, 111, 38, -9 }, { -13, 109, 41, -9 },
{ -13, 106, 45, -10 }, { -13, 104, 48, -11 }, { -14, 102, 51, -11 }, { -13, 108, 43, -10 }, { -13, 106, 45, -10 }, { -13, 104, 48, -11 },
{ -14, 100, 53, -11 }, { -14, 98, 56, -12 }, { -14, 96, 58, -12 }, { -14, 102, 51, -11 }, { -14, 100, 53, -11 }, { -14, 98, 56, -12 },
{ -14, 94, 61, -13 }, { -15, 92, 64, -13 }, { -15, 90, 66, -13 }, { -14, 96, 58, -12 }, { -14, 94, 61, -13 }, { -15, 92, 64, -13 },
{ -15, 87, 69, -13 }, { -14, 85, 71, -14 }, { -14, 83, 73, -14 }, { -15, 90, 66, -13 }, { -15, 87, 69, -13 }, { -14, 85, 71, -14 },
{ -14, 80, 76, -14 }, { -14, 78, 78, -14 }, { -14, 76, 80, -14 }, { -14, 83, 73, -14 }, { -14, 80, 76, -14 }, { -14, 78, 78, -14 },
{ -14, 73, 83, -14 }, { -14, 71, 85, -14 }, { -13, 69, 87, -15 }, { -14, 76, 80, -14 }, { -14, 73, 83, -14 }, { -14, 71, 85, -14 },
{ -13, 66, 90, -15 }, { -13, 64, 92, -15 }, { -13, 61, 94, -14 }, { -13, 69, 87, -15 }, { -13, 66, 90, -15 }, { -13, 64, 92, -15 },
{ -12, 58, 96, -14 }, { -12, 56, 98, -14 }, { -11, 53, 100, -14 }, { -13, 61, 94, -14 }, { -12, 58, 96, -14 }, { -12, 56, 98, -14 },
{ -11, 51, 102, -14 }, { -11, 48, 104, -13 }, { -10, 45, 106, -13 }, { -11, 53, 100, -14 }, { -11, 51, 102, -14 }, { -11, 48, 104, -13 },
{ -10, 43, 108, -13 }, { -9, 41, 109, -13 }, { -9, 38, 111, -12 }, { -10, 45, 106, -13 }, { -10, 43, 108, -13 }, { -9, 41, 109, -13 },
{ -8, 35, 113, -12 }, { -8, 33, 114, -11 }, { -7, 30, 116, -11 }, { -9, 38, 111, -12 }, { -8, 35, 113, -12 }, { -8, 33, 114, -11 },
{ -7, 28, 117, -10 }, { -6, 25, 118, -9 }, { -6, 23, 120, -9 }, { -7, 30, 116, -11 }, { -7, 28, 117, -10 }, { -6, 25, 118, -9 },
{ -5, 20, 121, -8 }, { -5, 18, 122, -7 }, { -4, 16, 123, -7 }, { -6, 23, 120, -9 }, { -5, 20, 121, -8 }, { -5, 18, 122, -7 },
{ -3, 13, 124, -6 }, { -3, 11, 125, -5 }, { -2, 9, 125, -4 }, { -4, 16, 123, -7 }, { -3, 13, 124, -6 }, { -3, 11, 125, -5 },
{ -2, 7, 126, -3 }, { -1, 4, 127, -2 }, { -1, 2, 128, -1 }, { -2, 9, 125, -4 }, { -2, 7, 126, -3 }, { -1, 4, 127, -2 },
{ -1, 2, 128, -1 },
#elif UPSCALE_NORMATIVE_TAPS == 6 #elif UPSCALE_NORMATIVE_TAPS == 6
{ 0, 0, 128, 0, 0, 0 }, { 0, -1, 128, 2, -1, 0 }, { 1, -3, 127, 4, -2, 1 }, { 0, 0, 128, 0, 0, 0 }, { 0, -1, 128, 2, -1, 0 },
{ 1, -4, 127, 6, -3, 1 }, { 2, -6, 126, 8, -3, 1 }, { 1, -3, 127, 4, -2, 1 }, { 1, -4, 127, 6, -3, 1 },
{ 2, -7, 125, 11, -4, 1 }, { 2, -9, 125, 13, -5, 2 }, { 2, -6, 126, 8, -3, 1 }, { 2, -7, 125, 11, -4, 1 },
{ 3, -10, 124, 15, -6, 2 }, { 3, -11, 123, 18, -7, 2 }, { 2, -9, 125, 13, -5, 2 }, { 3, -10, 124, 15, -6, 2 },
{ 3, -12, 122, 20, -8, 3 }, { 4, -13, 121, 22, -9, 3 }, { 3, -11, 123, 18, -7, 2 }, { 3, -12, 122, 20, -8, 3 },
{ 4, -14, 119, 25, -9, 3 }, { 4, -15, 118, 27, -10, 4 }, { 4, -13, 121, 22, -9, 3 }, { 4, -14, 119, 25, -9, 3 },
{ 4, -16, 117, 30, -11, 4 }, { 5, -17, 116, 32, -12, 4 }, { 4, -15, 118, 27, -10, 4 }, { 4, -16, 117, 30, -11, 4 },
{ 5, -17, 114, 35, -13, 4 }, { 5, -18, 112, 37, -13, 5 }, { 5, -17, 116, 32, -12, 4 }, { 5, -17, 114, 35, -13, 4 },
{ 5, -19, 111, 40, -14, 5 }, { 6, -19, 109, 42, -15, 5 }, { 5, -18, 112, 37, -13, 5 }, { 5, -19, 111, 40, -14, 5 },
{ 6, -20, 107, 45, -15, 5 }, { 6, -20, 105, 48, -16, 5 }, { 6, -19, 109, 42, -15, 5 }, { 6, -20, 107, 45, -15, 5 },
{ 6, -21, 103, 51, -17, 6 }, { 6, -21, 101, 53, -17, 6 }, { 6, -20, 105, 48, -16, 5 }, { 6, -21, 103, 51, -17, 6 },
{ 6, -21, 99, 56, -18, 6 }, { 7, -22, 97, 58, -18, 6 }, { 6, -21, 101, 53, -17, 6 }, { 6, -21, 99, 56, -18, 6 },
{ 7, -22, 95, 61, -19, 6 }, { 7, -22, 93, 63, -19, 6 }, { 7, -22, 97, 58, -18, 6 }, { 7, -22, 95, 61, -19, 6 },
{ 7, -22, 91, 66, -20, 6 }, { 7, -22, 88, 69, -20, 6 }, { 7, -22, 93, 63, -19, 6 }, { 7, -22, 91, 66, -20, 6 },
{ 7, -22, 86, 71, -21, 7 }, { 7, -22, 83, 74, -21, 7 }, { 7, -22, 88, 69, -20, 6 }, { 7, -22, 86, 71, -21, 7 },
{ 7, -22, 81, 76, -21, 7 }, { 7, -22, 79, 79, -22, 7 }, { 7, -22, 83, 74, -21, 7 }, { 7, -22, 81, 76, -21, 7 },
{ 7, -21, 76, 81, -22, 7 }, { 7, -21, 74, 83, -22, 7 }, { 7, -22, 79, 79, -22, 7 }, { 7, -21, 76, 81, -22, 7 },
{ 7, -21, 71, 86, -22, 7 }, { 6, -20, 69, 88, -22, 7 }, { 7, -21, 74, 83, -22, 7 }, { 7, -21, 71, 86, -22, 7 },
{ 6, -20, 66, 91, -22, 7 }, { 6, -19, 63, 93, -22, 7 }, { 6, -20, 69, 88, -22, 7 }, { 6, -20, 66, 91, -22, 7 },
{ 6, -19, 61, 95, -22, 7 }, { 6, -18, 58, 97, -22, 7 }, { 6, -19, 63, 93, -22, 7 }, { 6, -19, 61, 95, -22, 7 },
{ 6, -18, 56, 99, -21, 6 }, { 6, -17, 53, 101, -21, 6 }, { 6, -18, 58, 97, -22, 7 }, { 6, -18, 56, 99, -21, 6 },
{ 6, -17, 51, 103, -21, 6 }, { 5, -16, 48, 105, -20, 6 }, { 6, -17, 53, 101, -21, 6 }, { 6, -17, 51, 103, -21, 6 },
{ 5, -15, 45, 107, -20, 6 }, { 5, -15, 42, 109, -19, 6 }, { 5, -16, 48, 105, -20, 6 }, { 5, -15, 45, 107, -20, 6 },
{ 5, -14, 40, 111, -19, 5 }, { 5, -13, 37, 112, -18, 5 }, { 5, -15, 42, 109, -19, 6 }, { 5, -14, 40, 111, -19, 5 },
{ 4, -13, 35, 114, -17, 5 }, { 4, -12, 32, 116, -17, 5 }, { 5, -13, 37, 112, -18, 5 }, { 4, -13, 35, 114, -17, 5 },
{ 4, -11, 30, 117, -16, 4 }, { 4, -10, 27, 118, -15, 4 }, { 4, -12, 32, 116, -17, 5 }, { 4, -11, 30, 117, -16, 4 },
{ 3, -9, 25, 119, -14, 4 }, { 3, -9, 22, 121, -13, 4 }, { 4, -10, 27, 118, -15, 4 }, { 3, -9, 25, 119, -14, 4 },
{ 3, -8, 20, 122, -12, 3 }, { 2, -7, 18, 123, -11, 3 }, { 3, -9, 22, 121, -13, 4 }, { 3, -8, 20, 122, -12, 3 },
{ 2, -6, 15, 124, -10, 3 }, { 2, -5, 13, 125, -9, 2 }, { 2, -7, 18, 123, -11, 3 }, { 2, -6, 15, 124, -10, 3 },
{ 1, -4, 11, 125, -7, 2 }, { 1, -3, 8, 126, -6, 2 }, { 2, -5, 13, 125, -9, 2 }, { 1, -4, 11, 125, -7, 2 },
{ 1, -3, 6, 127, -4, 1 }, { 1, -2, 4, 127, -3, 1 }, { 1, -3, 8, 126, -6, 2 }, { 1, -3, 6, 127, -4, 1 },
{ 0, -1, 2, 128, -1, 0 }, { 1, -2, 4, 127, -3, 1 }, { 0, -1, 2, 128, -1, 0 },
#elif UPSCALE_NORMATIVE_TAPS == 8 #elif UPSCALE_NORMATIVE_TAPS == 8
{ 0, 0, 0, 128, 0, 0, 0, 0 }, { 0, 0, -1, 128, 2, -1, 0, 0 }, { 0, 0, 0, 128, 0, 0, 0, 0 }, { 0, 0, -1, 128, 2, -1, 0, 0 },
{ 0, 1, -3, 127, 4, -2, 1, 0 }, { 0, 1, -4, 127, 6, -3, 1, 0 }, { 0, 1, -3, 127, 4, -2, 1, 0 }, { 0, 1, -4, 127, 6, -3, 1, 0 },
{ 0, 2, -6, 126, 8, -3, 1, 0 }, { 0, 2, -7, 125, 11, -4, 1, 0 }, { 0, 2, -6, 126, 8, -3, 1, 0 }, { 0, 2, -7, 125, 11, -4, 1, 0 },
{ -1, 2, -8, 125, 13, -5, 2, 0 }, { -1, 3, -9, 124, 15, -6, 2, 0 }, { -1, 2, -8, 125, 13, -5, 2, 0 }, { -1, 3, -9, 124, 15, -6, 2, 0 },
{ -1, 3, -10, 123, 18, -6, 2, -1 }, { -1, 3, -11, 122, 20, -7, 3, -1 }, { -1, 3, -10, 123, 18, -6, 2, -1 }, { -1, 3, -11, 122, 20, -7, 3, -1 },
{ -1, 4, -12, 121, 22, -8, 3, -1 }, { -1, 4, -13, 120, 25, -9, 3, -1 }, { -1, 4, -12, 121, 22, -8, 3, -1 }, { -1, 4, -13, 120, 25, -9, 3, -1 },
{ -1, 4, -14, 118, 28, -9, 3, -1 }, { -1, 4, -15, 117, 30, -10, 4, -1 }, { -1, 4, -14, 118, 28, -9, 3, -1 }, { -1, 4, -15, 117, 30, -10, 4, -1 },
{ -1, 5, -16, 116, 32, -11, 4, -1 }, { -1, 5, -16, 114, 35, -12, 4, -1 }, { -1, 5, -16, 116, 32, -11, 4, -1 }, { -1, 5, -16, 114, 35, -12, 4, -1 },
{ -1, 5, -17, 112, 38, -12, 4, -1 }, { -1, 5, -18, 111, 40, -13, 5, -1 }, { -1, 5, -17, 112, 38, -12, 4, -1 }, { -1, 5, -18, 111, 40, -13, 5, -1 },
{ -1, 5, -18, 109, 43, -14, 5, -1 }, { -1, 6, -19, 107, 45, -14, 5, -1 }, { -1, 5, -18, 109, 43, -14, 5, -1 }, { -1, 6, -19, 107, 45, -14, 5, -1 },
{ -1, 6, -19, 105, 48, -15, 5, -1 }, { -1, 6, -19, 103, 51, -16, 5, -1 }, { -1, 6, -19, 105, 48, -15, 5, -1 }, { -1, 6, -19, 103, 51, -16, 5, -1 },
{ -1, 6, -20, 101, 53, -16, 6, -1 }, { -1, 6, -20, 99, 56, -17, 6, -1 }, { -1, 6, -20, 101, 53, -16, 6, -1 }, { -1, 6, -20, 99, 56, -17, 6, -1 },
{ -1, 6, -20, 97, 58, -17, 6, -1 }, { -1, 6, -20, 95, 61, -18, 6, -1 }, { -1, 6, -20, 97, 58, -17, 6, -1 }, { -1, 6, -20, 95, 61, -18, 6, -1 },
{ -2, 7, -20, 93, 64, -18, 6, -2 }, { -2, 7, -20, 91, 66, -19, 6, -1 }, { -2, 7, -20, 93, 64, -18, 6, -2 }, { -2, 7, -20, 91, 66, -19, 6, -1 },
{ -2, 7, -20, 88, 69, -19, 6, -1 }, { -2, 7, -20, 86, 71, -19, 6, -1 }, { -2, 7, -20, 88, 69, -19, 6, -1 }, { -2, 7, -20, 86, 71, -19, 6, -1 },
{ -2, 7, -20, 84, 74, -20, 7, -2 }, { -2, 7, -20, 81, 76, -20, 7, -1 }, { -2, 7, -20, 84, 74, -20, 7, -2 }, { -2, 7, -20, 81, 76, -20, 7, -1 },
{ -2, 7, -20, 79, 79, -20, 7, -2 }, { -1, 7, -20, 76, 81, -20, 7, -2 }, { -2, 7, -20, 79, 79, -20, 7, -2 }, { -1, 7, -20, 76, 81, -20, 7, -2 },
{ -2, 7, -20, 74, 84, -20, 7, -2 }, { -1, 6, -19, 71, 86, -20, 7, -2 }, { -2, 7, -20, 74, 84, -20, 7, -2 }, { -1, 6, -19, 71, 86, -20, 7, -2 },
{ -1, 6, -19, 69, 88, -20, 7, -2 }, { -1, 6, -19, 66, 91, -20, 7, -2 }, { -1, 6, -19, 69, 88, -20, 7, -2 }, { -1, 6, -19, 66, 91, -20, 7, -2 },
{ -2, 6, -18, 64, 93, -20, 7, -2 }, { -1, 6, -18, 61, 95, -20, 6, -1 }, { -2, 6, -18, 64, 93, -20, 7, -2 }, { -1, 6, -18, 61, 95, -20, 6, -1 },
{ -1, 6, -17, 58, 97, -20, 6, -1 }, { -1, 6, -17, 56, 99, -20, 6, -1 }, { -1, 6, -17, 58, 97, -20, 6, -1 }, { -1, 6, -17, 56, 99, -20, 6, -1 },
{ -1, 6, -16, 53, 101, -20, 6, -1 }, { -1, 5, -16, 51, 103, -19, 6, -1 }, { -1, 6, -16, 53, 101, -20, 6, -1 }, { -1, 5, -16, 51, 103, -19, 6, -1 },
{ -1, 5, -15, 48, 105, -19, 6, -1 }, { -1, 5, -14, 45, 107, -19, 6, -1 }, { -1, 5, -15, 48, 105, -19, 6, -1 }, { -1, 5, -14, 45, 107, -19, 6, -1 },
{ -1, 5, -14, 43, 109, -18, 5, -1 }, { -1, 5, -13, 40, 111, -18, 5, -1 }, { -1, 5, -14, 43, 109, -18, 5, -1 }, { -1, 5, -13, 40, 111, -18, 5, -1 },
{ -1, 4, -12, 38, 112, -17, 5, -1 }, { -1, 4, -12, 35, 114, -16, 5, -1 }, { -1, 4, -12, 38, 112, -17, 5, -1 }, { -1, 4, -12, 35, 114, -16, 5, -1 },
{ -1, 4, -11, 32, 116, -16, 5, -1 }, { -1, 4, -10, 30, 117, -15, 4, -1 }, { -1, 4, -11, 32, 116, -16, 5, -1 }, { -1, 4, -10, 30, 117, -15, 4, -1 },
{ -1, 3, -9, 28, 118, -14, 4, -1 }, { -1, 3, -9, 25, 120, -13, 4, -1 }, { -1, 3, -9, 28, 118, -14, 4, -1 }, { -1, 3, -9, 25, 120, -13, 4, -1 },
{ -1, 3, -8, 22, 121, -12, 4, -1 }, { -1, 3, -7, 20, 122, -11, 3, -1 }, { -1, 3, -8, 22, 121, -12, 4, -1 }, { -1, 3, -7, 20, 122, -11, 3, -1 },
{ -1, 2, -6, 18, 123, -10, 3, -1 }, { 0, 2, -6, 15, 124, -9, 3, -1 }, { -1, 2, -6, 18, 123, -10, 3, -1 }, { 0, 2, -6, 15, 124, -9, 3, -1 },
{ 0, 2, -5, 13, 125, -8, 2, -1 }, { 0, 1, -4, 11, 125, -7, 2, 0 }, { 0, 2, -5, 13, 125, -8, 2, -1 }, { 0, 1, -4, 11, 125, -7, 2, 0 },
{ 0, 1, -3, 8, 126, -6, 2, 0 }, { 0, 1, -3, 6, 127, -4, 1, 0 }, { 0, 1, -3, 8, 126, -6, 2, 0 }, { 0, 1, -3, 6, 127, -4, 1, 0 },
{ 0, 1, -2, 4, 127, -3, 1, 0 }, { 0, 0, -1, 2, 128, -1, 0, 0 }, { 0, 1, -2, 4, 127, -3, 1, 0 }, { 0, 0, -1, 2, 128, -1, 0, 0 },
#else #else
#error "Invalid value of UPSCALE_NORMATIVE_TAPS" #error "Invalid value of UPSCALE_NORMATIVE_TAPS"
#endif // UPSCALE_NORMATIVE_TAPS == 2 #endif // UPSCALE_NORMATIVE_TAPS == 2
......
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