Move video frame related stuff to videoframe

src/Makefile

@@ -53,7 +53,7 @@ CC = gcc
 CCFLAGS = $(DFLAGS) -I. -Wall -Wtype-limits
 LDFLAGS += -lm
 LD = gcc -pthread -lrt
-OBJS = interface_main.o encmain.o bitstream.o cabac.o config.o context.o encoder.o encoderstate.o filter.o inter.o intra.o nal.o picture.o picturelist.o rdo.o sao.o scalinglist.o search.o strategyselector.o tables.o threadqueue.o transform.o encoder_state-bitstream.o encoder_state-ctors_dtors.o encoder_state-geometry.o image.o
+OBJS = interface_main.o encmain.o bitstream.o cabac.o config.o context.o encoder.o encoderstate.o filter.o inter.o intra.o nal.o picture.o picturelist.o rdo.o sao.o scalinglist.o search.o strategyselector.o tables.o threadqueue.o transform.o encoder_state-bitstream.o encoder_state-ctors_dtors.o encoder_state-geometry.o image.o videoframe.o
 PROG  = ./kvazaar
 PROGS = $(PROG)
 

src/videoframe.c

@@ -0,0 +1,131 @@
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2014 Tampere University of Technology and others (see
+ * COPYING file).
+ *
+ * Kvazaar is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Kvazaar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+
+/*
+ * \file
+ */
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+
+#include "sao.h"
+#include "threads.h"
+#include "videoframe.h"
+
+/**
+ * \brief Allocate new frame
+ * \param pic picture pointer
+ * \return picture pointer
+ */
+videoframe *videoframe_alloc(const int32_t width, const int32_t height) {
+  videoframe *frame = MALLOC(videoframe, 1);
+
+  if (!frame) return 0;
+
+  memset(frame, 0, sizeof(videoframe));
+
+  frame->width  = width;
+  frame->height = height;
+  frame->width_in_lcu  = frame->width / LCU_WIDTH;
+  if (frame->width_in_lcu * LCU_WIDTH < frame->width) frame->width_in_lcu++;
+  frame->height_in_lcu = frame->height / LCU_WIDTH;
+  if (frame->height_in_lcu * LCU_WIDTH < frame->height) frame->height_in_lcu++;
+  
+  //Allocate images
+  frame->source = image_alloc(frame->width, frame->height);
+  frame->rec = image_alloc(frame->width, frame->height);
+
+  {
+    // Allocate height_in_scu x width_in_scu x sizeof(CU_info)
+    unsigned height_in_scu = frame->height_in_lcu << MAX_DEPTH;
+    unsigned width_in_scu = frame->width_in_lcu << MAX_DEPTH;
+    unsigned cu_array_size = height_in_scu * width_in_scu;
+    frame->cu_array = (cu_info*)malloc(sizeof(cu_info) * cu_array_size);
+    memset(frame->cu_array, 0, sizeof(cu_info) * cu_array_size);
+  }
+
+  frame->coeff_y = NULL; frame->coeff_u = NULL; frame->coeff_v = NULL;
+
+  frame->sao_luma = MALLOC(sao_info, frame->width_in_lcu * frame->height_in_lcu);
+  frame->sao_chroma = MALLOC(sao_info, frame->width_in_lcu * frame->height_in_lcu);
+
+  return frame;
+}
+
+/**
+ * \brief Free memory allocated to frame
+ * \param pic picture pointer
+ * \return 1 on success, 0 on failure
+ */
+int videoframe_free(videoframe * const frame)
+{
+  image_free(frame->source);
+  image_free(frame->rec);
+
+  FREE_POINTER(frame->cu_array);
+
+  FREE_POINTER(frame->coeff_y);
+  FREE_POINTER(frame->coeff_u);
+  FREE_POINTER(frame->coeff_v);
+
+  FREE_POINTER(frame->sao_luma);
+  FREE_POINTER(frame->sao_chroma);
+
+  free(frame);
+
+  return 1;
+}
+
+const cu_info* videoframe_get_cu_const(const videoframe * const frame, unsigned int x_in_scu, unsigned int y_in_scu) {
+  assert(x_in_scu < (frame->width_in_lcu << MAX_DEPTH));
+  assert(y_in_scu < (frame->height_in_lcu << MAX_DEPTH));
+  
+  return &frame->cu_array[x_in_scu + y_in_scu * (frame->width_in_lcu << MAX_DEPTH)];
+}
+
+cu_info* videoframe_get_cu(videoframe * const frame, const unsigned int x_in_scu, const unsigned int y_in_scu) {
+  assert(x_in_scu < (frame->width_in_lcu << MAX_DEPTH));
+  assert(y_in_scu < (frame->height_in_lcu << MAX_DEPTH));
+  
+  return &frame->cu_array[x_in_scu + y_in_scu * (frame->width_in_lcu << MAX_DEPTH)];
+}
+
+#define PSNRMAX (255.0 * 255.0)
+
+/**
+ * \brief Calculates image PSNR value
+ */
+void videoframe_compute_psnr(const videoframe * const frame, double psnr[NUM_COLORS])
+{
+  int32_t pixels = frame->width * frame->height;
+  int32_t i, c;
+  
+  for (c = 0; c < NUM_COLORS; ++c) {
+    psnr[c] = 0;
+    for (i = 0; i < pixels; ++i) {
+      const int32_t error = frame->source->data[c][i] - frame->rec->data[c][i];
+      psnr[c] += error * error;
+    }
+    
+    // Avoid division by zero
+    if (psnr[c] == 0) psnr[c] = 99.0;
+    psnr[c] = 10 * log10((pixels * PSNRMAX) / ((double)psnr[c]));;
+  }
+}

src/videoframe.h

@@ -0,0 +1,64 @@
+#ifndef VIDEOFRAME_H_
+#define VIDEOFRAME_H_
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2014 Tampere University of Technology and others (see
+ * COPYING file).
+ *
+ * Kvazaar is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Kvazaar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+
+/*
+ * \file
+ * \brief Video frame stuff
+ */
+
+#include "global.h"
+#include "picture.h"
+#include "image.h"
+
+struct sao_info_struct;
+
+/**
+ * \brief Struct which contains all picture data
+ */
+typedef struct videoframe
+{
+  image* source;         //!< \brief Source image.
+  image* rec;            //!< \brief Reconstructed image.
+  
+  coefficient* coeff_y;   //!< \brief coefficient pointer Y
+  coefficient* coeff_u;   //!< \brief coefficient pointer U
+  coefficient* coeff_v;   //!< \brief coefficient pointer V
+
+  int32_t width;          //!< \brief Luma pixel array width.
+  int32_t height;         //!< \brief Luma pixel array height.
+  int32_t height_in_lcu;  //!< \brief Picture width in number of LCU's.
+  int32_t width_in_lcu;   //!< \brief Picture height in number of LCU's.
+
+  cu_info* cu_array;     //!< \brief Info for each CU at each depth.
+  struct sao_info_struct *sao_luma;   //!< \brief Array of sao parameters for every LCU.
+  struct sao_info_struct *sao_chroma;   //!< \brief Array of sao parameters for every LCU.
+  int32_t poc;           //!< \brief Picture order count
+} videoframe;
+
+
+videoframe *videoframe_alloc(const int32_t width, const int32_t height);
+int videoframe_free(videoframe * const frame);
+const cu_info* videoframe_get_cu_const(const videoframe * const frame, unsigned int x_in_scu, unsigned int y_in_scu);
+cu_info* videoframe_get_cu(videoframe * const frame, const unsigned int x_in_scu, const unsigned int y_in_scu);
+void videoframe_compute_psnr(const videoframe * const frame, double psnr[NUM_COLORS]);
+
+
+#endif