Merge "Add VPX_TS_ prefix to MAX_LAYERS, MAX_PERIODICITY" into eider

vp8/common/onyx.h

@@ -207,10 +207,10 @@ extern "C"
 
         // Temporal scaling parameters
         unsigned int number_of_layers;
-        unsigned int target_bitrate[MAX_PERIODICITY];
-        unsigned int rate_decimator[MAX_PERIODICITY];
+        unsigned int target_bitrate[VPX_TS_MAX_PERIODICITY];
+        unsigned int rate_decimator[VPX_TS_MAX_PERIODICITY];
         unsigned int periodicity;
-        unsigned int layer_id[MAX_PERIODICITY];
+        unsigned int layer_id[VPX_TS_MAX_PERIODICITY];
 
 #if CONFIG_MULTI_RES_ENCODING
         /* Number of total resolutions encoded */

vp8/encoder/onyx_int.h

@@ -57,8 +57,6 @@
 #define VP8_TEMPORAL_ALT_REF 1
 #endif
 
-#define MAX_PERIODICITY 16
-
 #define MAX(x,y) (((x)>(y))?(x):(y))
 #define MIN(x,y) (((x)<(y))?(x):(y))
 
@@ -670,21 +668,21 @@ typedef struct VP8_COMP
 
     // Coding layer state variables
     unsigned int current_layer;
-    LAYER_CONTEXT layer_context[MAX_LAYERS];
-
-    int64_t frames_in_layer[MAX_LAYERS];
-    int64_t bytes_in_layer[MAX_LAYERS];
-    double sum_psnr[MAX_LAYERS];
-    double sum_psnr_p[MAX_LAYERS];
-    double total_error2[MAX_LAYERS];
-    double total_error2_p[MAX_LAYERS];
-    double sum_ssim[MAX_LAYERS];
-    double sum_weights[MAX_LAYERS];
-
-    double total_ssimg_y_in_layer[MAX_LAYERS];
-    double total_ssimg_u_in_layer[MAX_LAYERS];
-    double total_ssimg_v_in_layer[MAX_LAYERS];
-    double total_ssimg_all_in_layer[MAX_LAYERS];
+    LAYER_CONTEXT layer_context[VPX_TS_MAX_LAYERS];
+
+    int64_t frames_in_layer[VPX_TS_MAX_LAYERS];
+    int64_t bytes_in_layer[VPX_TS_MAX_LAYERS];
+    double sum_psnr[VPX_TS_MAX_LAYERS];
+    double sum_psnr_p[VPX_TS_MAX_LAYERS];
+    double total_error2[VPX_TS_MAX_LAYERS];
+    double total_error2_p[VPX_TS_MAX_LAYERS];
+    double sum_ssim[VPX_TS_MAX_LAYERS];
+    double sum_weights[VPX_TS_MAX_LAYERS];
+
+    double total_ssimg_y_in_layer[VPX_TS_MAX_LAYERS];
+    double total_ssimg_u_in_layer[VPX_TS_MAX_LAYERS];
+    double total_ssimg_v_in_layer[VPX_TS_MAX_LAYERS];
+    double total_ssimg_all_in_layer[VPX_TS_MAX_LAYERS];
 
 #if CONFIG_MULTI_RES_ENCODING
     /* Number of MBs per row at lower-resolution level */

vp8_scalable_patterns.c

@@ -117,7 +117,7 @@ static void write_ivf_frame_header(FILE *outfile,
 static int mode_to_num_layers[9] = {2, 2, 3, 3, 3, 3, 5, 2, 3};
 
 int main(int argc, char **argv) {
-    FILE                *infile, *outfile[MAX_LAYERS];
+    FILE                *infile, *outfile[VPX_TS_MAX_LAYERS];
     vpx_codec_ctx_t      codec;
     vpx_codec_enc_cfg_t  cfg;
     int                  frame_cnt = 0;
@@ -133,8 +133,8 @@ int main(int argc, char **argv) {
     int                  frame_duration = 1;   // 1 timebase tick per frame
 
     int                  layering_mode = 0;
-    int                  frames_in_layer[MAX_LAYERS] = {0};
-    int                  layer_flags[MAX_PERIODICITY] = {0};
+    int                  frames_in_layer[VPX_TS_MAX_LAYERS] = {0};
+    int                  layer_flags[VPX_TS_MAX_PERIODICITY] = {0};
     int                  flag_periodicity;
     int                  max_intra_size_pct;
 

vpx/vpx_encoder.h

@@ -35,10 +35,16 @@ extern "C" {
 /*! Temporal Scalability: Maximum length of the sequence defining frame
  * layer membership
  */
-#define MAX_PERIODICITY 16
+#define VPX_TS_MAX_PERIODICITY 16
 
 /*! Temporal Scalability: Maximum number of coding layers */
-#define MAX_LAYERS       5
+#define VPX_TS_MAX_LAYERS       5
+
+/*!\deprecated Use #VPX_TS_MAX_PERIODICITY instead. */
+#define MAX_PERIODICITY VPX_TS_MAX_PERIODICITY
+
+/*!\deprecated Use #VPX_TS_MAX_LAYERS instead. */
+#define MAX_LAYERS      VPX_TS_MAX_LAYERS
 
     /*!\brief Current ABI version number
      *
@@ -613,14 +619,14 @@ extern "C" {
          *
          * These values specify the target coding bitrate for each coding layer.
          */
-        unsigned int           ts_target_bitrate[MAX_LAYERS];
+        unsigned int           ts_target_bitrate[VPX_TS_MAX_LAYERS];
 
         /*!\brief Frame rate decimation factor for each layer
          *
          * These values specify the frame rate decimation factors to apply
          * to each layer.
          */
-        unsigned int           ts_rate_decimator[MAX_LAYERS];
+        unsigned int           ts_rate_decimator[VPX_TS_MAX_LAYERS];
 
         /*!\brief Length of the sequence defining frame layer membership
          *
@@ -638,7 +644,7 @@ extern "C" {
          * and odd numbered frames to a second layer (1) with ts_periodicity=8,
          * then ts_layer_id = (0,1,0,1,0,1,0,1).
          */
-        unsigned int           ts_layer_id[MAX_PERIODICITY];
+        unsigned int           ts_layer_id[VPX_TS_MAX_PERIODICITY];
     } vpx_codec_enc_cfg_t; /**< alias for struct vpx_codec_enc_cfg */