Remove rate control singleton

Author: Jovasa

src/encoder.c

@@ -41,6 +41,7 @@
 #include "strategyselector.h"
 #include "kvz_math.h"
 #include "fast_coeff_cost.h"
+#include "rate_control.h"
 
 static int encoder_control_init_gop_layer_weights(encoder_control_t * const);
 
@@ -602,6 +603,15 @@ encoder_control_t* kvz_encoder_control_init(const kvz_config *const cfg)
     memcpy(encoder->cfg.optional_key, cfg->optional_key, 16);
   }
 
+  if (encoder->cfg.target_bitrate > 0 && cfg->rc_algorithm != KVZ_NO_RC)
+  {
+    encoder->rc_data = kvz_get_rc_data(encoder);
+    if (!encoder->rc_data) {
+      fprintf(stderr, "Failed to initialize rate control.\n");
+      goto init_failed;
+    }
+  }
+
   return encoder;
 
 init_failed:
@@ -645,6 +655,8 @@ void kvz_encoder_control_free(encoder_control_t *const encoder)
     fclose(encoder->roi_file);
   }
 
+  kvz_free_rc_data(encoder->rc_data);
+
   free(encoder);
 }
 

src/encoder.h

@@ -44,6 +44,8 @@
 #include "threadqueue.h"
 #include "fast_coeff_cost.h"
 
+struct rc_data;
+
 /* Encoder control options, the main struct */
 typedef struct encoder_control_t
 {
@@ -149,6 +151,8 @@ typedef struct encoder_control_t
 
   fast_coeff_table_t fast_coeff_table;
 
+  struct kvz_rc_data *rc_data;
+
 } encoder_control_t;
 
 encoder_control_t* kvz_encoder_control_init(const kvz_config *cfg);

src/encoder_state-ctors_dtors.c

@@ -94,7 +94,7 @@ static int encoder_state_config_frame_init(encoder_state_t * const state) {
 
   pthread_mutex_init(&state->frame->rc_lock, NULL);
 
-  state->frame->new_ratecontrol = kvz_get_rc_data(NULL);
+  state->frame->new_ratecontrol = state->encoder_control->rc_data;
 
   return 1;
 }

src/kvazaar.c

@@ -78,7 +78,6 @@ static void kvazaar_close(kvz_encoder *encoder)
     }
     FREE_POINTER(encoder->states);
 
-    kvz_free_rc_data();
     // Discard const from the pointer.
     kvz_encoder_control_free((void*) encoder->control);
     encoder->control = NULL;
@@ -114,11 +113,6 @@ static kvz_encoder * kvazaar_open(const kvz_config *cfg)
   encoder->frames_started = 0;
   encoder->frames_done = 0;
 
-  // Assure that the rc data allocation was successful
-  if(!kvz_get_rc_data(encoder->control)) {
-    goto kvazaar_open_failure;
-  }
-
   kvz_init_input_frame_buffer(&encoder->input_buffer);
 
   encoder->states = calloc(encoder->num_encoder_states, sizeof(encoder_state_t));

src/rate_control.c

@@ -40,17 +40,10 @@
 
 
 static const int MIN_SMOOTHING_WINDOW = 40;
-static int smoothing_window = 40;
 static const double MIN_LAMBDA    = 0.1;
 static const double MAX_LAMBDA    = 10000;
 #define BETA1 1.2517
 
-static kvz_rc_data *data;
-
-static FILE *dist_file;
-static FILE *bits_file;
-static FILE *qp_file;
-static FILE *lambda_file;
 
 /**
  * \brief Clip lambda value to a valid range.
@@ -61,9 +54,7 @@ static double clip_lambda(double lambda) {
 }
 
 kvz_rc_data * kvz_get_rc_data(const encoder_control_t * const encoder) {
-  if (data != NULL || encoder == NULL) return data;
-
-  data = calloc(1, sizeof(kvz_rc_data));
+  kvz_rc_data* data = calloc(1, sizeof(kvz_rc_data));
 
   if (data == NULL) return NULL;
   if (pthread_mutex_init(&data->ck_frame_lock, NULL) != 0) return NULL;
@@ -107,18 +98,21 @@ kvz_rc_data * kvz_get_rc_data(const encoder_control_t * const encoder) {
   if(encoder->cfg.stats_file_prefix) {
     char buff[128];
     sprintf(buff, "%sbits.txt", encoder->cfg.stats_file_prefix);
-    bits_file = fopen(buff, "w");
+    data->bits_file = fopen(buff, "w");
     sprintf(buff, "%sdist.txt", encoder->cfg.stats_file_prefix);
-    dist_file = fopen(buff, "w");
+    data->dist_file = fopen(buff, "w");
     sprintf(buff, "%sqp.txt", encoder->cfg.stats_file_prefix);
-    qp_file = fopen(buff, "w");
+    data->qp_file = fopen(buff, "w");
     sprintf(buff, "%slambda.txt", encoder->cfg.stats_file_prefix);
-    lambda_file = fopen(buff, "w");
+    data->lambda_file = fopen(buff, "w");
   }
+
+  data->smoothing_window = MIN_SMOOTHING_WINDOW;
+
   return data;
 }
 
-void kvz_free_rc_data() {
+void kvz_free_rc_data(kvz_rc_data *data) {
   if (data == NULL) return;
 
   pthread_mutex_destroy(&data->ck_frame_lock);
@@ -189,16 +183,16 @@ static double gop_allocate_bits(encoder_state_t * const state)
     bits_coded -= state->frame->cur_gop_bits_coded;
   }
 
-  smoothing_window = MAX(MIN_SMOOTHING_WINDOW, smoothing_window - MAX(encoder->cfg.gop_len / 2, 1));
+  state->frame->new_ratecontrol->smoothing_window = MAX(MIN_SMOOTHING_WINDOW, state->frame->new_ratecontrol->smoothing_window - MAX(encoder->cfg.gop_len / 2, 1));
   double gop_target_bits = -1;
 
-  while( gop_target_bits < 0 && smoothing_window < 150) {
+  while( gop_target_bits < 0 && state->frame->new_ratecontrol->smoothing_window < 150) {
     // Equation 12 from https://doi.org/10.1109/TIP.2014.2336550
     gop_target_bits =
-      (encoder->target_avg_bppic * (pictures_coded + smoothing_window) - bits_coded)
-      * MAX(1, encoder->cfg.gop_len) / smoothing_window;
+      (encoder->target_avg_bppic * (pictures_coded + state->frame->new_ratecontrol->smoothing_window) - bits_coded)
+      * MAX(1, encoder->cfg.gop_len) / state->frame->new_ratecontrol->smoothing_window;
     if(gop_target_bits < 0) {
-      smoothing_window += 10;
+      state->frame->new_ratecontrol->smoothing_window += 10;
     }
   }
   // Allocate at least 200 bits for each GOP like HM does.
@@ -924,10 +918,10 @@ void kvz_update_after_picture(encoder_state_t * const state) {
 
   if (encoder->cfg.stats_file_prefix) {
     int poc = calc_poc(state);
-    fprintf(dist_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
-    fprintf(bits_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
-    fprintf(qp_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
-    fprintf(lambda_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
+    fprintf(state->frame->new_ratecontrol->dist_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
+    fprintf(state->frame->new_ratecontrol->bits_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
+    fprintf(state->frame->new_ratecontrol->qp_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
+    fprintf(state->frame->new_ratecontrol->lambda_file, "%d %d %d\n", poc, encoder->in.width_in_lcu, encoder->in.height_in_lcu);
   }
 
   for(int y_ctu = 0; y_ctu < state->encoder_control->in.height_in_lcu; y_ctu++) {
@@ -945,17 +939,17 @@ void kvz_update_after_picture(encoder_state_t * const state) {
       total_distortion += (double)ctu_distortion / ctu->pixels;
       lambda += ctu->lambda / (state->encoder_control->in.width_in_lcu * state->encoder_control->in.height_in_lcu);
       if(encoder->cfg.stats_file_prefix) {
-        fprintf(dist_file, "%f ", ctu->distortion);
-        fprintf(bits_file, "%d ", ctu->bits);
-        fprintf(qp_file, "%d ", ctu->adjust_qp ? ctu->adjust_qp : ctu->qp);
-        fprintf(lambda_file, "%f ", ctu->adjust_lambda ? ctu->adjust_lambda : ctu->lambda);
+        fprintf(state->frame->new_ratecontrol->dist_file, "%f ", ctu->distortion);
+        fprintf(state->frame->new_ratecontrol->bits_file, "%d ", ctu->bits);
+        fprintf(state->frame->new_ratecontrol->qp_file, "%d ", ctu->adjust_qp ? ctu->adjust_qp : ctu->qp);
+        fprintf(state->frame->new_ratecontrol->lambda_file, "%f ", ctu->adjust_lambda ? ctu->adjust_lambda : ctu->lambda);
       }
     }
     if (encoder->cfg.stats_file_prefix) {
-      fprintf(dist_file, "\n");
-      fprintf(bits_file, "\n");
-      fprintf(qp_file, "\n");
-      fprintf(lambda_file, "\n");
+      fprintf(state->frame->new_ratecontrol->dist_file, "\n");
+      fprintf(state->frame->new_ratecontrol->bits_file, "\n");
+      fprintf(state->frame->new_ratecontrol->qp_file, "\n");
+      fprintf(state->frame->new_ratecontrol->lambda_file, "\n");
     }
   }
 

src/rate_control.h

@@ -62,10 +62,17 @@ typedef struct kvz_rc_data {
   pthread_mutex_t ck_frame_lock;
   pthread_mutex_t lambda_lock;
   pthread_mutex_t intra_lock;
+
+  int smoothing_window;
+
+  FILE* dist_file;
+  FILE* bits_file;
+  FILE* qp_file;
+  FILE* lambda_file;
 } kvz_rc_data;
 
 kvz_rc_data * kvz_get_rc_data(const encoder_control_t * const encoder);
-void kvz_free_rc_data();
+void kvz_free_rc_data(kvz_rc_data* data);
 
 void kvz_set_picture_lambda_and_qp(encoder_state_t * const state);