Rename all files containing "kvazaar" or "kvz" to "uvg266" and "uvg"

.gitlab-ci.yml

@@ -7,13 +7,13 @@ test-kvazaar: &test-template
   script:
     - bash .travis-install.bash
     - export PATH="${HOME}/bin:${PATH}"
-    - ./autogen.sh
+    - cmake .
     - ./configure --enable-werror || (cat config.log && false)
     - make --jobs=8
     - make check --jobs=8 VERBOSE=1
   artifacts:
     paths:
-    - src/kvazaar
+    - src/uvg266
     - src/.libs
     expire_in: 1 week
 

CMakeLists.txt

@@ -6,7 +6,7 @@ HOMEPAGE_URL https://github.com/ultravideo/uvg266
 DESCRIPTION "An open-source VVC encoder licensed under 3-clause BSD"
 VERSION 0.2.3)
 
-configure_file("${PROJECT_SOURCE_DIR}/src/kvazaar.pc.in" "${PROJECT_SOURCE_DIR}/src/kvazaar.pc" @ONLY) 
+configure_file("${PROJECT_SOURCE_DIR}/src/uvg266.pc.in" "${PROJECT_SOURCE_DIR}/src/uvg266.pc" @ONLY) 
 
 option(USE_SHARED_LIB "Build using shared uvg266 library" ON)
 

src/alf.h

@@ -6,7 +6,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "videoframe.h"
 #include "image.h"
 #include "nal.h"

src/bitstream.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 /**

src/cabac.c

@@ -34,7 +34,7 @@
 
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #ifdef UVG_DEBUG_PRINT_CABAC
 uint32_t uvg_cabac_bins_count = 0;

src/cfg.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 /* Function definitions */
 uvg_config *uvg_config_alloc(void);

src/cli.h

@@ -38,7 +38,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 typedef struct cmdline_opts_t {
   /** \brief Input filename */

src/cu.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 #include "image.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 //Cu stuff

src/encmain.c

@@ -57,8 +57,8 @@
 #include "cli.h"
 #include "debug.h"
 #include "encoder.h"
-#include "kvazaar.h"
-#include "kvazaar_internal.h"
+#include "uvg266.h"
+#include "uvg266_internal.h"
 #include "threads.h"
 #include "yuv_io.h"
 

src/encode_coding_tree.c

@@ -41,7 +41,7 @@
 #include "imagelist.h"
 #include "inter.h"
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "uvg_math.h"
 #include "strategyselector.h"
 #include "tables.h"

src/encoder.h

@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "scalinglist.h"
 #include "threadqueue.h"
 #include "fast_coeff_cost.h"

src/encoder_state-bitstream.c

@@ -45,7 +45,7 @@
 #include "encoder_state-geometry.h"
 #include "encoderstate.h"
 #include "imagelist.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "uvg_math.h"
 #include "nal.h"
 #include "scalinglist.h"

src/encoder_state-ctors_dtors.c

@@ -44,7 +44,7 @@
 #include "encoderstate.h"
 #include "image.h"
 #include "imagelist.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "threadqueue.h"
 #include "videoframe.h"
 #include "rate_control.h"

src/encoderstate.h

@@ -45,7 +45,7 @@
 #include "global.h" // IWYU pragma: keep
 #include "image.h"
 #include "imagelist.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 #include "threadqueue.h"
 #include "videoframe.h"

src/fast_coeff_cost.c

@@ -31,7 +31,7 @@
  ****************************************************************************/
  
 #include "fast_coeff_cost.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "encoderstate.h"
 
 // Note: Assumes that costs are non-negative, for pretty obvious reasons

src/fast_coeff_cost.h

@@ -34,7 +34,7 @@
 #define FAST_COEFF_COST_H_
 
 #include <stdio.h>
-#include "kvazaar.h"
+#include "uvg266.h"
 // #include "encoderstate.h"
 
 #define MAX_FAST_COEFF_COST_QP 50

src/filter.c

@@ -36,7 +36,7 @@
 
 #include "cu.h"
 #include "encoder.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "transform.h"
 #include "videoframe.h"
 

src/gop.h

@@ -32,7 +32,7 @@
  * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
-#include <kvazaar.h>
+#include <uvg266.h>
 
 
 static const uvg_gop_config uvg_gop_lowdelay4[4] = {

src/image.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "strategies/optimized_sad_func_ptr_t.h"
 
 

src/imagelist.h

@@ -40,7 +40,7 @@
 
 #include "cu.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 /**

src/input_frame_buffer.h

@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 // Forward declaration.

src/inter.h

@@ -42,7 +42,7 @@
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
 #include "image.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 extern const int8_t uvg_g_imv_to_prec[4];
 

src/intra.h

@@ -40,7 +40,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 // Maximum possible reference line length for intra blocks
 #define INTRA_REF_LENGTH (2 * 128 + 3 + 33 * MAX_REF_LINE_IDX)

src/ml_intra_cu_depth_pred.h

@@ -34,7 +34,7 @@
 
 #include <stdio.h>
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 

src/nal.h

@@ -40,7 +40,7 @@
 
 #include "bitstream.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 #define SEI_HASH_MAX_LENGTH 16

src/rate_control.c

@@ -35,7 +35,7 @@
 #include <math.h>
 
 #include "encoder.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "pthread.h"
 
 

src/reshape.h

@@ -42,7 +42,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "videoframe.h"
 #include "image.h"
 #include "nal.h"

src/sao.h

@@ -43,7 +43,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "videoframe.h"
 
 

src/search.c

@@ -40,7 +40,7 @@
 #include "imagelist.h"
 #include "inter.h"
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "search_inter.h"
 #include "search_intra.h"

src/search_inter.c

@@ -40,7 +40,7 @@
 #include "image.h"
 #include "imagelist.h"
 #include "inter.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "search.h"
 #include "strategies/strategies-ipol.h"

src/search_inter.h

@@ -42,7 +42,7 @@
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
 #include "inter.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #define UVG_LUMA_FILTER_TAPS 8
 #define UVG_LUMA_FILTER_OFFSET 3

src/search_intra.c

@@ -39,7 +39,7 @@
 #include "encoderstate.h"
 #include "image.h"
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "search.h"
 #include "strategies/strategies-picture.h"

src/strategies/altivec/picture-altivec.c

@@ -38,7 +38,7 @@
 #define bool _Bool
 #include <stdlib.h>
 
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "strategyselector.h"
 
 

src/strategies/avx2/alf-avx2.c

@@ -35,7 +35,7 @@
 #include "strategies/avx2/alf-avx2.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 
 #include <immintrin.h>

src/strategies/avx2/alf-avx2.h

@@ -38,7 +38,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_alf_avx2(void* opaque, uint8_t bitdepth);
 

src/strategies/avx2/dct-avx2.c

@@ -37,7 +37,7 @@
 #include "strategies/avx2/dct-avx2.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include <immintrin.h>
 

src/strategies/avx2/intra-avx2.c

@@ -33,7 +33,7 @@
 #include "strategies/avx2/intra-avx2.h"
 
 #if COMPILE_INTEL_AVX2 && defined X86_64
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 
 #include <immintrin.h>

src/strategies/avx2/ipol-avx2.c

@@ -42,7 +42,7 @@
 #include <string.h>
 
 #include "encoder.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "search_inter.h"
 #include "strategies/generic/picture-generic.h"
 #include "strategies/strategies-ipol.h"

src/strategies/avx2/picture-avx2.c

@@ -37,7 +37,7 @@
 #include "global.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include "strategies/avx2/picture-avx2.h"
 #include "strategies/avx2/reg_sad_pow2_widths-avx2.h"

src/strategies/avx2/quant-avx2.c

@@ -44,7 +44,7 @@
 #include "cu.h"
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "scalinglist.h"
 #include "strategies/generic/quant-generic.h"

src/strategies/avx2/reg_sad_pow2_widths-avx2.h

@@ -33,7 +33,7 @@
 #ifndef REG_SAD_POW2_WIDTHS_AVX2_H_
 #define REG_SAD_POW2_WIDTHS_AVX2_H_
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #if UVG_BIT_DEPTH == 8
 

src/strategies/avx2/sao-avx2.c

@@ -33,7 +33,7 @@
 #include "strategies/avx2/sao-avx2.h"
 
 #if COMPILE_INTEL_AVX2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include <immintrin.h>
 #include <nmmintrin.h>

src/strategies/generic/alf-generic.c

@@ -35,7 +35,7 @@
 #include "cu.h"
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "alf.h"
 #include "strategyselector.h"
 

src/strategies/generic/intra-generic.c

@@ -35,7 +35,7 @@
 #include <stdlib.h>
 
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "strategyselector.h"
 #include "uvg_math.h"
 

src/strategies/generic/ipol-generic.h

@@ -40,7 +40,7 @@
 
 #include "encoder.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_ipol_generic(void* opaque, uint8_t bitdepth);
 void uvg_sample_quarterpel_luma_generic(const encoder_control_t * const encoder, uvg_pixel *src, int16_t src_stride, int width, int height, uvg_pixel *dst, int16_t dst_stride, int8_t hor_flag, int8_t ver_flag, const int16_t mv[2]);

src/strategies/generic/nal-generic.c

@@ -33,7 +33,7 @@
 #include "strategies/generic/nal-generic.h"
 
 #include "extras/libmd5.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "nal.h"
 #include "strategyselector.h"
 

src/strategies/generic/picture-generic.h

@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_picture_generic(void* opaque, uint8_t bitdepth);
 

src/strategies/generic/quant-generic.h

@@ -41,7 +41,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 
 #define QUANT_SHIFT 14

src/strategies/generic/sao-generic.c

@@ -36,7 +36,7 @@
 #include "cu.h"
 #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "sao.h"
 #include "strategyselector.h"
 

src/strategies/generic/sao_shared_generics.h

@@ -35,7 +35,7 @@
 
 // #include "encoder.h"
 #include "encoderstate.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "sao.h"
 
 // Mapping of edge_idx values to eo-classes.

src/strategies/optimized_sad_func_ptr_t.h

@@ -1,7 +1,7 @@
 #ifndef OPTIMIZED_SAD_FUNC_T_H_
 #define OPTIMIZED_SAD_FUNC_T_H_
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 /**
  * \param data1: Picture block pointer

src/strategies/sse2/picture-sse2.c

@@ -33,7 +33,7 @@
 #include "strategies/sse2/picture-sse2.h"
 
 #if COMPILE_INTEL_SSE2
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include <immintrin.h>
 #include <stdlib.h>

src/strategies/sse41/alf-sse41.c

@@ -33,7 +33,7 @@
 #include "global.h"
 
 #if COMPILE_INTEL_SSE41
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include "strategies/sse41/alf-sse41.h"
 

src/strategies/sse41/alf-sse41.h

@@ -38,7 +38,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int uvg_strategy_register_alf_sse41(void* opaque, uint8_t bitdepth);
 

src/strategies/sse41/picture-sse41.c

@@ -33,7 +33,7 @@
 #include "global.h"
 
 #if COMPILE_INTEL_SSE41
-#include "kvazaar.h"
+#include "uvg266.h"
 #if UVG_BIT_DEPTH == 8
 #include "strategies/sse41/picture-sse41.h"
 #include "strategies/sse41/reg_sad_pow2_widths-sse41.h"

src/strategies/sse41/picture-sse41.h

@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 unsigned uvg_reg_sad_sse41(const uvg_pixel * const data1, const uvg_pixel * const data2,
                            const int width, const int height, const unsigned stride1, const unsigned stride2);

src/strategies/sse41/reg_sad_pow2_widths-sse41.h

@@ -33,7 +33,7 @@
 #ifndef REG_SAD_POW2_WIDTHS_SSE41_H_
 #define REG_SAD_POW2_WIDTHS_SSE41_H_
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #if UVG_BIT_DEPTH == 8
 

src/strategies/strategies-alf.h

@@ -40,7 +40,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "alf.h"
 
 

src/strategies/strategies-encode.h

@@ -41,7 +41,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 
 

src/strategies/strategies-intra.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 #include "intra.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 typedef void (angular_pred_func)(

src/strategies/strategies-ipol.h

@@ -40,7 +40,7 @@
 
 #include "encoder.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "search_inter.h"
 
  // AVX2 implementation of horizontal filter reads and

src/strategies/strategies-nal.h

@@ -39,7 +39,7 @@
  */
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "nal.h"
 
 

src/strategies/strategies-picture.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 #include "inter.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "encoderstate.h"
 #include "strategies/optimized_sad_func_ptr_t.h"
 

src/strategies/strategies-quant.h

@@ -41,7 +41,7 @@
 #include "cu.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "tables.h"
 
 // Declare function pointers.

src/strategies/strategies-sao.h

@@ -41,7 +41,7 @@
 #include "encoder.h"
 #include "encoderstate.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "sao.h"
 
 

src/transform.c

@@ -33,7 +33,7 @@
 #include "transform.h"
 
 #include "image.h"
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "rdo.h"
 #include "strategies/strategies-dct.h"
 #include "strategies/strategies-quant.h"

src/uvg266.c

@@ -30,7 +30,7 @@
  * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
-#include "kvazaar.h"
+#include "uvg266.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,7 +46,7 @@
 #include "global.h"
 #include "image.h"
 #include "input_frame_buffer.h"
-#include "kvazaar_internal.h"
+#include "uvg266_internal.h"
 #include "strategyselector.h"
 #include "threadqueue.h"
 #include "videoframe.h"

src/uvg266_internal.h

@@ -40,7 +40,7 @@
 
 #include "global.h" // IWYU pragma: keep
 
-#include "kvazaar.h"
+#include "uvg266.h"
 #include "input_frame_buffer.h"
 
 

src/videoframe.h

@@ -40,7 +40,7 @@
 
 #include "cu.h"
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 
 /**

src/yuv_io.h

@@ -41,7 +41,7 @@
 #include <stdio.h>
 
 #include "global.h" // IWYU pragma: keep
-#include "kvazaar.h"
+#include "uvg266.h"
 
 int yuv_io_read(FILE* file,
                 unsigned input_width, unsigned input_height,

tests/test_external_symbols.sh

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-# Check for external symbols without kvz_ prefix.
+# Check for external symbols without uvg_ prefix.
 
 set -eu${BASH+o pipefail}
 
-if nm -go --defined-only ../src/.libs/libkvazaar.a | grep -v ' kvz_'; then
-    printf '%s\n' 'Only symbols prefixed with "kvz_" should be exported from libkvazaar.'
+if nm -go --defined-only ../src/.libs/libuvg266.a | grep -v ' uvg_'; then
+    printf '%s\n' 'Only symbols prefixed with "uvg_" should be exported from libuvg266.'
     false
 fi