From 4880b47a4e2551efad193b6a711e2e8e3a0bdce0 Mon Sep 17 00:00:00 2001 From: Marko Viitanen Date: Sat, 18 Jun 2022 13:49:09 +0300 Subject: [PATCH] [cleanup] Update README AppVeyor badge url and remove mentions of Kvazaar --- .gitlab-ci.yml | 2 +- README.md | 2 +- src/cfg.c | 2 +- src/cli.c | 2 +- src/encoder_state-bitstream.c | 2 +- src/global.h | 2 +- src/search_inter.c | 2 +- src/uvg266.h | 14 +++++++------- src/uvg266_internal.h | 2 +- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e879bef1..f1f3bd41 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ image: ultravideo/kvazaar_ci_base:latest # Build and test kvazaar -test-kvazaar: &test-template +test-uvg266: &test-template stage: test script: - bash .travis-install.bash diff --git a/README.md b/README.md index 3a8db88e..70892d2f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ uvg266 is still under development. Speed and RD-quality will continue to improve http://ultravideo.fi/#encoder for more information. - Linux [![uvg266_tests](https://github.com/ultravideo/uvg266/actions/workflows/uvg266.yml/badge.svg)](https://github.com/ultravideo/uvg266/actions/workflows/uvg266.yml) -- Windows [![Build status](https://ci.appveyor.com/api/projects/status/88sg1h25lp0k71pu?svg=true)](https://ci.appveyor.com/project/Ultravideo/uvg266) +- Windows [![Build status](https://ci.appveyor.com/api/projects/status/c1gwnnkyt5lycqka?svg=true)](https://ci.appveyor.com/project/Ultravideo/uvg266) ## Table of Contents diff --git a/src/cfg.c b/src/cfg.c index 8549b6ad..25c9e328 100644 --- a/src/cfg.c +++ b/src/cfg.c @@ -1266,7 +1266,7 @@ int uvg_config_parse(uvg_config *cfg, const char *name, const char *value) // Because the image is read straight into the reference buffers, // reading >8 bit samples doesn't work when sizeof(uvg_pixel)==1. fprintf(stderr, "input-bitdepth can't be set to larger than 8 because" - " Kvazaar is compiled with UVG_BIT_DEPTH=8.\n"); + " uvg266 is compiled with UVG_BIT_DEPTH=8.\n"); return 0; } } diff --git a/src/cli.c b/src/cli.c index 59ed1582..df486797 100644 --- a/src/cli.c +++ b/src/cli.c @@ -343,7 +343,7 @@ cmdline_opts_t* cmdline_opts_parse(const uvg_api *const api, int argc, char *arg } if (opts->config->vps_period < 0) { - // Disabling parameter sets is only possible when using Kvazaar as + // Disabling parameter sets is only possible when using uvg266 as // a library. fprintf(stderr, "Input error: vps_period must be non-negative\n"); ok = 0; diff --git a/src/encoder_state-bitstream.c b/src/encoder_state-bitstream.c index 60ad7e03..1fb4f720 100644 --- a/src/encoder_state-bitstream.c +++ b/src/encoder_state-bitstream.c @@ -1529,7 +1529,7 @@ static void encoder_state_write_bitstream_main(encoder_state_t * const state) uvg_encoder_state_write_parameter_sets(&state->stream, state); } - // Send Kvazaar version information only in the first frame. + // Send uvg266 version information only in the first frame. if (state->frame->num == 0 && encoder->cfg.add_encoder_info) { uvg_nal_write(stream, UVG_NAL_PREFIX_SEI_NUT, 0, state->frame->first_nal); state->frame->first_nal = false; diff --git a/src/global.h b/src/global.h index 1f90997d..91088cc7 100644 --- a/src/global.h +++ b/src/global.h @@ -193,7 +193,7 @@ typedef int16_t mv_t; // ToDo: add VVC large block support #if LCU_WIDTH != 64 - #error "Kvazaar only support LCU_WIDTH == 64" + #error "uvg266 only support LCU_WIDTH == 64" #endif #define LCU_LUMA_SIZE (LCU_WIDTH * LCU_WIDTH) diff --git a/src/search_inter.c b/src/search_inter.c index 7117a1d0..bf340285 100644 --- a/src/search_inter.c +++ b/src/search_inter.c @@ -1312,7 +1312,7 @@ static void search_pu_inter_ref(inter_search_info_t *info, // in L0 or L1, the primary list for the colocated PU is the inverse of // collocated_from_l0_flag. Otherwise it is equal to reflist. // - // Kvazaar always sets collocated_from_l0_flag so the list is L1 when + // uvg266 always sets collocated_from_l0_flag so the list is L1 when // there are future references. int col_list = ref_list; for (uint32_t i = 0; i < info->state->frame->ref->used_size; i++) { diff --git a/src/uvg266.h b/src/uvg266.h index 0593a605..0dbe5ead 100644 --- a/src/uvg266.h +++ b/src/uvg266.h @@ -35,7 +35,7 @@ /** * \ingroup Control * \file - * This file defines the public API of Kvazaar when used as a library. + * This file defines the public API of uvg266 when used as a library. */ #include @@ -47,26 +47,26 @@ extern "C" { #if defined(UVG_DLL_EXPORTS) #if !defined(PIC) - // Building static kvazaar library. + // Building static uvg266 library. #define UVG_PUBLIC #elif defined(_WIN32) || defined(__CYGWIN__) - // Building kvazaar DLL on Windows. + // Building uvg266 DLL on Windows. #define UVG_PUBLIC __declspec(dllexport) #elif defined(__GNUC__) - // Building kvazaar shared library with GCC. + // Building uvg266 shared library with GCC. #define UVG_PUBLIC __attribute__ ((visibility ("default"))) #else #define UVG_PUBLIC #endif #else #if defined(UVG_STATIC_LIB) - // Using static kvazaar library. + // Using static uvg266 library. #define UVG_PUBLIC #elif defined(_WIN32) || defined(__CYGWIN__) - // Using kvazaar DLL on Windows. + // Using uvg266 DLL on Windows. #define UVG_PUBLIC __declspec(dllimport) #else - // Using kvazaar shared library and not on Windows. + // Using uvg266 shared library and not on Windows. #define UVG_PUBLIC #endif #endif diff --git a/src/uvg266_internal.h b/src/uvg266_internal.h index b74a8c52..c5833b1e 100644 --- a/src/uvg266_internal.h +++ b/src/uvg266_internal.h @@ -35,7 +35,7 @@ /** * \ingroup Control * \file - * \brief Definitions for opaque structs in kvazaar.h + * \brief Definitions for opaque structs in uvg266.h */ #include "global.h" // IWYU pragma: keep