ref: 9f9cc8fe71429fe64603d5bc60f5b6097e68baaf
parent: d8216b19b6aaf74dbed042c989ad0c1219e35b86
parent: d46ddd08395cf657d2076e9fabc35b67654108ec
author: John Koleszar <jkoleszar@google.com>
date: Thu May 3 05:40:50 EDT 2012
Merge "Add VPX_TS_ prefix to MAX_LAYERS, MAX_PERIODICITY" into eider
--- a/vp8/common/onyx.h
+++ b/vp8/common/onyx.h
@@ -207,10 +207,10 @@
// 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 */
--- a/vp8/encoder/onyx_int.h
+++ b/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 @@
// Coding layer state variables
unsigned int current_layer;
- LAYER_CONTEXT layer_context[MAX_LAYERS];
+ LAYER_CONTEXT layer_context[VPX_TS_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];
+ 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[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];
+ 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 */
--- a/vp8_scalable_patterns.c
+++ b/vp8_scalable_patterns.c
@@ -117,7 +117,7 @@
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 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;
--- a/vpx/vpx_encoder.h
+++ b/vpx/vpx_encoder.h
@@ -35,11 +35,17 @@
/*! 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
*
* \internal
@@ -613,7 +619,7 @@
*
* 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
*
@@ -620,7 +626,7 @@
* 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 @@
* 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 */
--
⑨