diff options
Diffstat (limited to 'third_party/aom/av1/encoder/firstpass.h')
| -rw-r--r-- | third_party/aom/av1/encoder/firstpass.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/third_party/aom/av1/encoder/firstpass.h b/third_party/aom/av1/encoder/firstpass.h index 9ac542bf3..4ff0f73b0 100644 --- a/third_party/aom/av1/encoder/firstpass.h +++ b/third_party/aom/av1/encoder/firstpass.h @@ -42,7 +42,6 @@ typedef struct { } FIRSTPASS_MB_STATS; #endif -#if CONFIG_EXT_REFS // Length of the bi-predictive frame group (BFG) // NOTE: Currently each BFG contains one backward ref (BWF) frame plus a certain // number of bi-predictive frames. @@ -64,7 +63,6 @@ typedef struct { #define MAX_SR_CODED_ERROR 40 #define MAX_RAW_ERR_VAR 2000 #define MIN_MV_IN_OUT 0.4 -#endif // CONFIG_EXT_REFS #define VLOW_MOTION_THRESHOLD 950 @@ -72,6 +70,7 @@ typedef struct { double frame; double weight; double intra_error; + double frame_avg_wavelet_energy; double coded_error; double sr_coded_error; double pcnt_inter; @@ -91,10 +90,8 @@ typedef struct { double new_mv_count; double duration; double count; -#if CONFIG_EXT_REFS || CONFIG_BGSPRITE // standard deviation for (0, 0) motion prediction error double raw_error_stdev; -#endif // CONFIG_EXT_REFS } FIRSTPASS_STATS; typedef enum { @@ -103,16 +100,12 @@ typedef enum { GF_UPDATE = 2, ARF_UPDATE = 3, OVERLAY_UPDATE = 4, -#if CONFIG_EXT_REFS BRF_UPDATE = 5, // Backward Reference Frame LAST_BIPRED_UPDATE = 6, // Last Bi-predictive Frame BIPRED_UPDATE = 7, // Bi-predictive Frame, but not the last one INTNL_OVERLAY_UPDATE = 8, // Internal Overlay Frame INTNL_ARF_UPDATE = 9, // Internal Altref Frame (candidate for ALTREF2) FRAME_UPDATE_TYPES = 10 -#else // !CONFIG_EXT_REFS - FRAME_UPDATE_TYPES = 5 -#endif // CONFIG_EXT_REFS } FRAME_UPDATE_TYPE; #define FC_ANIMATION_THRESH 0.15 @@ -129,13 +122,11 @@ typedef struct { unsigned char arf_src_offset[(MAX_LAG_BUFFERS * 2) + 1]; unsigned char arf_update_idx[(MAX_LAG_BUFFERS * 2) + 1]; unsigned char arf_ref_idx[(MAX_LAG_BUFFERS * 2) + 1]; -#if CONFIG_EXT_REFS unsigned char brf_src_offset[(MAX_LAG_BUFFERS * 2) + 1]; unsigned char bidir_pred_enabled[(MAX_LAG_BUFFERS * 2) + 1]; unsigned char ref_fb_idx_map[(MAX_LAG_BUFFERS * 2) + 1][REF_FRAMES]; unsigned char refresh_idx[(MAX_LAG_BUFFERS * 2) + 1]; unsigned char refresh_flag[(MAX_LAG_BUFFERS * 2) + 1]; -#endif // CONFIG_EXT_REFS int bit_allocation[(MAX_LAG_BUFFERS * 2) + 1]; } GF_GROUP; @@ -153,6 +144,7 @@ typedef struct { double modified_error_max; double modified_error_left; double mb_av_energy; + double frame_avg_haar_energy; #if CONFIG_FP_MB_STATS uint8_t *frame_mb_stats_buf; @@ -198,7 +190,6 @@ void av1_rc_get_second_pass_params(struct AV1_COMP *cpi); // Post encode update of the rate control parameters for 2-pass void av1_twopass_postencode_update(struct AV1_COMP *cpi); -#if CONFIG_EXT_REFS #if USE_GF16_MULTI_LAYER void av1_ref_frame_map_idx_updates(struct AV1_COMP *cpi, int gf_frame_index); #endif // USE_GF16_MULTI_LAYER @@ -213,7 +204,6 @@ static INLINE int get_number_of_extra_arfs(int interval, int arf_pending) { else return 0; } -#endif // CONFIG_EXT_REFS #ifdef __cplusplus } // extern "C" |