diff --git a/build/kvazaar_lib/kvazaar_lib.vcxproj b/build/kvazaar_lib/kvazaar_lib.vcxproj
index d0d6878b..9495386d 100644
--- a/build/kvazaar_lib/kvazaar_lib.vcxproj
+++ b/build/kvazaar_lib/kvazaar_lib.vcxproj
@@ -165,6 +165,7 @@
+
@@ -200,6 +201,7 @@
+
@@ -216,6 +218,7 @@
+
@@ -255,6 +258,7 @@
+
diff --git a/build/kvazaar_lib/kvazaar_lib.vcxproj.filters b/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
index 8509111a..d03890dc 100644
--- a/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
+++ b/build/kvazaar_lib/kvazaar_lib.vcxproj.filters
@@ -207,6 +207,12 @@
Bitstream
+
+ Optimization\strategies
+
+
+ Optimization\strategies\generic
+
@@ -383,6 +389,12 @@
Bitstream
+
+ Optimization\strategies
+
+
+ Optimization\strategies\generic
+
diff --git a/src/Makefile.am b/src/Makefile.am
index 53073844..de00bf89 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -109,6 +109,8 @@ libkvazaar_la_SOURCES = \
strategies/generic/picture-generic.h \
strategies/generic/quant-generic.c \
strategies/generic/quant-generic.h \
+ strategies/generic/sao-generic.c \
+ strategies/generic/sao-generic.h \
strategies/strategies-common.h \
strategies/strategies-dct.c \
strategies/strategies-dct.h \
@@ -122,6 +124,8 @@ libkvazaar_la_SOURCES = \
strategies/strategies-picture.h \
strategies/strategies-quant.c \
strategies/strategies-quant.h \
+ strategies/strategies-sao.c \
+ strategies/strategies-sao.h \
strategies/x86_asm/picture-x86-asm.c \
strategies/x86_asm/picture-x86-asm.h \
strategyselector.c \
diff --git a/src/sao.c b/src/sao.c
index a9cea8ac..8fe25e9b 100644
--- a/src/sao.c
+++ b/src/sao.c
@@ -21,93 +21,12 @@
#include "sao.h"
#include "rdo.h"
#include "strategies/strategies-picture.h"
+#include "strategies/strategies-sao.h"
#include
#include
#include
-// Offsets of a and b in relation to c.
-// dir_offset[dir][a or b]
-// | | a | a | a |
-// | a c b | c | c | c |
-// | | b | b | b |
-static const vector2d_t g_sao_edge_offsets[SAO_NUM_EO][2] = {
- { { -1, 0 }, { 1, 0 } },
- { { 0, -1 }, { 0, 1 } },
- { { -1, -1 }, { 1, 1 } },
- { { 1, -1 }, { -1, 1 } }
-};
-
-// Mapping of edge_idx values to eo-classes.
-
-
-static int sao_calc_eo_cat(kvz_pixel a, kvz_pixel b, kvz_pixel c)
-{
- // Mapping relationships between a, b and c to eo_idx.
- static const int sao_eo_idx_to_eo_category[] = { 1, 2, 0, 3, 4 };
-
- int eo_idx = 2 + SIGN3((int)c - (int)a) + SIGN3((int)c - (int)b);
-
- return sao_eo_idx_to_eo_category[eo_idx];
-}
-
-
-int kvz_sao_band_ddistortion(const encoder_state_t * const state, const kvz_pixel *orig_data, const kvz_pixel *rec_data,
- int block_width, int block_height,
- int band_pos, int sao_bands[4])
-{
- int y, x;
- int shift = state->encoder_control->bitdepth-5;
- int sum = 0;
-
- for (y = 0; y < block_height; ++y) {
- for (x = 0; x < block_width; ++x) {
- int band = (rec_data[y * block_width + x] >> shift) - band_pos;
- int offset = 0;
- if (band >= 0 && band < 4) {
- offset = sao_bands[band];
- }
- if (offset != 0) {
- int diff = orig_data[y * block_width + x] - rec_data[y * block_width + x];
- // Offset is applied to reconstruction, so it is subtracted from diff.
- sum += (diff - offset) * (diff - offset) - diff * diff;
- }
- }
- }
-
- return sum;
-}
-
-
-int kvz_sao_edge_ddistortion(const kvz_pixel *orig_data, const kvz_pixel *rec_data,
- int block_width, int block_height,
- int eo_class, int offsets[NUM_SAO_EDGE_CATEGORIES])
-{
- int y, x;
- int sum = 0;
- vector2d_t a_ofs = g_sao_edge_offsets[eo_class][0];
- vector2d_t b_ofs = g_sao_edge_offsets[eo_class][1];
-
- for (y = 1; y < block_height - 1; ++y) {
- for (x = 1; x < block_width - 1; ++x) {
- const kvz_pixel *c_data = &rec_data[y * block_width + x];
- kvz_pixel a = c_data[a_ofs.y * block_width + a_ofs.x];
- kvz_pixel c = c_data[0];
- kvz_pixel b = c_data[b_ofs.y * block_width + b_ofs.x];
-
- int offset = offsets[sao_calc_eo_cat(a, b, c)];
-
- if (offset != 0) {
- int diff = orig_data[y * block_width + x] - c;
- // Offset is applied to reconstruction, so it is subtracted from diff.
- sum += (diff - offset) * (diff - offset) - diff * diff;
- }
- }
- }
-
- return sum;
-}
-
static void init_sao_info(sao_info_t *sao) {
sao->type = SAO_TYPE_NONE;
@@ -240,7 +159,7 @@ static float sao_mode_bits_band(const encoder_state_t * const state,
/**
* \brief calculate an array of intensity correlations for each intensity value
*/
-static void calc_sao_offset_array(const encoder_control_t * const encoder, const sao_info_t *sao, int *offset, color_t color_i)
+void kvz_calc_sao_offset_array(const encoder_control_t * const encoder, const sao_info_t *sao, int *offset, color_t color_i)
{
int val;
int values = (1<bitdepth);
@@ -340,78 +259,6 @@ static void calc_sao_bands(const encoder_state_t * const state, const kvz_pixel
}
-/**
- * \param orig_data Original pixel data. 64x64 for luma, 32x32 for chroma.
- * \param rec_data Reconstructed pixel data. 64x64 for luma, 32x32 for chroma.
- * \param dir_offsets
- * \param is_chroma 0 for luma, 1 for chroma. Indicates
- */
-static void calc_sao_edge_dir(const kvz_pixel *orig_data, const kvz_pixel *rec_data,
- int eo_class, int block_width, int block_height,
- int cat_sum_cnt[2][NUM_SAO_EDGE_CATEGORIES])
-{
- int y, x;
- vector2d_t a_ofs = g_sao_edge_offsets[eo_class][0];
- vector2d_t b_ofs = g_sao_edge_offsets[eo_class][1];
- // Arrays orig_data and rec_data are quarter size for chroma.
-
- // Don't sample the edge pixels because this function doesn't have access to
- // their neighbours.
- for (y = 1; y < block_height - 1; ++y) {
- for (x = 1; x < block_width - 1; ++x) {
- const kvz_pixel *c_data = &rec_data[y * block_width + x];
- kvz_pixel a = c_data[a_ofs.y * block_width + a_ofs.x];
- kvz_pixel c = c_data[0];
- kvz_pixel b = c_data[b_ofs.y * block_width + b_ofs.x];
-
- int eo_cat = sao_calc_eo_cat(a, b, c);
-
- cat_sum_cnt[0][eo_cat] += orig_data[y * block_width + x] - c;
- cat_sum_cnt[1][eo_cat] += 1;
- }
- }
-}
-
-static void sao_reconstruct_color(const encoder_control_t * const encoder,
- const kvz_pixel *rec_data, kvz_pixel *new_rec_data,
- const sao_info_t *sao,
- int stride, int new_stride,
- int block_width, int block_height,
- color_t color_i)
-{
- int y, x;
- // Arrays orig_data and rec_data are quarter size for chroma.
- int offset_v = color_i == COLOR_V ? 5 : 0;
-
- if(sao->type == SAO_TYPE_BAND) {
- int offsets[1<eo_class][0];
- vector2d_t b_ofs = g_sao_edge_offsets[sao->eo_class][1];
- const kvz_pixel *c_data = &rec_data[y * stride + x];
- kvz_pixel *new_data = &new_rec_data[y * new_stride + x];
- kvz_pixel a = c_data[a_ofs.y * stride + a_ofs.x];
- kvz_pixel c = c_data[0];
- kvz_pixel b = c_data[b_ofs.y * stride + b_ofs.x];
-
- int eo_cat = sao_calc_eo_cat(a, b, c);
-
- new_data[0] = (kvz_pixel)CLIP(0, (1 << KVZ_BIT_DEPTH) - 1, c_data[0] + sao->offsets[eo_cat + offset_v]);
- }
- }
- }
-}
-
/**
* \brief Calculate dimensions of the buffer used by sao reconstruction.
@@ -575,7 +422,7 @@ void kvz_sao_reconstruct(const encoder_control_t * const encoder, videoframe_t *
tl.y + block.y + br.y,
pic_stride, buf_stride);
- sao_reconstruct_color(encoder, &buf_rec[tl.y * buf_stride + tl.x],
+ kvz_sao_reconstruct_color(encoder, &buf_rec[tl.y * buf_stride + tl.x],
&new_rec[(ofs.y + tl.y) * lcu_stride + ofs.x + tl.x],
sao,
buf_stride, lcu_stride,
@@ -613,7 +460,7 @@ static void sao_search_edge_sao(const encoder_state_t * const state,
// Call calc_sao_edge_dir once for luma and twice for chroma.
for (i = 0; i < buf_cnt; ++i) {
FILL(cat_sum_cnt, 0);
- calc_sao_edge_dir(data[i], recdata[i], edge_class,
+ kvz_calc_sao_edge_dir(data[i], recdata[i], edge_class,
block_width, block_height, cat_sum_cnt);
diff --git a/src/sao.h b/src/sao.h
index e6ce9ca0..91733c01 100644
--- a/src/sao.h
+++ b/src/sao.h
@@ -50,6 +50,20 @@ typedef struct sao_info_t {
int offsets[NUM_SAO_EDGE_CATEGORIES * 2];
} sao_info_t;
+
+// Offsets of a and b in relation to c.
+// dir_offset[dir][a or b]
+// | | a | a | a |
+// | a c b | c | c | c |
+// | | b | b | b |
+static const vector2d_t g_sao_edge_offsets[SAO_NUM_EO][2] = {
+ { { -1, 0 }, { 1, 0 } },
+ { { 0, -1 }, { 0, 1 } },
+ { { -1, -1 }, { 1, 1 } },
+ { { 1, -1 }, { -1, 1 } }
+};
+
+
#define CHECKPOINT_SAO_INFO(prefix_str, sao) CHECKPOINT(prefix_str " type=%d eo_class=%d ddistortion=%d " \
"merge_left_flag=%d merge_up_flag=%d band_position=%d " \
"offsets[0]=%d offsets[1]=%d offsets[2]=%d offsets[3]=%d offsets[4]=%d", \
@@ -63,5 +77,6 @@ void kvz_sao_reconstruct(const encoder_control_t * encoder, videoframe_t *frame,
const sao_info_t *sao, color_t color_i);
void kvz_sao_reconstruct_frame(encoder_state_t *state);
void kvz_sao_search_lcu(const encoder_state_t* const state, int lcu_x, int lcu_y);
+void kvz_calc_sao_offset_array(const encoder_control_t * const encoder, const sao_info_t *sao, int *offset, color_t color_i);
#endif
diff --git a/src/strategies/generic/sao-generic.c b/src/strategies/generic/sao-generic.c
new file mode 100644
index 00000000..cec67bb8
--- /dev/null
+++ b/src/strategies/generic/sao-generic.c
@@ -0,0 +1,182 @@
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2015 Tampere University of Technology and others (see
+ * COPYING file).
+ *
+ * Kvazaar is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * Kvazaar is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Kvazaar. If not, see .
+ ****************************************************************************/
+
+#include
+
+#include "sao-generic.h"
+#include "sao.h"
+#include "strategyselector.h"
+#include "rdo.h"
+
+
+// Mapping of edge_idx values to eo-classes.
+static int sao_calc_eo_cat(kvz_pixel a, kvz_pixel b, kvz_pixel c)
+{
+ // Mapping relationships between a, b and c to eo_idx.
+ static const int sao_eo_idx_to_eo_category[] = { 1, 2, 0, 3, 4 };
+
+ int eo_idx = 2 + SIGN3((int)c - (int)a) + SIGN3((int)c - (int)b);
+
+ return sao_eo_idx_to_eo_category[eo_idx];
+}
+
+
+int kvz_sao_edge_ddistortion_generic(const kvz_pixel *orig_data, const kvz_pixel *rec_data,
+ int block_width, int block_height,
+ int eo_class, int offsets[NUM_SAO_EDGE_CATEGORIES])
+{
+ int y, x;
+ int sum = 0;
+ vector2d_t a_ofs = g_sao_edge_offsets[eo_class][0];
+ vector2d_t b_ofs = g_sao_edge_offsets[eo_class][1];
+
+ for (y = 1; y < block_height - 1; ++y) {
+ for (x = 1; x < block_width - 1; ++x) {
+ const kvz_pixel *c_data = &rec_data[y * block_width + x];
+ kvz_pixel a = c_data[a_ofs.y * block_width + a_ofs.x];
+ kvz_pixel c = c_data[0];
+ kvz_pixel b = c_data[b_ofs.y * block_width + b_ofs.x];
+
+ int offset = offsets[sao_calc_eo_cat(a, b, c)];
+
+ if (offset != 0) {
+ int diff = orig_data[y * block_width + x] - c;
+ // Offset is applied to reconstruction, so it is subtracted from diff.
+ sum += (diff - offset) * (diff - offset) - diff * diff;
+ }
+ }
+ }
+
+ return sum;
+}
+
+
+/**
+ * \param orig_data Original pixel data. 64x64 for luma, 32x32 for chroma.
+ * \param rec_data Reconstructed pixel data. 64x64 for luma, 32x32 for chroma.
+ * \param dir_offsets
+ * \param is_chroma 0 for luma, 1 for chroma. Indicates
+ */
+void kvz_calc_sao_edge_dir_generic(const kvz_pixel *orig_data, const kvz_pixel *rec_data,
+ int eo_class, int block_width, int block_height,
+ int cat_sum_cnt[2][NUM_SAO_EDGE_CATEGORIES])
+{
+ int y, x;
+ vector2d_t a_ofs = g_sao_edge_offsets[eo_class][0];
+ vector2d_t b_ofs = g_sao_edge_offsets[eo_class][1];
+ // Arrays orig_data and rec_data are quarter size for chroma.
+
+ // Don't sample the edge pixels because this function doesn't have access to
+ // their neighbours.
+ for (y = 1; y < block_height - 1; ++y) {
+ for (x = 1; x < block_width - 1; ++x) {
+ const kvz_pixel *c_data = &rec_data[y * block_width + x];
+ kvz_pixel a = c_data[a_ofs.y * block_width + a_ofs.x];
+ kvz_pixel c = c_data[0];
+ kvz_pixel b = c_data[b_ofs.y * block_width + b_ofs.x];
+
+ int eo_cat = sao_calc_eo_cat(a, b, c);
+
+ cat_sum_cnt[0][eo_cat] += orig_data[y * block_width + x] - c;
+ cat_sum_cnt[1][eo_cat] += 1;
+ }
+ }
+}
+
+
+void kvz_sao_reconstruct_color_generic(const encoder_control_t * const encoder,
+ const kvz_pixel *rec_data, kvz_pixel *new_rec_data,
+ const sao_info_t *sao,
+ int stride, int new_stride,
+ int block_width, int block_height,
+ color_t color_i)
+{
+ int y, x;
+ // Arrays orig_data and rec_data are quarter size for chroma.
+ int offset_v = color_i == COLOR_V ? 5 : 0;
+
+ if(sao->type == SAO_TYPE_BAND) {
+ int offsets[1<eo_class][0];
+ vector2d_t b_ofs = g_sao_edge_offsets[sao->eo_class][1];
+ const kvz_pixel *c_data = &rec_data[y * stride + x];
+ kvz_pixel *new_data = &new_rec_data[y * new_stride + x];
+ kvz_pixel a = c_data[a_ofs.y * stride + a_ofs.x];
+ kvz_pixel c = c_data[0];
+ kvz_pixel b = c_data[b_ofs.y * stride + b_ofs.x];
+
+ int eo_cat = sao_calc_eo_cat(a, b, c);
+
+ new_data[0] = (kvz_pixel)CLIP(0, (1 << KVZ_BIT_DEPTH) - 1, c_data[0] + sao->offsets[eo_cat + offset_v]);
+ }
+ }
+ }
+}
+
+
+int kvz_sao_band_ddistortion_generic(const encoder_state_t * const state, const kvz_pixel *orig_data, const kvz_pixel *rec_data,
+ int block_width, int block_height,
+ int band_pos, int sao_bands[4])
+{
+ int y, x;
+ int shift = state->encoder_control->bitdepth-5;
+ int sum = 0;
+
+ for (y = 0; y < block_height; ++y) {
+ for (x = 0; x < block_width; ++x) {
+ int band = (rec_data[y * block_width + x] >> shift) - band_pos;
+ int offset = 0;
+ if (band >= 0 && band < 4) {
+ offset = sao_bands[band];
+ }
+ if (offset != 0) {
+ int diff = orig_data[y * block_width + x] - rec_data[y * block_width + x];
+ // Offset is applied to reconstruction, so it is subtracted from diff.
+ sum += (diff - offset) * (diff - offset) - diff * diff;
+ }
+ }
+ }
+
+ return sum;
+}
+
+
+int kvz_strategy_register_sao_generic(void* opaque, uint8_t bitdepth)
+{
+ bool success = true;
+
+ success &= kvz_strategyselector_register(opaque, "sao_edge_ddistortion", "generic", 0, &kvz_sao_edge_ddistortion_generic);
+ success &= kvz_strategyselector_register(opaque, "calc_sao_edge_dir", "generic", 0, &kvz_calc_sao_edge_dir_generic);
+ success &= kvz_strategyselector_register(opaque, "sao_reconstruct_color", "generic", 0, &kvz_sao_reconstruct_color_generic);
+ success &= kvz_strategyselector_register(opaque, "sao_band_ddistortion", "generic", 0, &kvz_sao_band_ddistortion_generic);
+
+ return success;
+}
diff --git a/src/strategies/generic/sao-generic.h b/src/strategies/generic/sao-generic.h
new file mode 100644
index 00000000..e0c860e3
--- /dev/null
+++ b/src/strategies/generic/sao-generic.h
@@ -0,0 +1,33 @@
+#ifndef STRATEGIES_SAO_GENERIC_H_
+#define STRATEGIES_SAO_GENERIC_H_
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2015 Tampere University of Technology and others (see
+ * COPYING file).
+ *
+ * Kvazaar is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * Kvazaar is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Kvazaar. If not, see .
+ ****************************************************************************/
+
+/**
+ * \ingroup Optimization
+ * \file
+ * Generic C implementations of optimized functions.
+ */
+
+#include "global.h"
+
+int kvz_strategy_register_sao_generic(void* opaque, uint8_t bitdepth);
+
+#endif //STRATEGIES_SAO_GENERIC_H_
diff --git a/src/strategies/strategies-sao.c b/src/strategies/strategies-sao.c
new file mode 100644
index 00000000..c45e7ff7
--- /dev/null
+++ b/src/strategies/strategies-sao.c
@@ -0,0 +1,40 @@
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2015 Tampere University of Technology and others (see
+ * COPYING file).
+ *
+ * Kvazaar is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * Kvazaar is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Kvazaar. If not, see .
+ ****************************************************************************/
+
+#include "strategies-sao.h"
+#include "strategyselector.h"
+
+// Define function pointers.
+sao_edge_ddistortion_func * kvz_sao_edge_ddistortion;
+calc_sao_edge_dir_func * kvz_calc_sao_edge_dir;
+sao_reconstruct_color_func * kvz_sao_reconstruct_color;
+sao_band_ddistortion_func * kvz_sao_band_ddistortion;
+
+// Headers for platform optimizations.
+#include "generic/sao-generic.h"
+
+
+int kvz_strategy_register_sao(void* opaque, uint8_t bitdepth) {
+ bool success = true;
+
+ success &= kvz_strategy_register_sao_generic(opaque, bitdepth);
+
+ return success;
+}
\ No newline at end of file
diff --git a/src/strategies/strategies-sao.h b/src/strategies/strategies-sao.h
new file mode 100644
index 00000000..75a611c7
--- /dev/null
+++ b/src/strategies/strategies-sao.h
@@ -0,0 +1,71 @@
+#ifndef STRATEGIES_SAO_H_
+#define STRATEGIES_SAO_H_
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2015 Tampere University of Technology and others (see
+ * COPYING file).
+ *
+ * Kvazaar is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation; either version 2.1 of the License, or (at your
+ * option) any later version.
+ *
+ * Kvazaar is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with Kvazaar. If not, see .
+ ****************************************************************************/
+
+/**
+ * \ingroup Optimization
+ * \file
+ * Interface for sao functions.
+ */
+
+#include "global.h"
+
+#include "encoderstate.h"
+#include "sao.h"
+
+// Declare function pointers.
+typedef int (sao_edge_ddistortion_func)(const kvz_pixel *orig_data, const kvz_pixel *rec_data,
+ int block_width, int block_height,
+ int eo_class, int offsets[NUM_SAO_EDGE_CATEGORIES]);
+
+typedef void (calc_sao_edge_dir_func)(const kvz_pixel *orig_data, const kvz_pixel *rec_data,
+ int eo_class, int block_width, int block_height,
+ int cat_sum_cnt[2][NUM_SAO_EDGE_CATEGORIES]);
+
+typedef void (sao_reconstruct_color_func)(const encoder_control_t * const encoder,
+ const kvz_pixel *rec_data, kvz_pixel *new_rec_data,
+ const sao_info_t *sao,
+ int stride, int new_stride,
+ int block_width, int block_height,
+ color_t color_i);
+
+typedef int (sao_band_ddistortion_func)(const encoder_state_t * const state, const kvz_pixel *orig_data, const kvz_pixel *rec_data,
+ int block_width, int block_height,
+ int band_pos, int sao_bands[4]);
+
+// Declare function pointers.
+extern sao_edge_ddistortion_func * kvz_sao_edge_ddistortion;
+extern calc_sao_edge_dir_func * kvz_calc_sao_edge_dir;
+extern sao_reconstruct_color_func * kvz_sao_reconstruct_color;
+extern sao_band_ddistortion_func * kvz_sao_band_ddistortion;
+
+int kvz_strategy_register_sao(void* opaque, uint8_t bitdepth);
+
+
+#define STRATEGIES_SAO_EXPORTS \
+ {"sao_edge_ddistortion", (void**) &kvz_sao_edge_ddistortion}, \
+ {"calc_sao_edge_dir", (void**) &kvz_calc_sao_edge_dir}, \
+ {"sao_reconstruct_color", (void**) &kvz_sao_reconstruct_color}, \
+ {"sao_band_ddistortion", (void**) &kvz_sao_band_ddistortion}, \
+
+
+
+#endif //STRATEGIES_SAO_H_
diff --git a/src/strategyselector.c b/src/strategyselector.c
index 596324c8..279529ec 100644
--- a/src/strategyselector.c
+++ b/src/strategyselector.c
@@ -75,6 +75,11 @@ int kvz_strategyselector_init(int32_t cpuid, uint8_t bitdepth) {
fprintf(stderr, "kvz_strategy_register_intra failed!\n");
return 0;
}
+
+ if (!kvz_strategy_register_sao(&strategies, bitdepth)) {
+ fprintf(stderr, "kvz_strategy_register_sao failed!\n");
+ return 0;
+ }
while(cur_strategy_to_select->fptr) {
*(cur_strategy_to_select->fptr) = strategyselector_choose_for(&strategies, cur_strategy_to_select->strategy_type);
diff --git a/src/strategyselector.h b/src/strategyselector.h
index c78e0c0c..891db4c7 100644
--- a/src/strategyselector.h
+++ b/src/strategyselector.h
@@ -153,6 +153,7 @@ int kvz_strategyselector_register(void *opaque, const char *type, const char *st
#include "strategies/strategies-ipol.h"
#include "strategies/strategies-quant.h"
#include "strategies/strategies-intra.h"
+#include "strategies/strategies-sao.h"
static const strategy_to_select_t strategies_to_select[] = {
STRATEGIES_NAL_EXPORTS
@@ -161,6 +162,7 @@ static const strategy_to_select_t strategies_to_select[] = {
STRATEGIES_IPOL_EXPORTS
STRATEGIES_QUANT_EXPORTS
STRATEGIES_INTRA_EXPORTS
+ STRATEGIES_SAO_EXPORTS
{ NULL, NULL },
};