Move function kvz_encoder_feed_frame to a separate module.

Adds module input_frame_buffer.

build/kvazaar_lib/kvazaar_lib.vcxproj

@@ -125,6 +125,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\..\src\input_frame_buffer.c" />
     <ClCompile Include="..\..\src\kvazaar.c" />
     <ClCompile Include="..\..\src\bitstream.c" />
     <ClCompile Include="..\..\src\cabac.c" />
@@ -196,6 +197,7 @@
     <ClCompile Include="..\..\src\tables.c" />
     <ClCompile Include="..\..\src\threadqueue.c" />
     <ClCompile Include="..\..\src\transform.c" />
+    <ClInclude Include="..\..\src\input_frame_buffer.h" />
     <ClInclude Include="..\..\src\kvazaar_internal.h" />
     <ClInclude Include="..\..\src\search_inter.h" />
     <ClInclude Include="..\..\src\search_intra.h" />

build/kvazaar_lib/kvazaar_lib.vcxproj.filters

@@ -204,6 +204,9 @@
     <ClCompile Include="..\..\src\search_intra.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\input_frame_buffer.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\global.h">
@@ -368,6 +371,9 @@
     <ClInclude Include="..\..\src\search_intra.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\input_frame_buffer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <YASM Include="..\..\src\extras\x86inc.asm">

src/Makefile

@@ -165,6 +165,7 @@ OBJS = \
   encoderstate.o \
   rate_control.o \
   filter.o \
+  input_frame_buffer.o \
   inter.o \
   intra.o \
   kvazaar.o \

src/encoderstate.c

@@ -856,95 +856,6 @@ void kvz_encode_one_frame(encoder_state_t * const state)
   //kvz_threadqueue_flush(main_state->encoder_control->threadqueue);
 }
 
-/**
- * \brief Pass an input frame to the encoder state.
- *
- * Sets the source image of the encoder state if there is a suitable image
- * available.
- *
- * The caller must not modify img_in after calling this function.
- *
- * \param state   a main encoder state
- * \param img_in  input frame or NULL
- * \return        1 if the source image was set, 0 if not
- */
-int kvz_encoder_feed_frame(encoder_state_t *const state, kvz_picture *const img_in)
-{
-  const encoder_control_t* const encoder = state->encoder_control;
-  const kvz_config* const cfg = encoder->cfg;
-
-  // TODO: Get rid of static variables.
-  static kvz_picture *gop_buffer[2 * KVZ_MAX_GOP_LENGTH] = { NULL };
-  static int gop_buf_write_idx = 0;
-  static int gop_buf_read_idx = 0;
-  static int gop_pictures_available = 0;
-  static int gop_offset = 0;
-
-  const int gop_buf_size = 2 * cfg->gop_len;
-
-  assert(state->global->frame >= 0);
-  assert(state->tile->frame->source == NULL);
-
-  if (cfg->gop_len == 0 || state->global->frame == 0) {
-    if (img_in == NULL) return 0;
-    state->tile->frame->source = kvz_image_copy_ref(img_in);
-    state->tile->frame->rec->pts = img_in->pts;
-    state->global->gop_offset = 0;
-    return 1;
-  }
-  // GOP enabled and not the first frame
-
-  if (img_in != NULL) {
-    // Save the input image in the buffer.
-    assert(gop_pictures_available < gop_buf_size);
-    assert(gop_buffer[gop_buf_write_idx] == NULL);
-    gop_buffer[gop_buf_write_idx] = kvz_image_copy_ref(img_in);
-
-    ++gop_pictures_available;
-    if (++gop_buf_write_idx >= gop_buf_size) {
-      gop_buf_write_idx = 0;
-    }
-  }
-
-  if (gop_pictures_available < cfg->gop_len) {
-    if (img_in != NULL || gop_pictures_available == 0) {
-      // Either start of the sequence with no full GOP available yet, or the
-      // end of the sequence with all pics encoded.
-      return 0;
-    }
-    // End of the sequence and a full GOP is not available.
-    // Skip pictures until an available one is found.
-    for (; gop_offset < cfg->gop_len &&
-           cfg->gop[gop_offset].poc_offset - 1 >= gop_pictures_available;
-           ++gop_offset);
-
-    if (gop_offset >= cfg->gop_len) {
-      // All available pictures used.
-      gop_offset = 0;
-      gop_pictures_available = 0;
-      return 0;
-    }
-  }
-
-  // Move image from buffer to state.
-  int buffer_index = gop_buf_read_idx + cfg->gop[gop_offset].poc_offset - 1;
-  assert(gop_buffer[buffer_index] != NULL);
-  assert(state->tile->frame->source == NULL);
-  state->tile->frame->source = gop_buffer[buffer_index];
-  state->tile->frame->rec->pts = gop_buffer[buffer_index]->pts;
-  gop_buffer[buffer_index] = NULL;
-
-  state->global->gop_offset = gop_offset;
-
-  if (++gop_offset >= cfg->gop_len) {
-    gop_offset = 0;
-    gop_pictures_available = MAX(0, gop_pictures_available - cfg->gop_len);
-    gop_buf_read_idx = (gop_buf_read_idx + cfg->gop_len) % gop_buf_size;
-  }
-
-  return 1;
-}
-
 
 void kvz_encoder_compute_stats(encoder_state_t *state, double frame_psnr[3])
 {

src/encoderstate.h

@@ -204,10 +204,7 @@ typedef struct encoder_state_t {
   threadqueue_job_t * tqj_bitstream_written; //Bitstream is written
 } encoder_state_t;
 
-
-
 void kvz_encode_one_frame(encoder_state_t *state);
-int kvz_encoder_feed_frame(encoder_state_t *const state, kvz_picture *const img_in);
 
 void kvz_encoder_compute_stats(encoder_state_t *state, double psnr[3]);
 void kvz_encoder_next_frame(encoder_state_t *state);

src/input_frame_buffer.c

@@ -0,0 +1,116 @@
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2015 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 Lesser General Public License as published by the
+ * 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
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * 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
+ * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+
+/*
+ * \file
+ */
+
+#include "input_frame_buffer.h"
+#include "encoderstate.h"
+#include <assert.h>
+
+/**
+ * \brief Pass an input frame to the encoder state.
+ *
+ * Sets the source image of the encoder state if there is a suitable image
+ * available.
+ *
+ * The caller must not modify img_in after calling this function.
+ *
+ * \param state   a main encoder state
+ * \param img_in  input frame or NULL
+ * \return        1 if the source image was set, 0 if not
+ */
+int kvz_encoder_feed_frame(encoder_state_t *const state, kvz_picture *const img_in)
+{
+  const encoder_control_t* const encoder = state->encoder_control;
+  const kvz_config* const cfg = encoder->cfg;
+
+  // TODO: Get rid of static variables.
+  static kvz_picture *gop_buffer[2 * KVZ_MAX_GOP_LENGTH] = { NULL };
+  static int gop_buf_write_idx = 0;
+  static int gop_buf_read_idx = 0;
+  static int gop_pictures_available = 0;
+  static int gop_offset = 0;
+
+  const int gop_buf_size = 2 * cfg->gop_len;
+
+  assert(state->global->frame >= 0);
+  assert(state->tile->frame->source == NULL);
+
+  if (cfg->gop_len == 0 || state->global->frame == 0) {
+    if (img_in == NULL) return 0;
+    state->tile->frame->source = kvz_image_copy_ref(img_in);
+    state->tile->frame->rec->pts = img_in->pts;
+    state->global->gop_offset = 0;
+    return 1;
+  }
+  // GOP enabled and not the first frame
+
+  if (img_in != NULL) {
+    // Save the input image in the buffer.
+    assert(gop_pictures_available < gop_buf_size);
+    assert(gop_buffer[gop_buf_write_idx] == NULL);
+    gop_buffer[gop_buf_write_idx] = kvz_image_copy_ref(img_in);
+
+    ++gop_pictures_available;
+    if (++gop_buf_write_idx >= gop_buf_size) {
+      gop_buf_write_idx = 0;
+    }
+  }
+
+  if (gop_pictures_available < cfg->gop_len) {
+    if (img_in != NULL || gop_pictures_available == 0) {
+      // Either start of the sequence with no full GOP available yet, or the
+      // end of the sequence with all pics encoded.
+      return 0;
+    }
+    // End of the sequence and a full GOP is not available.
+    // Skip pictures until an available one is found.
+    for (; gop_offset < cfg->gop_len &&
+           cfg->gop[gop_offset].poc_offset - 1 >= gop_pictures_available;
+           ++gop_offset);
+
+    if (gop_offset >= cfg->gop_len) {
+      // All available pictures used.
+      gop_offset = 0;
+      gop_pictures_available = 0;
+      return 0;
+    }
+  }
+
+  // Move image from buffer to state.
+  int buffer_index = gop_buf_read_idx + cfg->gop[gop_offset].poc_offset - 1;
+  assert(gop_buffer[buffer_index] != NULL);
+  assert(state->tile->frame->source == NULL);
+  state->tile->frame->source = gop_buffer[buffer_index];
+  state->tile->frame->rec->pts = gop_buffer[buffer_index]->pts;
+  gop_buffer[buffer_index] = NULL;
+
+  state->global->gop_offset = gop_offset;
+
+  if (++gop_offset >= cfg->gop_len) {
+    gop_offset = 0;
+    gop_pictures_available = MAX(0, gop_pictures_available - cfg->gop_len);
+    gop_buf_read_idx = (gop_buf_read_idx + cfg->gop_len) % gop_buf_size;
+  }
+
+  return 1;
+}

src/input_frame_buffer.h

@@ -0,0 +1,35 @@
+#ifndef INPUT_FRAME_BUFFER_H_
+#define INPUT_FRAME_BUFFER_H_
+/*****************************************************************************
+ * This file is part of Kvazaar HEVC encoder.
+ *
+ * Copyright (C) 2013-2015 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 Lesser General Public License as published by the
+ * 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
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * 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
+ * with Kvazaar.  If not, see <http://www.gnu.org/licenses/>.
+ ****************************************************************************/
+
+/*
+ * \file
+ */
+
+#include "global.h"
+
+// Forward declaration.
+struct encoder_state_t;
+
+int kvz_encoder_feed_frame(struct encoder_state_t *const state,
+                           struct kvz_picture *const img_in);
+
+#endif // INPUT_FRAME_BUFFER_H_

src/kvazaar.c

@@ -28,6 +28,7 @@
 #include "encoderstate.h"
 #include "checkpoint.h"
 #include "bitstream.h"
+#include "input_frame_buffer.h"
 
 
 static void kvazaar_close(kvz_encoder *encoder)