Request 2159 (accepted)

kvazaar.changes Changed

kvazaar.spec Changed

kvazaar-arm.patch Deleted

kvazaar-0.6.1.tar.gz/src/Makefile -> kvazaar-0.7.0.tar.gz/src/Makefile Changed

@@ -12,7 +12,7 @@
 DLLDIR  = $(BINDIR)
 
 # Library version number
-VER_MAJOR = 0
+VER_MAJOR = 1
 VER_MINOR = 0
 VER_RELEASE = 0
 
@@ -64,26 +64,36 @@
 endif
 
 # ARCH related flags
-ifeq ($(ARCH), x86_64)
-    TARGET_CPU_BITS := 64
-    TARGET_CPU_ARCH := x86
-else ifeq ($(ARCH), ppc64)
-    TARGET_CPU_BITS := 64
-    TARGET_CPU_ARCH := ppc
+ifeq (, $(filter-out i386 i686 x86_64 amd64, $(ARCH)))
+  TARGET_CPU_ARCH := x86
+else ifeq (, $(filter-out ppc ppc64, $(ARCH)))
+  TARGET_CPU_ARCH := ppc
+else ifeq (, $(filter-out armv7l armv6l, $(ARCH)))
+  TARGET_CPU_ARCH := arm
 else
-    #safe (?) defaults
-    TARGET_CPU_BITS := 32
-    TARGET_CPU_ARCH := x86
+  TARGET_CPU_ARCH := x86
 endif
 
-CFLAGS += -m$(TARGET_CPU_BITS)
-LDFLAGS += -m$(TARGET_CPU_BITS)
+ifeq (, $(filter-out i386 i686 ppc, $(ARCH)))
+  TARGET_CPU_BITS := 32
+else ifeq (, $(filter-out x86_64 amd64 ppc64, $(ARCH)))
+  TARGET_CPU_BITS := 64
+else
+  TARGET_CPU_BITS := 0
+endif
+
+# The -m32 and -m64 flags are used for making sure the C files use the same
+# instruction set as the ASM files. They can't be used on ARM processors.
+ifneq (0, $(TARGET_CPU_BITS))
+  CFLAGS += -m$(TARGET_CPU_BITS)
+  LDFLAGS += -m$(TARGET_CPU_BITS)
+endif
 
 INSTALL_TARGETS = install-prog install-pc
 
 # Windows (cygwin/mingw) specific flags
 ifeq ($(SYSTEM), Windows)
-  ifeq ($(ARCH), x86_64)
+  ifeq ($(TARGET_CPU_BITS), 64)
     ASFLAGS += -f win64
     ASFLAGS += -DHAVE_ALIGNED_STACK=1
   else
@@ -97,7 +107,7 @@
 
 # OS X specific flags
 else ifeq ($(SYSTEM), Darwin)
-  ifeq ($(ARCH), x86_64)
+  ifeq ($(TARGET_CPU_BITS), 64)
     ASFLAGS += -f macho64
   else
     ASFLAGS += -f macho32
@@ -110,7 +120,7 @@
 else
   LIBS += -lrt
   LDFLAGS += -Wl,-z,noexecstack
-  ifeq ($(ARCH), x86_64)
+  ifeq ($(TARGET_CPU_BITS), 64)
     ASFLAGS += -f elf64
   else
     ASFLAGS += -f elf32
@@ -120,13 +130,13 @@
 endif
 
 # Flags shared across systems
-ifeq ($(ARCH), x86_64)
+ifeq ($(TARGET_CPU_ARCH) $(TARGET_CPU_BITS), x86 64)
   ASFLAGS += -DARCH_X86_64=1
 else
   ASFLAGS += -DARCH_X86_64=0
 endif
 
-# Compile asm files by default if yasm is present.
+# Disable ASM optimizations if YASM is not found on path.
 ifndef KVZ_DISABLE_ASM
   has_as := $(shell type $(AS) 2>/dev/null)
   ifeq ($(has_as),)
@@ -138,16 +148,19 @@
   CFLAGS += -DCHECKPOINTS
 endif
 
-# Compile files in strategy directories with appropriate flags.
-ifeq ($(ARCH), ppc64)
+# The optimized functions reside in these instruction set specific
+# directories. If the instruction set is supported by the
+# architecture, compile the files in these directories with the
+# apropriate flags to cause the intrinsics to work.
+ifeq ($(TARGET_CPU_ARCH), ppc)
   strategies/altivec/%.o:  EXTRA_FLAGS += -maltivec -fno-lto
   strategies/altivec/%.lo: EXTRA_FLAGS += -maltivec -fno-lto
-else
+else ifeq ($(TARGET_CPU_ARCH), x86)
   strategies/sse2/%.o:   EXTRA_FLAGS += -msse2   -fno-lto
   strategies/sse41/%.o:  EXTRA_FLAGS += -msse4.1 -fno-lto
   strategies/sse2/%.lo:  EXTRA_FLAGS += -msse2   -fno-lto
   strategies/sse41/%.lo: EXTRA_FLAGS += -msse4.1 -fno-lto
-  # Needs to be defined on Travis
+  # To disable avx2 on old compilers that don't support it.
   ifndef KVZ_DISABLE_AVX2
     strategies/avx2/%.o:  EXTRA_FLAGS += -mavx2 -fno-lto
     strategies/avx2/%.lo: EXTRA_FLAGS += -mavx2 -fno-lto
@@ -203,8 +216,12 @@
   strategies/avx2/ipol-avx2.o
 
 ifndef KVZ_DISABLE_ASM
+  # Compile C files in x86_asm folder with KVZ_COMPILE_ASM, which will cause
+  # the registration function to register the function pointers in the ASM 
+  # files.
   strategies/x86_asm/%.o: EXTRA_FLAGS += -DKVZ_COMPILE_ASM
 
+  # Add ASM files to the list of objects to be compiled.
   OBJS += \
     strategies/x86_asm/picture-x86-asm-sad.o \
     strategies/x86_asm/picture-x86-asm-satd.o

kvazaar-0.6.1.tar.gz/src/cli.c -> kvazaar-0.7.0.tar.gz/src/cli.c Changed

@@ -24,7 +24,6 @@
 */
 
 #include "cli.h"
-#include "encoderstate.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -356,37 +355,26 @@
 }
 
 
-void print_frame_info(encoder_state_t *state, double frame_psnr3)
+void print_frame_info(const kvz_frame_info *const info,
+                      const double frame_psnr3,
+                      const uint32_t bytes)
 {
   fprintf(stderr, "POC %4d QP %2d (%c-frame) %10d bits PSNR: %2.4f %2.4f %2.4f",
-          state->global->poc,
-          state->global->QP,
-          "BPI"state->global->slicetype % 3, state->stats_bitstream_length << 3,
+          info->poc,
+          info->qp,
+          "BPI"info->slice_type % 3,
+          bytes << 3,
           frame_psnr0, frame_psnr1, frame_psnr2);
 
-  // Print reference picture lists
-  if (state->global->slicetype != SLICE_I) {
-    int j, ref_list2 = { 0, 0 }, ref_list_poc216;
-    // List all pocs of lists
-    for (j = 0; j < state->global->ref->used_size; j++) {
-      if (state->global->ref->pocsj < state->global->poc) {
-        ref_list_poc0ref_list0 = state->global->ref->pocsj;
-        ref_list0++;
-      } else {
-        ref_list_poc1ref_list1 = state->global->ref->pocsj;
-        ref_list1++;
-      }
-    }
-    kvz_encoder_ref_insertion_sort(ref_list_poc0, ref_list0);
-    kvz_encoder_ref_insertion_sort(ref_list_poc1, ref_list1);
-
+  if (info->slice_type != KVZ_SLICE_I) {
+    // Print reference picture lists
     fprintf(stderr, " L0 ");
-    for (j = ref_list0 - 1; j >= 0; j--) {
-      fprintf(stderr, "%d ", ref_list_poc0j);
+    for (int j = info->ref_list_len0 - 1; j >= 0; j--) {
+      fprintf(stderr, "%d ", info->ref_list0j);
     }
     fprintf(stderr, " L1 ");
-    for (j = 0; j < ref_list1; j++) {
-      fprintf(stderr, "%d ", ref_list_poc1j);
+    for (int j = 0; j < info->ref_list_len1; j++) {
+      fprintf(stderr, "%d ", info->ref_list1j);
     }
     fprintf(stderr, "");
   }

kvazaar-0.6.1.tar.gz/src/cli.h -> kvazaar-0.7.0.tar.gz/src/cli.h Changed

kvazaar-0.6.1.tar.gz/src/encmain.c -> kvazaar-0.7.0.tar.gz/src/encmain.c Changed

@@ -40,10 +40,9 @@
 
 #include "checkpoint.h"
 #include "global.h"
-#include "config.h"
 #include "threadqueue.h"
 #include "encoder.h"
-#include "encoderstate.h"
+#include "videoframe.h"
 #include "cli.h"
 #include "yuv_io.h"
 
@@ -211,8 +210,16 @@
 
       kvz_data_chunk* chunks_out = NULL;
       kvz_picture *img_rec = NULL;
+      kvz_picture *img_src = NULL;
       uint32_t len_out = 0;
-      if (!api->encoder_encode(enc, img_in, &chunks_out, &len_out, &img_rec)) {
+      kvz_frame_info info_out;
+      if (!api->encoder_encode(enc,
+                               img_in,
+                               &chunks_out,
+                               &len_out,
+                               &img_rec,
+                               &img_src,
+                               &info_out)) {
         fprintf(stderr, "Failed to encode image.\n");
         api->picture_free(img_in);
         goto exit_failure;
@@ -244,14 +251,8 @@
 
         // Compute and print stats.
 
-        // Number of the state that was finished is one less than
-        // enc->out_state_num.
-        encoder_state_t *state = &enc->states
-          (enc->out_state_num + enc->num_encoder_states - 1) %
-          enc->num_encoder_states
-        ;
         double frame_psnr3 = { 0.0, 0.0, 0.0 };
-        kvz_encoder_compute_stats(state, frame_psnr);
+        kvz_videoframe_compute_psnr(img_src, img_rec, frame_psnr);
 
         if (recout) {
           // Since chunks_out was not NULL, img_rec should have been set.
@@ -269,12 +270,13 @@
         psnr_sum1 += frame_psnr1;
         psnr_sum2 += frame_psnr2;
 
-        print_frame_info(state, frame_psnr);
+        print_frame_info(&info_out, frame_psnr, len_out);
       }
 
       api->picture_free(img_in);
       api->chunk_free(chunks_out);
       api->picture_free(img_rec);
+      api->picture_free(img_src);
     }
 
     GET_TIME(&encoding_end_real_time);

kvazaar-0.6.1.tar.gz/src/encoder_state-bitstream.c -> kvazaar-0.7.0.tar.gz/src/encoder_state-bitstream.c Changed

@@ -31,10 +31,10 @@
 static void encoder_state_write_bitstream_aud(encoder_state_t * const state)
 {
   bitstream_t * const stream = &state->stream;
-  kvz_nal_write(stream, AUD_NUT, 0, 1);
+  kvz_nal_write(stream, KVZ_NAL_AUD_NUT, 0, 1);
 
-  uint8_t pic_type = state->global->slicetype == SLICE_I ? 0
-                   : state->global->slicetype == SLICE_P ? 1
+  uint8_t pic_type = state->global->slicetype == KVZ_SLICE_I ? 0
+                   : state->global->slicetype == KVZ_SLICE_P ? 1
                    :                                       2;
   WRITE_U(stream, pic_type, 3, "pic_type");
 
@@ -654,8 +654,8 @@
 #endif
   WRITE_U(stream, (state->slice->start_in_rs == 0), 1, "first_slice_segment_in_pic_flag");
 
-  if (state->global->pictype >= NAL_BLA_W_LP
-      && state->global->pictype <= NAL_RSV_IRAP_VCL23) {
+  if (state->global->pictype >= KVZ_NAL_BLA_W_LP
+      && state->global->pictype <= KVZ_NAL_RSV_IRAP_VCL23) {
     WRITE_U(stream, 1, 1, "no_output_of_prior_pics_flag");
   }
 
@@ -674,8 +674,8 @@
       //WRITE_U(stream, 1, 1, "pic_output_flag");
     //end if
     //if( IdrPicFlag ) <- nal_unit_type == 5
-  if (state->global->pictype != NAL_IDR_W_RADL
-      && state->global->pictype != NAL_IDR_N_LP) {
+  if (state->global->pictype != KVZ_NAL_IDR_W_RADL
+      && state->global->pictype != KVZ_NAL_IDR_N_LP) {
     int last_poc = 0;
     int poc_shift = 0;
 
@@ -745,10 +745,10 @@
     WRITE_U(stream, 1, 1, "slice_sao_chroma_flag");
   }
 
-  if (state->global->slicetype != SLICE_I) {
+  if (state->global->slicetype != KVZ_SLICE_I) {
       WRITE_U(stream, 1, 1, "num_ref_idx_active_override_flag");
       WRITE_UE(stream, ref_negative != 0 ? ref_negative - 1: 0, "num_ref_idx_l0_active_minus1");
-        if (state->global->slicetype == SLICE_B) {
+        if (state->global->slicetype == KVZ_SLICE_B) {
           WRITE_UE(stream, ref_positive != 0 ? ref_positive - 1 : 0, "num_ref_idx_l1_active_minus1");
           WRITE_U(stream, 0, 1, "mvd_l1_zero_flag");
         }
@@ -790,7 +790,7 @@
   uint32_t checksum_val;
   unsigned int i;
 
-  kvz_nal_write(stream, NAL_SUFFIT_SEI_NUT, 0, 0);
+  kvz_nal_write(stream, KVZ_NAL_SUFFIX_SEI_NUT, 0, 0);
 
   kvz_image_checksum(frame->rec, checksum, state->encoder_control->bitdepth);
 
@@ -845,21 +845,21 @@
     first_nal_in_au = false;
 
     // Video Parameter Set (VPS)
-    kvz_nal_write(stream, NAL_VPS_NUT, 0, 1);
+    kvz_nal_write(stream, KVZ_NAL_VPS_NUT, 0, 1);
     encoder_state_write_bitstream_vid_parameter_set(state);
 
     // Sequence Parameter Set (SPS)
-    kvz_nal_write(stream, NAL_SPS_NUT, 0, 1);
+    kvz_nal_write(stream, KVZ_NAL_SPS_NUT, 0, 1);
     encoder_state_write_bitstream_seq_parameter_set(state);
 
     // Picture Parameter Set (PPS)
-    kvz_nal_write(stream, NAL_PPS_NUT, 0, 1);
+    kvz_nal_write(stream, KVZ_NAL_PPS_NUT, 0, 1);
     encoder_state_write_bitstream_pic_parameter_set(state);
   }
 
   // Send Kvazaar version information only in the first frame.
   if (state->global->frame == 0 && state->encoder_control->cfg->add_encoder_info) {
-    kvz_nal_write(stream, PREFIX_SEI_NUT, 0, first_nal_in_au);
+    kvz_nal_write(stream, KVZ_NAL_PREFIX_SEI_NUT, 0, first_nal_in_au);
     encoder_state_write_bitstream_prefix_sei_version(state);
 
     // spec:sei_rbsp() rbsp_trailing_bits
@@ -870,11 +870,11 @@
   if (state->encoder_control->vui.frame_field_info_present_flag){
     // These should be optional, needed for earlier versions
     // of HM decoder to accept bitstream
-    //kvz_nal_write(stream, PREFIX_SEI_NUT, 0, 0);
+    //kvz_nal_write(stream, KVZ_NAL_PREFIX_SEI_NUT, 0, 0);
     //encoder_state_write_active_parameter_sets_sei_message(state);
     //kvz_bitstream_rbsp_trailing_bits(stream);
 
-    kvz_nal_write(stream, PREFIX_SEI_NUT, 0, first_nal_in_au);
+    kvz_nal_write(stream, KVZ_NAL_PREFIX_SEI_NUT, 0, first_nal_in_au);
     encoder_state_write_picture_timing_sei_message(state);
 
     // spec:sei_rbsp() rbsp_trailing_bits
@@ -882,7 +882,7 @@
   }
 
   {
-    uint8_t nal_type = (state->global->is_idr_frame ? NAL_IDR_W_RADL : NAL_TRAIL_R);
+    uint8_t nal_type = (state->global->is_idr_frame ? KVZ_NAL_IDR_W_RADL : KVZ_NAL_TRAIL_R);
     kvz_nal_write(stream, nal_type, 0, first_nal_in_au);
   }

kvazaar-0.6.1.tar.gz/src/encoderstate.c -> kvazaar-0.7.0.tar.gz/src/encoderstate.c Changed

@@ -369,7 +369,7 @@
         // once. The added dependancy is for the first LCU of each wavefront
         // row to depend on the reconstruction status of the row below in the
         // previous frame.
-        if (state->previous_encoder_state != state && state->previous_encoder_state->tqj_recon_done && state->global->slicetype != SLICE_I) {
+        if (state->previous_encoder_state != state && state->previous_encoder_state->tqj_recon_done && state->global->slicetype != KVZ_SLICE_I) {
           if (!lcu->left) {
             if (lcu->below) {
               kvz_threadqueue_job_dep_add(state->tile->wf_jobslcu->id, lcu->below->encoder_state->previous_encoder_state->tqj_recon_done);
@@ -629,7 +629,7 @@
 }
 
 
-void kvz_encoder_ref_insertion_sort(int reflist16, int length) {
+static void encoder_ref_insertion_sort(int reflist16, int length) {
 
   for (uint8_t i = 1; i < length; ++i) {
     const int16_t cur_poc = reflisti;
@@ -641,35 +641,60 @@
     reflistj = cur_poc;
   }
 }
-static void encoder_state_ref_sort(encoder_state_t *state) {
-  int j, ref_list2 = { 0, 0 }, ref_list_poc216;
+
+/**
+ * \brief Return reference picture lists.
+ *
+ * \param state             main encoder state
+ * \param ref_list_len_out  Returns the lengths of the reference lists.
+ * \param ref_list_poc_out  Returns two lists of POCs of the reference pictures.
+ */
+void kvz_encoder_get_ref_lists(const encoder_state_t *const state,
+                               int ref_list_len_out2,
+                               int ref_list_poc_out216)
+{
+  FILL_ARRAY(ref_list_len_out, 0, 2);
 
   // List all pocs of lists
+  int j = 0;
   for (j = 0; j < state->global->ref->used_size; j++) {
     if (state->global->ref->pocsj < state->global->poc) {
-      ref_list_poc0ref_list0 = state->global->ref->pocsj;
-      ref_list0++;
+      ref_list_poc_out0ref_list_len_out0 = state->global->ref->pocsj;
+      ref_list_len_out0++;
     } else {
-      ref_list_poc1ref_list1 = state->global->ref->pocsj;
-      ref_list1++;
+      ref_list_poc_out1ref_list_len_out1 = state->global->ref->pocsj;
+      ref_list_len_out1++;
     }
   }
 
-  kvz_encoder_ref_insertion_sort(ref_list_poc0, ref_list0);
-  kvz_encoder_ref_insertion_sort(ref_list_poc1, ref_list1);
+  // Fill the rest of ref_list_poc_out array with -1s.
+  for (; j < 16; j++) {
+    ref_list_poc_out0j = -1;
+    ref_list_poc_out1j = -1;
+  }
 
-  for (j = 0; j < state->global->ref->used_size; j++) {
+  encoder_ref_insertion_sort(ref_list_poc_out0, ref_list_len_out0);
+  encoder_ref_insertion_sort(ref_list_poc_out1, ref_list_len_out1);
+}
+
+static void encoder_state_ref_sort(encoder_state_t *state) {
+  int ref_list_len2;
+  int ref_list_poc216;
+
+  kvz_encoder_get_ref_lists(state, ref_list_len, ref_list_poc);
+
+  for (int j = 0; j < state->global->ref->used_size; j++) {
     if (state->global->ref->pocsj < state->global->poc) {
-      for (int ref_idx = 0; ref_idx < ref_list0; ref_idx++) {
+      for (int ref_idx = 0; ref_idx < ref_list_len0; ref_idx++) {
         if (ref_list_poc0ref_idx == state->global->ref->pocsj) {
-          state->global->refmapj.idx = ref_list0 - ref_idx - 1;
+          state->global->refmapj.idx = ref_list_len0 - ref_idx - 1;
           break;
         }
       }
       state->global->refmapj.list = 1;
 
     } else {
-      for (int ref_idx = 0; ref_idx < ref_list1; ref_idx++) {
+      for (int ref_idx = 0; ref_idx < ref_list_len1; ref_idx++) {
         if (ref_list_poc1ref_idx == state->global->ref->pocsj) {
           state->global->refmapj.idx = ref_idx;
           break;
@@ -688,7 +713,7 @@
   if (encoder->cfg->gop_len) {
     refnumber = encoder->cfg->gopstate->global->gop_offset.ref_neg_count + encoder->cfg->gopstate->global->gop_offset.ref_pos_count;
     check_refs = 1;
-  } else if (state->global->slicetype == SLICE_I) {
+  } else if (state->global->slicetype == KVZ_SLICE_I) {
     refnumber = 0;
   }
   // Remove the ref pic (if present)
@@ -758,14 +783,14 @@
    
     if (state->global->is_idr_frame) {
       encoder_state_reset_poc(state);
-      state->global->slicetype = SLICE_I;
-      state->global->pictype = NAL_IDR_W_RADL;
+      state->global->slicetype = KVZ_SLICE_I;
+      state->global->pictype = KVZ_NAL_IDR_W_RADL;
     } else {
-      state->global->slicetype = encoder->cfg->intra_period==1 ? SLICE_I : (state->encoder_control->cfg->gop_len?SLICE_B:SLICE_P);
-      state->global->pictype = NAL_TRAIL_R;
+      state->global->slicetype = encoder->cfg->intra_period==1 ? KVZ_SLICE_I : (state->encoder_control->cfg->gop_len?KVZ_SLICE_B:KVZ_SLICE_P);
+      state->global->pictype = KVZ_NAL_TRAIL_R;
       if (state->encoder_control->cfg->gop_len) {
         if (encoder->cfg->intra_period > 1 && (state->global->poc % encoder->cfg->intra_period) == 0) {
-          state->global->slicetype = SLICE_I;
+          state->global->slicetype = KVZ_SLICE_I;
         }
       }
 
@@ -779,7 +804,7 @@
       lambda = kvz_select_picture_lambda(state);
       state->global->QP = kvz_lambda_to_QP(lambda);
     } else {
-      if (encoder->cfg->gop_len > 0 && state->global->slicetype != SLICE_I) {
+      if (encoder->cfg->gop_len > 0 && state->global->slicetype != KVZ_SLICE_I) {
         kvz_gop_config const * const gop =
           encoder->cfg->gop + state->global->gop_offset;
         state->global->QP = encoder->cfg->qp + gop->qp_offset;
@@ -864,12 +889,6 @@
 }
 
 
-void kvz_encoder_compute_stats(encoder_state_t *state, double frame_psnr3)
-{
-  assert(state->frame_done);
-  kvz_videoframe_compute_psnr(state->tile->frame, frame_psnr);
-}
-
 void kvz_encoder_next_frame(encoder_state_t *state)
 {
   const encoder_control_t * const encoder = state->encoder_control;
@@ -1011,7 +1030,7 @@
 
 
     // Encode skip flag
-  if (state->global->slicetype != SLICE_I) {
+  if (state->global->slicetype != KVZ_SLICE_I) {
     int8_t ctx_skip = 0; // uiCtxSkip = aboveskipped + leftskipped;
     int ui;
     int16_t num_cand = MRG_MAX_NUM_CANDS;
@@ -1050,7 +1069,7 @@
   // ENDIF SKIP
 
   // Prediction mode
-  if (state->global->slicetype != SLICE_I) {
+  if (state->global->slicetype != KVZ_SLICE_I) {
     cabac->cur_ctx = &(cabac->ctx.cu_pred_mode_model);
     CABAC_BIN(cabac, (cur_cu->type == CU_INTRA), "PredMode");
   }
@@ -1106,7 +1125,7 @@
       }
 
       // Void TEncSbac::codeInterDir( TComDataCU* pcCU, UInt uiAbsPartIdx )
-      if (state->global->slicetype == SLICE_B)
+      if (state->global->slicetype == KVZ_SLICE_B)
       {
         // Code Inter Dir
         uint8_t inter_dir = cur_cu->inter.mv_dir-1;

kvazaar-0.6.1.tar.gz/src/encoderstate.h -> kvazaar-0.7.0.tar.gz/src/encoderstate.h Changed

kvazaar-0.6.1.tar.gz/src/filter.c -> kvazaar-0.7.0.tar.gz/src/filter.c Changed

kvazaar-0.6.1.tar.gz/src/global.h -> kvazaar-0.7.0.tar.gz/src/global.h Changed

kvazaar-0.6.1.tar.gz/src/inter.c -> kvazaar-0.7.0.tar.gz/src/inter.c Changed

@@ -763,7 +763,7 @@
   }
 #endif
 
-  if (candidates < MRG_MAX_NUM_CANDS && state->global->slicetype == SLICE_B) {
+  if (candidates < MRG_MAX_NUM_CANDS && state->global->slicetype == KVZ_SLICE_B) {
     #define NUM_PRIORITY_LIST 12;
     static const uint8_t priorityList0 = { 0, 1, 0, 2, 1, 2, 0, 3, 1, 3, 2, 3 };
     static const uint8_t priorityList1 = { 1, 0, 2, 0, 2, 1, 3, 0, 3, 1, 3, 2 };
@@ -798,7 +798,7 @@
 
   int num_ref = state->global->ref->used_size;
 
-  if (candidates < MRG_MAX_NUM_CANDS && state->global->slicetype == SLICE_B) {
+  if (candidates < MRG_MAX_NUM_CANDS && state->global->slicetype == KVZ_SLICE_B) {
     int j;
     int ref_negative = 0;
     int ref_positive = 0;
@@ -819,7 +819,7 @@
     mv_candcandidates.ref0 = (zero_idx>=num_ref-1)?0:zero_idx;
     mv_candcandidates.ref1 = mv_candcandidates.ref0;
     mv_candcandidates.dir = 1;
-    if (state->global->slicetype == SLICE_B) {
+    if (state->global->slicetype == KVZ_SLICE_B) {
       mv_candcandidates.mv10 = 0;
       mv_candcandidates.mv11 = 0;
       mv_candcandidates.dir = 3;

kvazaar-0.6.1.tar.gz/src/kvazaar.c -> kvazaar-0.7.0.tar.gz/src/kvazaar.c Changed

@@ -113,15 +113,28 @@
 }
 
 
+static void set_frame_info(kvz_frame_info *const info, const encoder_state_t *const state)
+{
+  info->poc = state->global->poc,
+  info->qp = state->global->QP;
+  info->nal_unit_type = state->global->pictype;
+  info->slice_type = state->global->slicetype;
+  kvz_encoder_get_ref_lists(state, info->ref_list_len, info->ref_list);
+}
+
+
 static int kvazaar_encode(kvz_encoder *enc,
                           kvz_picture *pic_in,
                           kvz_data_chunk **data_out,
                           uint32_t *len_out,
-                          kvz_picture **pic_out)
+                          kvz_picture **pic_out,
+                          kvz_picture **src_out,
+                          kvz_frame_info *info_out)
 {
   if (data_out) *data_out = NULL;
   if (len_out) *len_out = 0;
   if (pic_out) *pic_out = NULL;
+  if (src_out) *src_out = NULL;
 
   encoder_state_t *state = &enc->statesenc->cur_state_num;
 
@@ -164,6 +177,8 @@
     if (len_out) *len_out = kvz_bitstream_tell(&output_state->stream) / 8;
     if (data_out) *data_out = kvz_bitstream_take_chunks(&output_state->stream);
     if (pic_out) *pic_out = kvz_image_copy_ref(output_state->tile->frame->rec);
+    if (src_out) *src_out = kvz_image_copy_ref(output_state->tile->frame->source);
+    if (info_out) set_frame_info(info_out, output_state);
 
     output_state->frame_done = 1;
     output_state->prepared = 0;

kvazaar-0.6.1.tar.gz/src/kvazaar.h -> kvazaar-0.7.0.tar.gz/src/kvazaar.h Changed

@@ -192,6 +192,116 @@
 } kvz_picture;
 
 /**
+ * \brief NAL unit type codes.
+ *
+ * These are the nal_unit_type codes from Table 7-1 ITU-T H.265 v1.0.
+ */
+enum kvz_nal_unit_type {
+
+  // Trailing pictures
+
+  KVZ_NAL_TRAIL_N = 0,
+  KVZ_NAL_TRAIL_R = 1,
+
+  KVZ_NAL_TSA_N = 2,
+  KVZ_NAL_TSA_R = 3,
+
+  KVZ_NAL_STSA_N = 4,
+  KVZ_NAL_STSA_R = 5,
+
+  // Leading pictures
+
+  KVZ_NAL_RADL_N = 6,
+  KVZ_NAL_RADL_R = 7,
+
+  KVZ_NAL_RASL_N = 8,
+  KVZ_NAL_RASL_R = 9,
+
+  // Reserved non-IRAP RSV_VCL_N/R 10-15
+
+  // Intra random access point pictures
+
+  KVZ_NAL_BLA_W_LP   = 16,
+  KVZ_NAL_BLA_W_RADL = 17,
+  KVZ_NAL_BLA_N_LP   = 18,
+
+  KVZ_NAL_IDR_W_RADL = 19,
+  KVZ_NAL_IDR_N_LP   = 20,
+
+  KVZ_NAL_CRA_NUT    = 21,
+
+  // Reserved IRAP
+
+  KVZ_NAL_RSV_IRAP_VCL22 = 22,
+  KVZ_NAL_RSV_IRAP_VCL23 = 23,
+
+  // Reserved non-IRAP RSV_VCL 24-32
+
+  // non-VCL
+
+  KVZ_NAL_VPS_NUT = 32,
+  KVZ_NAL_SPS_NUT = 33,
+  KVZ_NAL_PPS_NUT = 34,
+
+  KVZ_NAL_AUD_NUT = 35,
+  KVZ_NAL_EOS_NUT = 36,
+  KVZ_NAL_EOB_NUT = 37,
+  KVZ_NAL_FD_NUT  = 38,
+
+  KVZ_NAL_PREFIX_SEI_NUT = 39,
+  KVZ_NAL_SUFFIX_SEI_NUT = 40,
+
+  // Reserved RSV_NVCL 41-47
+  // Unspecified UNSPEC 48-63
+};
+
+enum kvz_slice_type {
+  KVZ_SLICE_B = 0,
+  KVZ_SLICE_P = 1,
+  KVZ_SLICE_I = 2,
+};
+
+/**
+ * \brief Other information about an encoded frame
+ */
+typedef struct kvz_frame_info {
+
+  /**
+   * \brief Picture order count
+   */
+  int32_t poc;
+
+  /**
+   * \brief Quantization parameter
+   */
+  int8_t qp;
+
+  /**
+   * \brief Type of the NAL VCL unit
+   */
+  enum kvz_nal_unit_type nal_unit_type;
+
+  /**
+   * \brief Type of the slice
+   */
+  enum kvz_slice_type slice_type;
+
+  /**
+   * \brief Reference picture lists
+   *
+   * The first list contains the reference picture POCs that are less than the
+   * POC of this frame and the second one contains those that are greater.
+   */
+  int ref_list216;
+
+  /**
+   * \brief Lengths of the reference picture lists
+   */
+  int ref_list_len2;
+
+} kvz_frame_info;
+
+/**
  * \brief A linked list of chunks of data.
  *
  * Used for returning the encoded data.
@@ -303,9 +413,9 @@
    * \brief Encode one frame.
    *
    * Add pic_in to the encoding pipeline. If an encoded frame is ready, return
-   * the bitstream, length of the bitstream and the reconstructed frame in
-   * data_out, len_out and pic_out, respectively. Otherwise, set the output
-   * parameters to NULL.
+   * the bitstream, length of the bitstream, the reconstructed frame, the
+   * original frame and frame info in data_out, len_out, pic_out, src_out and
+   * info_out, respectively. Otherwise, set the output parameters to NULL.
    *
    * After passing all of the input frames, the caller should keep calling this
    * function with pic_in set to NULL, until no more data is returned in the
@@ -313,24 +423,29 @@
    *
    * The caller must not modify pic_in after passing it to this function.
    *
-   * If pic_out and data_out are set to non-NULL values, the caller is
-   * responsible for calling picture_free and chunk_free on them.
+   * If data_out, pic_out and src_out are set to non-NULL values, the caller is
+   * responsible for calling chunk_free and picture_free on them.
    *
    * A null pointer may be passed in place of any of the parameters data_out,
-   * len_out or pic_out to skip returning the corresponding value.
+   * len_out, pic_out, src_out or info_out to skip returning the corresponding
+   * value.
    *
    * \param encoder   encoder
    * \param pic_in    input frame or NULL
    * \param data_out  Returns the encoded data.
    * \param len_out   Returns number of bytes in the encoded data.
    * \param pic_out   Returns the reconstructed picture.
+   * \param src_out   Returns the original picture.
+   * \param info_out  Returns information about the encoded picture.
    * \return          1 on success, 0 on error.
    */
   int           (*encoder_encode)(kvz_encoder *encoder,
                                   kvz_picture *pic_in,
                                   kvz_data_chunk **data_out,
                                   uint32_t *len_out,
-                                  kvz_picture **pic_out);
+                                  kvz_picture **pic_out,
+                                  kvz_picture **src_out,
+                                  kvz_frame_info *info_out);
 } kvz_api;
 
 // Append API version to the getters name to prevent linking against incompatible versions.

kvazaar-0.6.1.tar.gz/src/kvazaar_version.h -> kvazaar-0.7.0.tar.gz/src/kvazaar_version.h Changed

kvazaar-0.6.1.tar.gz/src/nal.h -> kvazaar-0.7.0.tar.gz/src/nal.h Changed

@@ -32,64 +32,6 @@
 #include "image.h"
 #include "bitstream.h"
 
-
-//////////////////////////////////////////////////////////////////////////
-// TYPES
-
-/**
- * \brief NAL unit type codes.
- *
- * These are the nal_unit_type codes from Table 7-1 ITU-T H.265 v1.0.
- * The type codes have been prefixed with "NAL_".
- */
-enum {
-  NAL_TRAIL_N = 0,
-  NAL_TRAIL_R = 1,
-
-  NAL_TSA_N = 2,
-  NAL_TSA_R = 3,
-
-  NAL_STSA_N = 4,
-  NAL_STSA_R = 5,
-
-  NAL_RADL_N = 6,
-  NAL_RADL_R = 7,
-
-  NAL_RASL_N = 8,
-  NAL_RASL_R = 9,
-
-  // Reserved RSV_VCL_ N/R 10-15
-
-  NAL_BLA_W_LP = 16,
-  NAL_BLA_W_RADL = 17,
-  NAL_BLA_N_LP = 18,
-
-  NAL_IDR_W_RADL = 19,
-  NAL_IDR_N_LP = 20,
-
-  NAL_CRA_NUT = 21,
-
-  // Reserved RSV_IRAP_VCL 22-23
-  NAL_RSV_IRAP_VCL23 = 23,
-
-  // Reserved RSV_VCL 24-31
-
-  NAL_VPS_NUT = 32,
-  NAL_SPS_NUT = 33,
-  NAL_PPS_NUT = 34,
-
-  AUD_NUT = 35,
-  EOS_NUT = 36,
-  EOB_NUT = 37,
-  FD_NUT = 38,
-
-  PREFIX_SEI_NUT = 39,
-  NAL_SUFFIT_SEI_NUT = 40,
-
-  // Reserved RSV_NVCL 41-47
-  // Unspecified UNSPEC 48-63
-};
-
 #define SEI_HASH_MAX_LENGTH 4
 
 //////////////////////////////////////////////////////////////////////////

kvazaar-0.6.1.tar.gz/src/rate_control.c -> kvazaar-0.7.0.tar.gz/src/rate_control.c Changed

kvazaar-0.6.1.tar.gz/src/search.c -> kvazaar-0.7.0.tar.gz/src/search.c Changed

kvazaar-0.6.1.tar.gz/src/search_inter.c -> kvazaar-0.7.0.tar.gz/src/search_inter.c Changed

kvazaar-0.6.1.tar.gz/src/transform.c -> kvazaar-0.7.0.tar.gz/src/transform.c Changed

kvazaar-0.6.1.tar.gz/src/videoframe.c -> kvazaar-0.7.0.tar.gz/src/videoframe.c Changed

@@ -118,23 +118,31 @@
 
 /**
  * \brief Calculates image PSNR value
+ *
+ * \param src   source picture
+ * \param rec   reconstructed picture
+ * \prama psnr  returns the PSNR
  */
-void kvz_videoframe_compute_psnr(const videoframe_t * const frame, double psnrNUM_COLORS)
+void kvz_videoframe_compute_psnr(const kvz_picture *const src,
+                                 const kvz_picture *const rec,
+                                 double psnrNUM_COLORS)
 {
-  int32_t pixels = frame->width * frame->height;
-  int32_t i, c;
-  
-  for (c = 0; c < NUM_COLORS; ++c) {
+  assert(src->width  == rec->width);
+  assert(src->height == rec->height);
+
+  int32_t pixels = src->width * src->height;
+
+  for (int32_t c = 0; c < NUM_COLORS; ++c) {
     int32_t num_pixels = pixels;
     if (c != COLOR_Y) {
       num_pixels >>= 2;
     }
     psnrc = 0;
-    for (i = 0; i < num_pixels; ++i) {
-      const int32_t error = frame->source->dataci - frame->rec->dataci;
+    for (int32_t i = 0; i < num_pixels; ++i) {
+      const int32_t error = src->dataci - rec->dataci;
       psnrc += error * error;
     }
-    
+
     // Avoid division by zero
     if (psnrc == 0) psnrc = 99.0;
     psnrc = 10 * log10((num_pixels * PSNRMAX) / ((double)psnrc));;

kvazaar-0.6.1.tar.gz/src/videoframe.h -> kvazaar-0.7.0.tar.gz/src/videoframe.h Changed

kvazaar-0.6.1.tar.gz/tests/intra_sad_tests.c -> kvazaar-0.7.0.tar.gz/tests/intra_sad_tests.c Changed

kvazaar-0.6.1.tar.gz/tests/satd_tests.c -> kvazaar-0.7.0.tar.gz/tests/satd_tests.c Changed

kvazaar-0.6.1.tar.gz/tests/speed_tests.c -> kvazaar-0.7.0.tar.gz/tests/speed_tests.c Changed

@@ -277,25 +277,25 @@
     const strategy_t * strategy = &strategies.strategiesi;
 
     // Select buffer width according to function name for intra cost functions.
-    if (strcmp(strategy->type, "sad_8bit_4x4") == 0) {
+    if (strcmp(strategy->type, "sad_4x4") == 0) {
       test_env.log_width = 2;
-    } else if (strcmp(strategy->type, "sad_8bit_8x8") == 0) {
+    } else if (strcmp(strategy->type, "sad_8x8") == 0) {
       test_env.log_width = 3;
-    } else if (strcmp(strategy->type, "sad_8bit_16x16") == 0) {
+    } else if (strcmp(strategy->type, "sad_16x16") == 0) {
       test_env.log_width = 4;
-    } else if (strcmp(strategy->type, "sad_8bit_32x32") == 0) {
+    } else if (strcmp(strategy->type, "sad_32x32") == 0) {
       test_env.log_width = 5;
-    } else if (strcmp(strategy->type, "sad_8bit_64x64") == 0) {
+    } else if (strcmp(strategy->type, "sad_64x64") == 0) {
       test_env.log_width = 6;
-    } else if (strcmp(strategy->type, "satd_8bit_4x4") == 0) {
+    } else if (strcmp(strategy->type, "satd_4x4") == 0) {
       test_env.log_width = 2;
-    } else if (strcmp(strategy->type, "satd_8bit_8x8") == 0) {
+    } else if (strcmp(strategy->type, "satd_8x8") == 0) {
       test_env.log_width = 3;
-    } else if (strcmp(strategy->type, "satd_8bit_16x16") == 0) {
+    } else if (strcmp(strategy->type, "satd_16x16") == 0) {
       test_env.log_width = 4;
-    } else if (strcmp(strategy->type, "satd_8bit_32x32") == 0) {
+    } else if (strcmp(strategy->type, "satd_32x32") == 0) {
       test_env.log_width = 5;
-    } else if (strcmp(strategy->type, "satd_8bit_64x64") == 0) {
+    } else if (strcmp(strategy->type, "satd_64x64") == 0) {
       test_env.log_width = 6;
     } else if (strcmp(strategy->type, "dct_4x4") == 0) {
       test_env.log_width = 2;
@@ -326,9 +326,9 @@
 
     // Call different tests depending on type of function.
     // This allows for selecting a subset of tests with -t parameter.
-    if (strncmp(strategy->type, "satd_8bit_", 10) == 0) {
+    if (strncmp(strategy->type, "satd_", 5) == 0) {
       RUN_TEST(intra_satd);
-    } else if (strncmp(strategy->type, "sad_8bit_", 9) == 0) {
+    } else if (strncmp(strategy->type, "sad_", 4) == 0) {
       RUN_TEST(intra_sad);
     } else if (strcmp(strategy->type, "reg_sad") == 0) {
       // Call reg_sad with all the sizes it is actually called with.

Overview

Request 2159 (accepted)

Request History