reorganized encoder_state structure

src/encoder.c

@@ -787,6 +787,8 @@ void encode_one_frame(encoder_state * const main_state)
       subencoder_blit_pixels(main_state, main_state->cur_pic->v_recdata, subencoder, subencoder->cur_pic->v_recdata, 0);
     }
     
+    //We should do the slice header here, because we can have the entry points
+    
     //This has to be serial
     i = 0;
     do {

src/encoder.h

@@ -124,28 +124,29 @@ typedef struct
 
 typedef struct encoder_state {
   const encoder_control *encoder_control;
-  
-  int32_t lcu_offset_x;
-  int32_t lcu_offset_y;
-  
-  picture *cur_pic;
-  int32_t frame;
-  int32_t poc; /*!< \brief picture order count */
-  
-  bitstream stream;
-  
-  picture_list *ref;
-  int8_t ref_list;
-  int8_t ref_idx_num[2];
-  int8_t QP;             // \brief Quantization parameter
-  
   double cur_lambda_cost;
-  
+  bitstream stream;
   cabac_data cabac;
   
   //List of children, the last item of this list is a pseudo-encoder with encoder_control = NULL
   //Use do { } while (encoder_state->children[++i].encoder_control)
   struct encoder_state *children;
+  
+  //Tile: offset in LCU for current encoder_state
+  int32_t lcu_offset_x;
+  int32_t lcu_offset_y;
+  
+  //Current picture to encode
+  picture *cur_pic;
+  int32_t frame;
+  int32_t poc; /*!< \brief picture order count */
+  
+  //Current picture available references
+  picture_list *ref;
+  int8_t ref_list;
+  int8_t ref_idx_num[2];
+  
+  int8_t QP;             //!< \brief Quantization parameter
 } encoder_state;
 
 int encoder_control_init(encoder_control *encoder, const config *cfg);