Fix merge issues and license texts

src/bitstream.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/bitstream.h

@@ -1,7 +1,7 @@
 #ifndef BITSTREAM_H_
 #define BITSTREAM_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cabac.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cabac.h

@@ -1,7 +1,7 @@
 #ifndef CABAC_H_
 #define CABAC_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cfg.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cfg.h

@@ -1,7 +1,7 @@
 #ifndef CONFIG_H_
 #define CONFIG_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/checkpoint.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/checkpoint.h

@@ -1,7 +1,7 @@
 #ifndef CHECKPOINT_H_
 #define CHECKPOINT_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cli.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.
@@ -616,7 +616,7 @@ void print_help(void)
     "                               For rd=0..1: Try the first candidate.\n"
     "                               For rd=2.. : Try the best candidate based\n"
     "                                            on luma satd cost. [enabled]\n"
-    "      --max-merge <integer>  : Maximum number of merge candidates, 1..5 [5]\n"
+    "      --max-merge <integer>  : Maximum number of merge candidates, 1..6 [6]\n"
     "      --(no-)implicit-rdpcm  : Implicit residual DPCM. Currently only supported\n"
     "                               with lossless coding. [disabled]\n"
     "      --(no-)tmvp            : Temporal motion vector prediction [enabled]\n"

src/cli.h

@@ -1,7 +1,7 @@
 #ifndef CLI_H_
 #define CLI_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/constraint.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/constraint.h

@@ -1,7 +1,7 @@
 #ifndef CONSTRAINT_H_
 #define CONSTRAINT_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/context.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/context.h

@@ -1,7 +1,7 @@
 #ifndef CONTEXT_H_
 #define CONTEXT_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cu.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/cu.h

@@ -1,7 +1,7 @@
 #ifndef CU_H_
 #define CU_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encmain.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encode_coding_tree.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encode_coding_tree.h

@@ -1,7 +1,7 @@
 #pragma once
 
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder.h

@@ -1,7 +1,7 @@
 #ifndef ENCODER_H_
 #define ENCODER_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder_state-bitstream.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.
@@ -71,15 +71,15 @@ static void encoder_state_write_bitstream_aud(encoder_state_t *const state)
   WRITE_U(stream, 1, 1, "aud_irap_or_gdr_au_flag");
 
   uint8_t pic_type = state->frame->slicetype == KVZ_SLICE_I ? 0
-    : state->frame->slicetype == KVZ_SLICE_P ? 1
+                   : state->frame->slicetype == KVZ_SLICE_P ? 1
-    : 2;
+                   : 2;
   WRITE_U(stream, pic_type, 3, "pic_type");
 
   kvz_bitstream_add_rbsp_trailing_bits(stream);
 }
 
 static void encoder_state_write_bitstream_PTL(bitstream_t *stream,
-  encoder_state_t *const state)
+                                              encoder_state_t *const state)
 {
   // PTL
   // Profile Tier
@@ -276,7 +276,7 @@ static void encoder_state_write_bitstream_vid_parameter_set(bitstream_t* stream,
   //for each layer
   for (int i = 0; i < 1; i++) {
     WRITE_U(stream, 0, 6, "vps_layer_id");
-
+  }
   kvz_bitstream_align_zero(stream);
   encoder_state_write_bitstream_PTL(stream, state);
   WRITE_U(stream, 0, 1, "vps_extension_flag")

src/encoder_state-bitstream.h

@@ -1,7 +1,7 @@
 #ifndef ENCODER_STATE_BITSTREAM_H_
 #define ENCODER_STATE_BITSTREAM_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder_state-ctors_dtors.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder_state-ctors_dtors.h

@@ -1,7 +1,7 @@
 #ifndef ENCODER_STATE_CTORS_DTORS_H_
 #define ENCODER_STATE_CTORS_DTORS_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder_state-geometry.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoder_state-geometry.h

@@ -1,7 +1,7 @@
 #ifndef ENCODER_STATE_GEOMETRY_H_
 #define ENCODER_STATE_GEOMETRY_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoderstate.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/encoderstate.h

@@ -1,7 +1,7 @@
 #ifndef ENCODERSTATE_H_
 #define ENCODERSTATE_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/fast_coeff_cost.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/fast_coeff_cost.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/filter.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/filter.h

@@ -1,7 +1,7 @@
 #ifndef FILTER_H_
 #define FILTER_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/global.h

@@ -1,7 +1,7 @@
 #ifndef GLOBAL_H_
 #define GLOBAL_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/gop.h

@@ -1,7 +1,7 @@
 #ifndef GOP_H_
 #define GOP_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/image.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/image.h

@@ -1,7 +1,7 @@
 #ifndef IMAGE_H_
 #define IMAGE_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/imagelist.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/imagelist.h

@@ -1,7 +1,7 @@
 #ifndef PICTURE_LIST_H_
 #define PICTURE_LIST_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/input_frame_buffer.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/input_frame_buffer.h

@@ -1,7 +1,7 @@
 #ifndef INPUT_FRAME_BUFFER_H_
 #define INPUT_FRAME_BUFFER_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/inter.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.
@@ -397,9 +397,10 @@ static unsigned inter_recon_unipred(const encoder_state_t * const state,
                                     bool predict_luma,
                                     bool predict_chroma)
 {
-  mv_t int_mv[2] = { mv_param[0], mv_param[1] };
+  vector2d_t int_mv = { mv_param[0], mv_param[1] };
+
+  kvz_change_precision_vector2d(INTERNAL_MV_PREC, 0, &int_mv);
 
-  kvz_change_precision(INTERNAL_MV_PREC, 0, &int_mv[0], &int_mv[1]);
   const vector2d_t int_mv_in_frame = {
     int_mv.x + pu_x + state->tile->offset_x,
     int_mv.y + pu_y + state->tile->offset_y
@@ -433,18 +434,18 @@ static unsigned inter_recon_unipred(const encoder_state_t * const state,
     } else {
       // With an integer MV, copy pixels directly from the reference.
       if (int_mv_outside_frame) {
-        inter_cp_with_ext_border(ref->y, ref->width,
+        inter_cp_with_ext_border(ref->y, ref->stride,
           ref->width, ref->height,
           yuv_px->y, out_stride_luma,
           pu_w, pu_h,
           &int_mv_in_frame);
       }
       else {
-        const int frame_mv_index = int_mv_in_frame.y * ref->width + int_mv_in_frame.x;
+        const int frame_mv_index = int_mv_in_frame.y * ref->stride + int_mv_in_frame.x;
         kvz_pixels_blit(&ref->y[frame_mv_index],
           yuv_px->y,
           pu_w, pu_h,
-          ref->width, out_stride_luma);
+          ref->stride, out_stride_luma);
       }
     }
   }
@@ -485,16 +486,16 @@ static unsigned inter_recon_unipred(const encoder_state_t * const state,
                                pu_w / 2, pu_h / 2,
                                &int_mv_in_frame_c);
     } else {
-      const int frame_mv_index = int_mv_in_frame_c.y * ref->width / 2 + int_mv_in_frame_c.x;
+      const int frame_mv_index = int_mv_in_frame_c.y * ref->stride / 2 + int_mv_in_frame_c.x;
 
       kvz_pixels_blit(&ref->u[frame_mv_index],
                       yuv_px->u,
                       pu_w / 2, pu_h / 2,
-                      ref->width / 2, out_stride_c);
+                      ref->stride / 2, out_stride_c);
       kvz_pixels_blit(&ref->v[frame_mv_index],
                       yuv_px->v,
                       pu_w / 2, pu_h / 2,
-                      ref->width / 2, out_stride_c);
+                      ref->stride / 2, out_stride_c);
     }
   }
 

src/inter.h

@@ -1,7 +1,7 @@
 #ifndef INTER_H_
 #define INTER_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/intra.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/intra.h

@@ -1,6 +1,6 @@
 #pragma once
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/kvazaar.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/kvazaar.h

@@ -1,7 +1,7 @@
 #ifndef KVAZAAR_H_
 #define KVAZAAR_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/kvazaar_internal.h

@@ -1,7 +1,7 @@
 #ifndef KVAZAAR_INTERNAL_H_
 #define KVAZAAR_INTERNAL_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/kvz_math.h

@@ -1,7 +1,7 @@
 #ifndef MATH_H_
 #define MATH_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/ml_classifier_intra_depth_pred.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/ml_classifier_intra_depth_pred.h

@@ -2,7 +2,7 @@
 #define ML_CLASSIFIER_INTRA_DEPTH_PRED
 
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/ml_intra_cu_depth_pred.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/ml_intra_cu_depth_pred.h

@@ -1,7 +1,7 @@
 #ifndef ML_INTRA_CU_DEPTH_PRED_H_
 #define ML_INTRA_CU_DEPTH_PRED_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/nal.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/nal.h

@@ -1,7 +1,7 @@
 #ifndef NAL_H_
 #define NAL_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/rate_control.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/rate_control.h

@@ -1,7 +1,7 @@
 #ifndef RATE_CONTROL_H_
 #define RATE_CONTROL_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/rdo.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/rdo.h

@@ -1,7 +1,7 @@
 #ifndef RDO_H_
 #define RDO_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/reshape.c

@@ -1,21 +1,33 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
- * Copyright (C) 2013-2021 Tampere University of Technology and others (see
+ * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
- * COPYING file).
+ * All rights reserved.
  *
- * Kvazaar is free software: you can redistribute it and/or modify it under
+ * Redistribution and use in source and binary forms, with or without modification,
- * the terms of the GNU Lesser General Public License as published by the
+ * are permitted provided that the following conditions are met:
- * 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
+ * * Redistributions of source code must retain the above copyright notice, this
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   list of conditions and the following disclaimer.
- * 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
+ * * Redistributions in binary form must reproduce the above copyright notice, this
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * * Neither the name of the Tampere University or ITU/ISO/IEC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
 #include "reshape.h"

src/reshape.h

@@ -1,22 +1,34 @@
 #pragma once
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
- * Copyright (C) 2013-2021 Tampere University of Technology and others (see
+ * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
- * COPYING file).
+ * All rights reserved.
  *
- * Kvazaar is free software: you can redistribute it and/or modify it under
+ * Redistribution and use in source and binary forms, with or without modification,
- * the terms of the GNU Lesser General Public License as published by the
+ * are permitted provided that the following conditions are met:
- * 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
+ * * Redistributions of source code must retain the above copyright notice, this
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   list of conditions and the following disclaimer.
- * 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
+ * * Redistributions in binary form must reproduce the above copyright notice, this
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * * Neither the name of the Tampere University or ITU/ISO/IEC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
 /**

src/sao.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/sao.h

@@ -1,7 +1,7 @@
 #ifndef SAO_H_
 #define SAO_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/scalinglist.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/scalinglist.h

@@ -1,7 +1,7 @@
 #ifndef SCALINGLIST_H_
 #define SCALINGLIST_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/search.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/search.h

@@ -1,7 +1,7 @@
 #ifndef SEARCH_H_
 #define SEARCH_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/search_inter.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/search_inter.h

@@ -1,7 +1,7 @@
 #ifndef SEARCH_INTER_H_
 #define SEARCH_INTER_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/search_intra.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/search_intra.h

@@ -1,7 +1,7 @@
 #ifndef SEARCH_INTRA_H_
 #define SEARCH_INTRA_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/altivec/picture-altivec.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/altivec/picture-altivec.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_PICTURE_ALTIVEC_H_
 #define STRATEGIES_PICTURE_ALTIVEC_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/alf-avx2.c

@@ -1,21 +1,33 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
- * Copyright (C) 2013-2021 Tampere University of Technology and others (see
+ * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
- * COPYING file).
+ * All rights reserved.
  *
- * Kvazaar is free software: you can redistribute it and/or modify it under
+ * Redistribution and use in source and binary forms, with or without modification,
- * the terms of the GNU Lesser General Public License as published by the
+ * are permitted provided that the following conditions are met:
- * 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
+ * * Redistributions of source code must retain the above copyright notice, this
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   list of conditions and the following disclaimer.
- * 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
+ * * Redistributions in binary form must reproduce the above copyright notice, this
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * * Neither the name of the Tampere University or ITU/ISO/IEC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
 #include "global.h"

src/strategies/avx2/alf-avx2.h

@@ -1,22 +1,34 @@
 #pragma once
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
- * Copyright (C) 2013-2021 Tampere University of Technology and others (see
+ * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
- * COPYING file).
+ * All rights reserved.
  *
- * Kvazaar is free software: you can redistribute it and/or modify it under
+ * Redistribution and use in source and binary forms, with or without modification,
- * the terms of the GNU Lesser General Public License as published by the
+ * are permitted provided that the following conditions are met:
- * 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
+ * * Redistributions of source code must retain the above copyright notice, this
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   list of conditions and the following disclaimer.
- * 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
+ * * Redistributions in binary form must reproduce the above copyright notice, this
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * * Neither the name of the Tampere University or ITU/ISO/IEC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
 /**

src/strategies/avx2/avx2_common_functions.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/dct-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/dct-avx2.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_DCT_AVX2_H_
 #define STRATEGIES_DCT_AVX2_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/encode_coding_tree-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/encode_coding_tree-avx2.h

@@ -2,7 +2,7 @@
 #define ENCODE_CODING_TREE_AVX2_H_
 
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/intra-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/intra-avx2.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_INTRA_AVX2_H_
 #define STRATEGIES_INTRA_AVX2_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/ipol-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/ipol-avx2.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_IPOL_AVX2_H_
 #define STRATEGIES_IPOL_AVX2_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/picture-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/picture-avx2.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_PICTURE_AVX2_H_
 #define STRATEGIES_PICTURE_AVX2_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/quant-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/quant-avx2.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_QUANT_AVX2_H_
 #define STRATEGIES_QUANT_AVX2_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/reg_sad_pow2_widths-avx2.h

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/sao-avx2.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/avx2/sao-avx2.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_SAO_AVX2_H_
 #define STRATEGIES_SAO_AVX2_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/alf-generic.c

@@ -1,21 +1,33 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
- * Copyright (C) 2013-2021 Tampere University of Technology and others (see
+ * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
- * COPYING file).
+ * All rights reserved.
  *
- * Kvazaar is free software: you can redistribute it and/or modify it under
+ * Redistribution and use in source and binary forms, with or without modification,
- * the terms of the GNU Lesser General Public License as published by the
+ * are permitted provided that the following conditions are met:
- * 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
+ * * Redistributions of source code must retain the above copyright notice, this
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   list of conditions and the following disclaimer.
- * 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
+ * * Redistributions in binary form must reproduce the above copyright notice, this
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * * Neither the name of the Tampere University or ITU/ISO/IEC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
 #include "strategies/generic/alf-generic.h"

src/strategies/generic/alf-generic.h

@@ -1,22 +1,34 @@
 #pragma once
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
- * Copyright (C) 2013-2021 Tampere University of Technology and others (see
+ * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
- * COPYING file).
+ * All rights reserved.
  *
- * Kvazaar is free software: you can redistribute it and/or modify it under
+ * Redistribution and use in source and binary forms, with or without modification,
- * the terms of the GNU Lesser General Public License as published by the
+ * are permitted provided that the following conditions are met:
- * 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
+ * * Redistributions of source code must retain the above copyright notice, this
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ *   list of conditions and the following disclaimer.
- * 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
+ * * Redistributions in binary form must reproduce the above copyright notice, this
- * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ *   list of conditions and the following disclaimer in the documentation and/or
+ *   other materials provided with the distribution.
+ *
+ * * Neither the name of the Tampere University or ITU/ISO/IEC nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * INCLUDING NEGLIGENCE OR OTHERWISE ARISING IN ANY WAY OUT OF THE USE OF THIS
  ****************************************************************************/
 
 /**

src/strategies/generic/dct-generic.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/dct-generic.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_DCT_GENERIC_H_
 #define STRATEGIES_DCT_GENERIC_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/encode_coding_tree-generic.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/encode_coding_tree-generic.h

@@ -2,7 +2,7 @@
 #define ENCODE_CODING_TREE_GENERIC_H_
 
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/intra-generic.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/intra-generic.h

@@ -1,7 +1,7 @@
 #ifndef STRATEGIES_INTRA_GENERIC_H_
 #define STRATEGIES_INTRA_GENERIC_H_
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.

src/strategies/generic/ipol-generic.c

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * This file is part of Kvazaar HEVC encoder.
+ * This file is part of uvg266 VVC encoder.
  *
  * Copyright (c) 2021, Tampere University, ITU/ISO/IEC, project contributors
  * All rights reserved.