From 68569dee1416593955c1570d638b3d9250b33012 Mon Sep 17 00:00:00 2001 From: trav90 Date: Mon, 15 Oct 2018 21:45:30 -0500 Subject: Import aom library This is the reference implementation for the Alliance for Open Media's av1 video code. The commit used was 4d668d7feb1f8abd809d1bca0418570a7f142a36. --- third_party/aom/av1/common/enums.h | 543 +++++++++++++++++++++++++++++++++++++ 1 file changed, 543 insertions(+) create mode 100644 third_party/aom/av1/common/enums.h (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h new file mode 100644 index 000000000..054bd40be --- /dev/null +++ b/third_party/aom/av1/common/enums.h @@ -0,0 +1,543 @@ +/* + * Copyright (c) 2016, Alliance for Open Media. All rights reserved + * + * This source code is subject to the terms of the BSD 2 Clause License and + * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License + * was not distributed with this source code in the LICENSE file, you can + * obtain it at www.aomedia.org/license/software. If the Alliance for Open + * Media Patent License 1.0 was not distributed with this source code in the + * PATENTS file, you can obtain it at www.aomedia.org/license/patent. + */ + +#ifndef AV1_COMMON_ENUMS_H_ +#define AV1_COMMON_ENUMS_H_ + +#include "./aom_config.h" +#include "aom/aom_codec.h" +#include "aom/aom_integer.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#undef MAX_SB_SIZE + +// Max superblock size +#if CONFIG_EXT_PARTITION +#define MAX_SB_SIZE_LOG2 7 +#else +#define MAX_SB_SIZE_LOG2 6 +#endif // CONFIG_EXT_PARTITION +#define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2) +#define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE) + +// Min superblock size +#define MIN_SB_SIZE_LOG2 6 + +// Pixels per Mode Info (MI) unit +#if CONFIG_CB4X4 +#define MI_SIZE_LOG2 2 +#else +#define MI_SIZE_LOG2 3 +#endif +#define MI_SIZE (1 << MI_SIZE_LOG2) + +// MI-units per max superblock (MI Block - MIB) +#define MAX_MIB_SIZE_LOG2 (MAX_SB_SIZE_LOG2 - MI_SIZE_LOG2) +#define MAX_MIB_SIZE (1 << MAX_MIB_SIZE_LOG2) + +// MI-units per min superblock +#define MIN_MIB_SIZE_LOG2 (MIN_SB_SIZE_LOG2 - MI_SIZE_LOG2) + +// Mask to extract MI offset within max MIB +#define MAX_MIB_MASK (MAX_MIB_SIZE - 1) +#define MAX_MIB_MASK_2 (MAX_MIB_SIZE * 2 - 1) + +// Maximum number of tile rows and tile columns +#if CONFIG_EXT_TILE +#define TILE_NORMAL 0 +#define TILE_VR 1 + +#define MAX_TILE_ROWS 1024 +#define MAX_TILE_COLS 1024 +#else +#define MAX_TILE_ROWS 4 +#define MAX_TILE_COLS 64 +#endif // CONFIG_EXT_TILE + +#if CONFIG_VAR_TX +#define MAX_VARTX_DEPTH 2 +#endif + +// Bitstream profiles indicated by 2-3 bits in the uncompressed header. +// 00: Profile 0. 8-bit 4:2:0 only. +// 10: Profile 1. 8-bit 4:4:4, 4:2:2, and 4:4:0. +// 01: Profile 2. 10-bit and 12-bit color only, with 4:2:0 sampling. +// 110: Profile 3. 10-bit and 12-bit color only, with 4:2:2/4:4:4/4:4:0 +// sampling. +// 111: Undefined profile. +typedef enum BITSTREAM_PROFILE { + PROFILE_0, + PROFILE_1, + PROFILE_2, + PROFILE_3, + MAX_PROFILES +} BITSTREAM_PROFILE; + +// Note: Some enums use the attribute 'packed' to use smallest possible integer +// type, so that we can save memory when they are used in structs/arrays. + +typedef enum ATTRIBUTE_PACKED { +#if CONFIG_CB4X4 + BLOCK_2X2, + BLOCK_2X4, + BLOCK_4X2, +#endif + BLOCK_4X4, + BLOCK_4X8, + BLOCK_8X4, + BLOCK_8X8, + BLOCK_8X16, + BLOCK_16X8, + BLOCK_16X16, + BLOCK_16X32, + BLOCK_32X16, + BLOCK_32X32, + BLOCK_32X64, + BLOCK_64X32, + BLOCK_64X64, +#if CONFIG_EXT_PARTITION + BLOCK_64X128, + BLOCK_128X64, + BLOCK_128X128, +#endif // CONFIG_EXT_PARTITION + BLOCK_SIZES, + BLOCK_INVALID = BLOCK_SIZES, + BLOCK_LARGEST = (BLOCK_SIZES - 1) +} BLOCK_SIZE; + +typedef enum { + PARTITION_NONE, + PARTITION_HORZ, + PARTITION_VERT, + PARTITION_SPLIT, +#if CONFIG_EXT_PARTITION_TYPES + PARTITION_HORZ_A, // HORZ split and the left partition is split again + PARTITION_HORZ_B, // HORZ split and the right partition is split again + PARTITION_VERT_A, // VERT split and the top partition is split again + PARTITION_VERT_B, // VERT split and the bottom partition is split again + EXT_PARTITION_TYPES, +#endif // CONFIG_EXT_PARTITION_TYPES + PARTITION_TYPES = PARTITION_SPLIT + 1, + PARTITION_INVALID = 255 +} PARTITION_TYPE; + +typedef char PARTITION_CONTEXT; +#define PARTITION_PLOFFSET 4 // number of probability models per block size +#define PARTITION_BLOCK_SIZES (4 + CONFIG_EXT_PARTITION) +#define PARTITION_CONTEXTS_PRIMARY (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET) +#if CONFIG_UNPOISON_PARTITION_CTX +#define PARTITION_CONTEXTS \ + (PARTITION_CONTEXTS_PRIMARY + 2 * PARTITION_BLOCK_SIZES) +#else +#define PARTITION_CONTEXTS PARTITION_CONTEXTS_PRIMARY +#endif + +// block transform size +typedef enum ATTRIBUTE_PACKED { +#if CONFIG_CB4X4 + TX_2X2, // 2x2 transform +#endif + TX_4X4, // 4x4 transform + TX_8X8, // 8x8 transform + TX_16X16, // 16x16 transform + TX_32X32, // 32x32 transform +#if CONFIG_TX64X64 + TX_64X64, // 64x64 transform +#endif // CONFIG_TX64X64 + TX_4X8, // 4x8 transform + TX_8X4, // 8x4 transform + TX_8X16, // 8x16 transform + TX_16X8, // 16x8 transform + TX_16X32, // 16x32 transform + TX_32X16, // 32x16 transform + TX_4X16, // 4x16 transform + TX_16X4, // 16x4 transform + TX_8X32, // 8x32 transform + TX_32X8, // 32x8 transform + TX_SIZES_ALL, // Includes rectangular transforms + TX_SIZES = TX_4X8, // Does NOT include rectangular transforms + TX_INVALID = 255 // Invalid transform size +} TX_SIZE; + +#define MAX_TX_DEPTH (TX_SIZES - 1 - TX_4X4) + +#define MAX_TX_SIZE_LOG2 (5 + CONFIG_TX64X64) +#define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2) +#define MIN_TX_SIZE_LOG2 2 +#define MIN_TX_SIZE (1 << MIN_TX_SIZE_LOG2) +#define MAX_TX_SQUARE (MAX_TX_SIZE * MAX_TX_SIZE) + +// Number of maxium size transform blocks in the maximum size superblock +#define MAX_TX_BLOCKS_IN_MAX_SB_LOG2 ((MAX_SB_SIZE_LOG2 - MAX_TX_SIZE_LOG2) * 2) +#define MAX_TX_BLOCKS_IN_MAX_SB (1 << MAX_TX_BLOCKS_IN_MAX_SB_LOG2) + +#define MAX_NUM_TXB (1 << (MAX_SB_SIZE_LOG2 - MIN_TX_SIZE_LOG2)) + +// frame transform mode +typedef enum { + ONLY_4X4 = 0, // only 4x4 transform used + ALLOW_8X8 = 1, // allow block transform size up to 8x8 + ALLOW_16X16 = 2, // allow block transform size up to 16x16 + ALLOW_32X32 = 3, // allow block transform size up to 32x32 +#if CONFIG_TX64X64 + ALLOW_64X64 = 4, // allow block transform size up to 64x64 +#endif + TX_MODE_SELECT, // transform specified for each block + TX_MODES, +} TX_MODE; + +// 1D tx types +typedef enum { + DCT_1D = 0, + ADST_1D = 1, + FLIPADST_1D = 2, + IDTX_1D = 3, + TX_TYPES_1D = 4, +} TX_TYPE_1D; + +typedef enum { + DCT_DCT = 0, // DCT in both horizontal and vertical + ADST_DCT = 1, // ADST in vertical, DCT in horizontal + DCT_ADST = 2, // DCT in vertical, ADST in horizontal + ADST_ADST = 3, // ADST in both directions +#if CONFIG_EXT_TX + FLIPADST_DCT = 4, + DCT_FLIPADST = 5, + FLIPADST_FLIPADST = 6, + ADST_FLIPADST = 7, + FLIPADST_ADST = 8, + IDTX = 9, + V_DCT = 10, + H_DCT = 11, + V_ADST = 12, + H_ADST = 13, + V_FLIPADST = 14, + H_FLIPADST = 15, +#endif // CONFIG_EXT_TX + TX_TYPES, +} TX_TYPE; + +typedef enum { + TILE_LEFT_BOUNDARY = 1, + TILE_RIGHT_BOUNDARY = 2, + TILE_ABOVE_BOUNDARY = 4, + TILE_BOTTOM_BOUNDARY = 8, + FRAME_LEFT_BOUNDARY = 16, + FRAME_RIGHT_BOUNDARY = 32, + FRAME_ABOVE_BOUNDARY = 64, + FRAME_BOTTOM_BOUNDARY = 128, +} BOUNDARY_TYPE; + +#if CONFIG_EXT_TX +#if CONFIG_CB4X4 +#define EXT_TX_SIZES 5 // number of sizes that use extended transforms +#else +#define EXT_TX_SIZES 4 // number of sizes that use extended transforms +#endif // CONFIG_CB4X4 +#define EXT_TX_SETS_INTER 4 // Sets of transform selections for INTER +#define EXT_TX_SETS_INTRA 3 // Sets of transform selections for INTRA +#else +#if CONFIG_CB4X4 +#define EXT_TX_SIZES 4 // number of sizes that use extended transforms +#else +#define EXT_TX_SIZES 3 // number of sizes that use extended transforms +#endif +#endif // CONFIG_EXT_TX + +typedef enum { + AOM_LAST_FLAG = 1 << 0, +#if CONFIG_EXT_REFS + AOM_LAST2_FLAG = 1 << 1, + AOM_LAST3_FLAG = 1 << 2, + AOM_GOLD_FLAG = 1 << 3, + AOM_BWD_FLAG = 1 << 4, + AOM_ALT_FLAG = 1 << 5, + AOM_REFFRAME_ALL = (1 << 6) - 1 +#else + AOM_GOLD_FLAG = 1 << 1, + AOM_ALT_FLAG = 1 << 2, + AOM_REFFRAME_ALL = (1 << 3) - 1 +#endif // CONFIG_EXT_REFS +} AOM_REFFRAME; + +typedef enum { PLANE_TYPE_Y = 0, PLANE_TYPE_UV = 1, PLANE_TYPES } PLANE_TYPE; + +#if CONFIG_CFL +typedef enum { CFL_PRED_U = 0, CFL_PRED_V = 1, CFL_PRED_PLANES } CFL_PRED_TYPE; +#endif + +#if CONFIG_PALETTE +typedef enum { + TWO_COLORS, + THREE_COLORS, + FOUR_COLORS, + FIVE_COLORS, + SIX_COLORS, + SEVEN_COLORS, + EIGHT_COLORS, + PALETTE_SIZES +} PALETTE_SIZE; + +typedef enum { + PALETTE_COLOR_ONE, + PALETTE_COLOR_TWO, + PALETTE_COLOR_THREE, + PALETTE_COLOR_FOUR, + PALETTE_COLOR_FIVE, + PALETTE_COLOR_SIX, + PALETTE_COLOR_SEVEN, + PALETTE_COLOR_EIGHT, + PALETTE_COLORS +} PALETTE_COLOR; +#endif // CONFIG_PALETTE + +typedef enum ATTRIBUTE_PACKED { + DC_PRED, // Average of above and left pixels + V_PRED, // Vertical + H_PRED, // Horizontal + D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) + D135_PRED, // Directional 135 deg = 180 - 45 + D117_PRED, // Directional 117 deg = 180 - 63 + D153_PRED, // Directional 153 deg = 180 - 27 + D207_PRED, // Directional 207 deg = 180 + 27 + D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) +#if CONFIG_ALT_INTRA + SMOOTH_PRED, // Combination of horizontal and vertical interpolation +#endif // CONFIG_ALT_INTRA + TM_PRED, // True-motion + NEARESTMV, + NEARMV, + ZEROMV, + NEWMV, +#if CONFIG_EXT_INTER +#if CONFIG_COMPOUND_SINGLEREF + // Single ref compound modes + SR_NEAREST_NEARMV, + SR_NEAREST_NEWMV, + SR_NEAR_NEWMV, + SR_ZERO_NEWMV, + SR_NEW_NEWMV, +#endif // CONFIG_COMPOUND_SINGLEREF + // Compound ref compound modes + NEAREST_NEARESTMV, + NEAREST_NEARMV, + NEAR_NEARESTMV, + NEAR_NEARMV, + NEAREST_NEWMV, + NEW_NEARESTMV, + NEAR_NEWMV, + NEW_NEARMV, + ZERO_ZEROMV, + NEW_NEWMV, +#endif // CONFIG_EXT_INTER + MB_MODE_COUNT, + INTRA_MODES = TM_PRED + 1, + INTRA_INVALID = MB_MODE_COUNT // For uv_mode in inter blocks +} PREDICTION_MODE; + +typedef enum { + SIMPLE_TRANSLATION = 0, +#if CONFIG_MOTION_VAR + OBMC_CAUSAL, // 2-sided OBMC +#endif // CONFIG_MOTION_VAR +#if CONFIG_WARPED_MOTION + WARPED_CAUSAL, // 2-sided WARPED +#endif // CONFIG_WARPED_MOTION + MOTION_MODES +} MOTION_MODE; + +// TODO(urvang): Consider adding II_SMOOTH_PRED if it's helpful. + +#if CONFIG_EXT_INTER +typedef enum { + II_DC_PRED = 0, + II_V_PRED, + II_H_PRED, + II_D45_PRED, + II_D135_PRED, + II_D117_PRED, + II_D153_PRED, + II_D207_PRED, + II_D63_PRED, + II_TM_PRED, + INTERINTRA_MODES +} INTERINTRA_MODE; + +typedef enum { + COMPOUND_AVERAGE = 0, +#if CONFIG_WEDGE + COMPOUND_WEDGE, +#endif // CONFIG_WEDGE +#if CONFIG_COMPOUND_SEGMENT + COMPOUND_SEG, +#endif // CONFIG_COMPOUND_SEGMENT + COMPOUND_TYPES, +} COMPOUND_TYPE; +#endif // CONFIG_EXT_INTER + +// TODO(huisu): Consider adding FILTER_SMOOTH_PRED to "FILTER_INTRA_MODE". +#if CONFIG_FILTER_INTRA +typedef enum { + FILTER_DC_PRED, + FILTER_V_PRED, + FILTER_H_PRED, + FILTER_D45_PRED, + FILTER_D135_PRED, + FILTER_D117_PRED, + FILTER_D153_PRED, + FILTER_D207_PRED, + FILTER_D63_PRED, + FILTER_TM_PRED, + FILTER_INTRA_MODES, +} FILTER_INTRA_MODE; +#endif // CONFIG_FILTER_INTRA + +#if CONFIG_EXT_INTRA +#define DIRECTIONAL_MODES (INTRA_MODES - 2) +#endif // CONFIG_EXT_INTRA + +#define INTER_MODES (1 + NEWMV - NEARESTMV) + +#if CONFIG_EXT_INTER +#if CONFIG_COMPOUND_SINGLEREF +#define INTER_SINGLEREF_COMP_MODES (1 + SR_NEW_NEWMV - SR_NEAREST_NEARMV) +#endif // CONFIG_COMPOUND_SINGLEREF + +#define INTER_COMPOUND_MODES (1 + NEW_NEWMV - NEAREST_NEARESTMV) +#endif // CONFIG_EXT_INTER + +#define SKIP_CONTEXTS 3 + +#if CONFIG_REF_MV +#define NMV_CONTEXTS 3 + +#define NEWMV_MODE_CONTEXTS 7 +#define ZEROMV_MODE_CONTEXTS 2 +#define REFMV_MODE_CONTEXTS 9 +#define DRL_MODE_CONTEXTS 5 + +#define ZEROMV_OFFSET 3 +#define REFMV_OFFSET 4 + +#define NEWMV_CTX_MASK ((1 << ZEROMV_OFFSET) - 1) +#define ZEROMV_CTX_MASK ((1 << (REFMV_OFFSET - ZEROMV_OFFSET)) - 1) +#define REFMV_CTX_MASK ((1 << (8 - REFMV_OFFSET)) - 1) + +#define ALL_ZERO_FLAG_OFFSET 8 +#define SKIP_NEARESTMV_OFFSET 9 +#define SKIP_NEARMV_OFFSET 10 +#define SKIP_NEARESTMV_SUB8X8_OFFSET 11 +#endif + +#define INTER_MODE_CONTEXTS 7 +#if CONFIG_DELTA_Q +#define DELTA_Q_SMALL 3 +#define DELTA_Q_PROBS (DELTA_Q_SMALL) +#define DEFAULT_DELTA_Q_RES 4 +#if CONFIG_EXT_DELTA_Q +#define DELTA_LF_SMALL 3 +#define DELTA_LF_PROBS (DELTA_LF_SMALL) +#define DEFAULT_DELTA_LF_RES 2 +#endif +#endif + +/* Segment Feature Masks */ +#define MAX_MV_REF_CANDIDATES 2 + +#if CONFIG_REF_MV +#define MAX_REF_MV_STACK_SIZE 16 +#if CONFIG_EXT_PARTITION +#define REF_CAT_LEVEL 640 +#else +#define REF_CAT_LEVEL 255 +#endif // CONFIG_EXT_PARTITION +#endif // CONFIG_REF_MV + +#define INTRA_INTER_CONTEXTS 4 +#define COMP_INTER_CONTEXTS 5 +#define REF_CONTEXTS 5 +#if CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF +#define COMP_INTER_MODE_CONTEXTS 4 +#endif // CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF + +#if CONFIG_VAR_TX +#define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 2) +typedef uint8_t TXFM_CONTEXT; +#endif + +#define NONE_FRAME -1 +#define INTRA_FRAME 0 +#define LAST_FRAME 1 + +#if CONFIG_EXT_REFS +#define LAST2_FRAME 2 +#define LAST3_FRAME 3 +#define GOLDEN_FRAME 4 +#define BWDREF_FRAME 5 +#define ALTREF_FRAME 6 +#define LAST_REF_FRAMES (LAST3_FRAME - LAST_FRAME + 1) +#else +#define GOLDEN_FRAME 2 +#define ALTREF_FRAME 3 +#endif // CONFIG_EXT_REFS + +#define INTER_REFS_PER_FRAME (ALTREF_FRAME - LAST_FRAME + 1) +#define TOTAL_REFS_PER_FRAME (ALTREF_FRAME - INTRA_FRAME + 1) + +#define FWD_REFS (GOLDEN_FRAME - LAST_FRAME + 1) +#define FWD_RF_OFFSET(ref) (ref - LAST_FRAME) +#if CONFIG_EXT_REFS +#define BWD_REFS (ALTREF_FRAME - BWDREF_FRAME + 1) +#define BWD_RF_OFFSET(ref) (ref - BWDREF_FRAME) +#else +#define BWD_REFS 1 +#define BWD_RF_OFFSET(ref) (ref - ALTREF_FRAME) +#endif // CONFIG_EXT_REFS + +#define SINGLE_REFS (FWD_REFS + BWD_REFS) +#define COMP_REFS (FWD_REFS * BWD_REFS) + +#if CONFIG_REF_MV +#define MODE_CTX_REF_FRAMES (TOTAL_REFS_PER_FRAME + COMP_REFS) +#else +#define MODE_CTX_REF_FRAMES TOTAL_REFS_PER_FRAME +#endif + +#if CONFIG_SUPERTX +#define PARTITION_SUPERTX_CONTEXTS 2 +#define MAX_SUPERTX_BLOCK_SIZE BLOCK_32X32 +#endif // CONFIG_SUPERTX + +#if CONFIG_LOOP_RESTORATION +typedef enum { + RESTORE_NONE = 0, + RESTORE_WIENER = 1, + RESTORE_SGRPROJ = 2, + RESTORE_SWITCHABLE, + RESTORE_SWITCHABLE_TYPES = RESTORE_SWITCHABLE, + RESTORE_TYPES, +} RestorationType; +#endif // CONFIG_LOOP_RESTORATION + +#if CONFIG_FRAME_SUPERRES +#define SUPERRES_SCALE_DENOMINATOR 16 +#define SUPERRES_SCALE_BITS 3 +#define SUPERRES_SCALE_NUMERATOR_MIN 8 +#endif // CONFIG_FRAME_SUPERRES + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // AV1_COMMON_ENUMS_H_ -- cgit v1.2.3 From df9477dfa60ebb5d31bc142e58ce46535c17abce Mon Sep 17 00:00:00 2001 From: trav90 Date: Wed, 17 Oct 2018 05:59:08 -0500 Subject: Update aom to slightly newer commit ID --- third_party/aom/av1/common/enums.h | 66 +++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 29 deletions(-) (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h index 054bd40be..0cce8f0ee 100644 --- a/third_party/aom/av1/common/enums.h +++ b/third_party/aom/av1/common/enums.h @@ -51,7 +51,6 @@ extern "C" { // Mask to extract MI offset within max MIB #define MAX_MIB_MASK (MAX_MIB_SIZE - 1) -#define MAX_MIB_MASK_2 (MAX_MIB_SIZE * 2 - 1) // Maximum number of tile rows and tile columns #if CONFIG_EXT_TILE @@ -111,8 +110,13 @@ typedef enum ATTRIBUTE_PACKED { BLOCK_128X64, BLOCK_128X128, #endif // CONFIG_EXT_PARTITION - BLOCK_SIZES, - BLOCK_INVALID = BLOCK_SIZES, + BLOCK_4X16, + BLOCK_16X4, + BLOCK_8X32, + BLOCK_32X8, + BLOCK_SIZES_ALL, + BLOCK_SIZES = BLOCK_4X16, + BLOCK_INVALID = 255, BLOCK_LARGEST = (BLOCK_SIZES - 1) } BLOCK_SIZE; @@ -145,7 +149,7 @@ typedef char PARTITION_CONTEXT; // block transform size typedef enum ATTRIBUTE_PACKED { -#if CONFIG_CB4X4 +#if CONFIG_CHROMA_2X2 TX_2X2, // 2x2 transform #endif TX_4X4, // 4x4 transform @@ -170,7 +174,12 @@ typedef enum ATTRIBUTE_PACKED { TX_INVALID = 255 // Invalid transform size } TX_SIZE; -#define MAX_TX_DEPTH (TX_SIZES - 1 - TX_4X4) +#define TX_SIZE_LUMA_MIN (TX_4X4) +/* We don't need to code a transform size unless the allowed size is at least + one more than the minimum. */ +#define TX_SIZE_CTX_MIN (TX_SIZE_LUMA_MIN + 1) + +#define MAX_TX_DEPTH (TX_SIZES - TX_SIZE_CTX_MIN) #define MAX_TX_SIZE_LOG2 (5 + CONFIG_TX64X64) #define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2) @@ -240,15 +249,15 @@ typedef enum { } BOUNDARY_TYPE; #if CONFIG_EXT_TX -#if CONFIG_CB4X4 +#if CONFIG_CHROMA_2X2 #define EXT_TX_SIZES 5 // number of sizes that use extended transforms #else #define EXT_TX_SIZES 4 // number of sizes that use extended transforms -#endif // CONFIG_CB4X4 +#endif // CONFIG_CHROMA_2X2 #define EXT_TX_SETS_INTER 4 // Sets of transform selections for INTER #define EXT_TX_SETS_INTRA 3 // Sets of transform selections for INTRA #else -#if CONFIG_CB4X4 +#if CONFIG_CHROMA_2X2 #define EXT_TX_SIZES 4 // number of sizes that use extended transforms #else #define EXT_TX_SIZES 3 // number of sizes that use extended transforms @@ -274,7 +283,14 @@ typedef enum { typedef enum { PLANE_TYPE_Y = 0, PLANE_TYPE_UV = 1, PLANE_TYPES } PLANE_TYPE; #if CONFIG_CFL +// TODO(ltrudeau) this should change based on QP size +#define CB_ALPHABET_SIZE 4 +#define CR_ALPHABET_SIZE 4 +#define CFL_ALPHABET_SIZE (CB_ALPHABET_SIZE * CR_ALPHABET_SIZE) +#define CFL_MAGS_SIZE 7 + typedef enum { CFL_PRED_U = 0, CFL_PRED_V = 1, CFL_PRED_PLANES } CFL_PRED_TYPE; +typedef enum { CFL_SIGN_NEG = 0, CFL_SIGN_POS = 1, CFL_SIGNS } CFL_SIGN_TYPE; #endif #if CONFIG_PALETTE @@ -314,8 +330,12 @@ typedef enum ATTRIBUTE_PACKED { D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) #if CONFIG_ALT_INTRA SMOOTH_PRED, // Combination of horizontal and vertical interpolation -#endif // CONFIG_ALT_INTRA - TM_PRED, // True-motion +#if CONFIG_SMOOTH_HV + SMOOTH_V_PRED, // Vertical interpolation + SMOOTH_H_PRED, // Horizontal interpolation +#endif // CONFIG_SMOOTH_HV +#endif // CONFIG_ALT_INTRA + TM_PRED, // True-motion NEARESTMV, NEARMV, ZEROMV, @@ -331,8 +351,6 @@ typedef enum ATTRIBUTE_PACKED { #endif // CONFIG_COMPOUND_SINGLEREF // Compound ref compound modes NEAREST_NEARESTMV, - NEAREST_NEARMV, - NEAR_NEARESTMV, NEAR_NEARMV, NEAREST_NEWMV, NEW_NEARESTMV, @@ -357,22 +375,20 @@ typedef enum { MOTION_MODES } MOTION_MODE; -// TODO(urvang): Consider adding II_SMOOTH_PRED if it's helpful. - #if CONFIG_EXT_INTER +#if CONFIG_INTERINTRA typedef enum { II_DC_PRED = 0, II_V_PRED, II_H_PRED, - II_D45_PRED, - II_D135_PRED, - II_D117_PRED, - II_D153_PRED, - II_D207_PRED, - II_D63_PRED, +#if CONFIG_ALT_INTRA + II_SMOOTH_PRED, +#else II_TM_PRED, +#endif // CONFIG_ALT_INTRA INTERINTRA_MODES } INTERINTRA_MODE; +#endif typedef enum { COMPOUND_AVERAGE = 0, @@ -404,7 +420,7 @@ typedef enum { #endif // CONFIG_FILTER_INTRA #if CONFIG_EXT_INTRA -#define DIRECTIONAL_MODES (INTRA_MODES - 2) +#define DIRECTIONAL_MODES 8 #endif // CONFIG_EXT_INTRA #define INTER_MODES (1 + NEWMV - NEARESTMV) @@ -419,7 +435,6 @@ typedef enum { #define SKIP_CONTEXTS 3 -#if CONFIG_REF_MV #define NMV_CONTEXTS 3 #define NEWMV_MODE_CONTEXTS 7 @@ -438,7 +453,6 @@ typedef enum { #define SKIP_NEARESTMV_OFFSET 9 #define SKIP_NEARMV_OFFSET 10 #define SKIP_NEARESTMV_SUB8X8_OFFSET 11 -#endif #define INTER_MODE_CONTEXTS 7 #if CONFIG_DELTA_Q @@ -455,14 +469,12 @@ typedef enum { /* Segment Feature Masks */ #define MAX_MV_REF_CANDIDATES 2 -#if CONFIG_REF_MV #define MAX_REF_MV_STACK_SIZE 16 #if CONFIG_EXT_PARTITION #define REF_CAT_LEVEL 640 #else #define REF_CAT_LEVEL 255 #endif // CONFIG_EXT_PARTITION -#endif // CONFIG_REF_MV #define INTRA_INTER_CONTEXTS 4 #define COMP_INTER_CONTEXTS 5 @@ -508,11 +520,7 @@ typedef uint8_t TXFM_CONTEXT; #define SINGLE_REFS (FWD_REFS + BWD_REFS) #define COMP_REFS (FWD_REFS * BWD_REFS) -#if CONFIG_REF_MV #define MODE_CTX_REF_FRAMES (TOTAL_REFS_PER_FRAME + COMP_REFS) -#else -#define MODE_CTX_REF_FRAMES TOTAL_REFS_PER_FRAME -#endif #if CONFIG_SUPERTX #define PARTITION_SUPERTX_CONTEXTS 2 -- cgit v1.2.3 From 7369c7d7a5eed32963d8af37658286617919f91c Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 06:04:57 -0500 Subject: Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918 --- third_party/aom/av1/common/enums.h | 156 ++++++++++++++++++++++++++++++++++--- 1 file changed, 145 insertions(+), 11 deletions(-) (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h index 0cce8f0ee..2b18d32a9 100644 --- a/third_party/aom/av1/common/enums.h +++ b/third_party/aom/av1/common/enums.h @@ -54,9 +54,6 @@ extern "C" { // Maximum number of tile rows and tile columns #if CONFIG_EXT_TILE -#define TILE_NORMAL 0 -#define TILE_VR 1 - #define MAX_TILE_ROWS 1024 #define MAX_TILE_COLS 1024 #else @@ -68,6 +65,8 @@ extern "C" { #define MAX_VARTX_DEPTH 2 #endif +#define MI_SIZE_64X64 (64 >> MI_SIZE_LOG2) + // Bitstream profiles indicated by 2-3 bits in the uncompressed header. // 00: Profile 0. 8-bit 4:2:0 only. // 10: Profile 1. 8-bit 4:4:4, 4:2:2, and 4:4:0. @@ -87,7 +86,7 @@ typedef enum BITSTREAM_PROFILE { // type, so that we can save memory when they are used in structs/arrays. typedef enum ATTRIBUTE_PACKED { -#if CONFIG_CB4X4 +#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 BLOCK_2X2, BLOCK_2X4, BLOCK_4X2, @@ -130,6 +129,8 @@ typedef enum { PARTITION_HORZ_B, // HORZ split and the right partition is split again PARTITION_VERT_A, // VERT split and the top partition is split again PARTITION_VERT_B, // VERT split and the bottom partition is split again + PARTITION_HORZ_4, // 4:1 horizontal partition + PARTITION_VERT_4, // 4:1 vertical partition EXT_PARTITION_TYPES, #endif // CONFIG_EXT_PARTITION_TYPES PARTITION_TYPES = PARTITION_SPLIT + 1, @@ -193,6 +194,22 @@ typedef enum ATTRIBUTE_PACKED { #define MAX_NUM_TXB (1 << (MAX_SB_SIZE_LOG2 - MIN_TX_SIZE_LOG2)) +#if CONFIG_NCOBMC_ADAPT_WEIGHT && CONFIG_MOTION_VAR +typedef enum ATTRIBUTE_PACKED { + NO_OVERLAP, + NCOBMC_MODE_1, + NCOBMC_MODE_2, + NCOBMC_MODE_3, + NCOBMC_MODE_4, + NCOBMC_MODE_5, + NCOBMC_MODE_6, + NCOBMC_MODE_7, + NCOBMC_MODE_8, + MAX_NCOBMC_MODES +} NCOBMC_MODE; +// #define MAX_INTRPL_MODES 9 +#endif + // frame transform mode typedef enum { ONLY_4X4 = 0, // only 4x4 transform used @@ -212,6 +229,8 @@ typedef enum { ADST_1D = 1, FLIPADST_1D = 2, IDTX_1D = 3, + // TODO(sarahparker) need to eventually put something here for the + // mrc experiment to make this work with the ext-tx pruning functions TX_TYPES_1D = 4, } TX_TYPE_1D; @@ -234,9 +253,18 @@ typedef enum { V_FLIPADST = 14, H_FLIPADST = 15, #endif // CONFIG_EXT_TX +#if CONFIG_MRC_TX + MRC_DCT, // DCT in both directions with mrc based bitmask +#endif // CONFIG_MRC_TX TX_TYPES, } TX_TYPE; +#if CONFIG_EXT_TX +#define IS_2D_TRANSFORM(tx_type) (tx_type < IDTX) +#else +#define IS_2D_TRANSFORM(tx_type) 1 +#endif + typedef enum { TILE_LEFT_BOUNDARY = 1, TILE_RIGHT_BOUNDARY = 2, @@ -252,10 +280,15 @@ typedef enum { #if CONFIG_CHROMA_2X2 #define EXT_TX_SIZES 5 // number of sizes that use extended transforms #else -#define EXT_TX_SIZES 4 // number of sizes that use extended transforms -#endif // CONFIG_CHROMA_2X2 +#define EXT_TX_SIZES 4 // number of sizes that use extended transforms +#endif // CONFIG_CHROMA_2X2 +#if CONFIG_MRC_TX +#define EXT_TX_SETS_INTER 5 // Sets of transform selections for INTER +#define EXT_TX_SETS_INTRA 4 // Sets of transform selections for INTRA +#else // CONFIG_MRC_TX #define EXT_TX_SETS_INTER 4 // Sets of transform selections for INTER #define EXT_TX_SETS_INTRA 3 // Sets of transform selections for INTRA +#endif // CONFIG_MRC_TX #else #if CONFIG_CHROMA_2X2 #define EXT_TX_SIZES 4 // number of sizes that use extended transforms @@ -271,15 +304,33 @@ typedef enum { AOM_LAST3_FLAG = 1 << 2, AOM_GOLD_FLAG = 1 << 3, AOM_BWD_FLAG = 1 << 4, +#if CONFIG_ALTREF2 + AOM_ALT2_FLAG = 1 << 5, + AOM_ALT_FLAG = 1 << 6, + AOM_REFFRAME_ALL = (1 << 7) - 1 +#else // !CONFIG_ALTREF2 AOM_ALT_FLAG = 1 << 5, AOM_REFFRAME_ALL = (1 << 6) - 1 -#else +#endif // CONFIG_ALTREF2 +#else // !CONFIG_EXT_REFS AOM_GOLD_FLAG = 1 << 1, AOM_ALT_FLAG = 1 << 2, AOM_REFFRAME_ALL = (1 << 3) - 1 #endif // CONFIG_EXT_REFS } AOM_REFFRAME; +#if CONFIG_EXT_COMP_REFS +#define USE_UNI_COMP_REFS 1 + +typedef enum { + UNIDIR_COMP_REFERENCE = 0, + BIDIR_COMP_REFERENCE = 1, + COMP_REFERENCE_TYPES = 2, +} COMP_REFERENCE_TYPE; +#else // !CONFIG_EXT_COMP_REFS +#define USE_UNI_COMP_REFS 0 +#endif // CONFIG_EXT_COMP_REFS + typedef enum { PLANE_TYPE_Y = 0, PLANE_TYPE_UV = 1, PLANE_TYPES } PLANE_TYPE; #if CONFIG_CFL @@ -318,6 +369,8 @@ typedef enum { } PALETTE_COLOR; #endif // CONFIG_PALETTE +// Note: All directional predictors must be between V_PRED and D63_PRED (both +// inclusive). typedef enum ATTRIBUTE_PACKED { DC_PRED, // Average of above and left pixels V_PRED, // Vertical @@ -344,7 +397,7 @@ typedef enum ATTRIBUTE_PACKED { #if CONFIG_COMPOUND_SINGLEREF // Single ref compound modes SR_NEAREST_NEARMV, - SR_NEAREST_NEWMV, + // SR_NEAREST_NEWMV, SR_NEAR_NEWMV, SR_ZERO_NEWMV, SR_NEW_NEWMV, @@ -360,10 +413,41 @@ typedef enum ATTRIBUTE_PACKED { NEW_NEWMV, #endif // CONFIG_EXT_INTER MB_MODE_COUNT, - INTRA_MODES = TM_PRED + 1, + INTRA_MODES = TM_PRED + 1, // TM_PRED has to be the last intra mode. INTRA_INVALID = MB_MODE_COUNT // For uv_mode in inter blocks } PREDICTION_MODE; +#if CONFIG_CFL +// TODO(ltrudeau) Do we really want to pack this? +// TODO(ltrudeau) Do we match with PREDICTION_MODE? +typedef enum ATTRIBUTE_PACKED { + UV_DC_PRED, // Average of above and left pixels + UV_V_PRED, // Vertical + UV_H_PRED, // Horizontal + UV_D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) + UV_D135_PRED, // Directional 135 deg = 180 - 45 + UV_D117_PRED, // Directional 117 deg = 180 - 63 + UV_D153_PRED, // Directional 153 deg = 180 - 27 + UV_D207_PRED, // Directional 207 deg = 180 + 27 + UV_D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) +#if CONFIG_ALT_INTRA + UV_SMOOTH_PRED, // Combination of horizontal and vertical interpolation +#if CONFIG_SMOOTH_HV + UV_SMOOTH_V_PRED, // Vertical interpolation + UV_SMOOTH_H_PRED, // Horizontal interpolation +#endif // CONFIG_SMOOTH_HV +#endif // CONFIG_ALT_INTRA + UV_TM_PRED, // True-motion + UV_INTRA_MODES, + UV_MODE_INVALID, // For uv_mode in inter blocks +} UV_PREDICTION_MODE; +#else +#define UV_INTRA_MODES (INTRA_MODES) +#define UV_PREDICTION_MODE PREDICTION_MODE +#define UV_DC_PRED (DC_PRED) +#define UV_MODE_INVALID (INTRA_INVALID) +#endif // CONFIG_CFL + typedef enum { SIMPLE_TRANSLATION = 0, #if CONFIG_MOTION_VAR @@ -372,9 +456,23 @@ typedef enum { #if CONFIG_WARPED_MOTION WARPED_CAUSAL, // 2-sided WARPED #endif // CONFIG_WARPED_MOTION +#if CONFIG_NCOBMC_ADAPT_WEIGHT + NCOBMC_ADAPT_WEIGHT, +#endif MOTION_MODES } MOTION_MODE; +#if CONFIG_NCOBMC_ADAPT_WEIGHT +typedef enum { + ADAPT_OVERLAP_BLOCK_8X8, + ADAPT_OVERLAP_BLOCK_16X16, + ADAPT_OVERLAP_BLOCK_32X32, + ADAPT_OVERLAP_BLOCK_64X64, + ADAPT_OVERLAP_BLOCKS, + ADAPT_OVERLAP_BLOCK_INVALID = 255 +} ADAPT_OVERLAP_BLOCK; +#endif + #if CONFIG_EXT_INTER #if CONFIG_INTERINTRA typedef enum { @@ -479,6 +577,12 @@ typedef enum { #define INTRA_INTER_CONTEXTS 4 #define COMP_INTER_CONTEXTS 5 #define REF_CONTEXTS 5 + +#if CONFIG_EXT_COMP_REFS +#define COMP_REF_TYPE_CONTEXTS 5 +#define UNI_COMP_REF_CONTEXTS 3 +#endif // CONFIG_EXT_COMP_REFS + #if CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF #define COMP_INTER_MODE_CONTEXTS 4 #endif // CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF @@ -497,9 +601,16 @@ typedef uint8_t TXFM_CONTEXT; #define LAST3_FRAME 3 #define GOLDEN_FRAME 4 #define BWDREF_FRAME 5 + +#if CONFIG_ALTREF2 +#define ALTREF2_FRAME 6 +#define ALTREF_FRAME 7 +#else // !CONFIG_ALTREF2 #define ALTREF_FRAME 6 +#endif // CONFIG_ALTREF2 + #define LAST_REF_FRAMES (LAST3_FRAME - LAST_FRAME + 1) -#else +#else // !CONFIG_EXT_REFS #define GOLDEN_FRAME 2 #define ALTREF_FRAME 3 #endif // CONFIG_EXT_REFS @@ -518,7 +629,18 @@ typedef uint8_t TXFM_CONTEXT; #endif // CONFIG_EXT_REFS #define SINGLE_REFS (FWD_REFS + BWD_REFS) +#if CONFIG_EXT_COMP_REFS +typedef enum { + LAST_LAST2_FRAMES, // { LAST_FRAME, LAST2_FRAME } + LAST_LAST3_FRAMES, // { LAST_FRAME, LAST3_FRAME } + LAST_GOLDEN_FRAMES, // { LAST_FRAME, GOLDEN_FRAME } + BWDREF_ALTREF_FRAMES, // { BWDREF_FRAME, ALTREF_FRAME } + UNIDIR_COMP_REFS +} UNIDIR_COMP_REF; +#define COMP_REFS (FWD_REFS * BWD_REFS + UNIDIR_COMP_REFS) +#else // !CONFIG_EXT_COMP_REFS #define COMP_REFS (FWD_REFS * BWD_REFS) +#endif // CONFIG_EXT_COMP_REFS #define MODE_CTX_REF_FRAMES (TOTAL_REFS_PER_FRAME + COMP_REFS) @@ -539,11 +661,23 @@ typedef enum { #endif // CONFIG_LOOP_RESTORATION #if CONFIG_FRAME_SUPERRES -#define SUPERRES_SCALE_DENOMINATOR 16 #define SUPERRES_SCALE_BITS 3 #define SUPERRES_SCALE_NUMERATOR_MIN 8 #endif // CONFIG_FRAME_SUPERRES +#if CONFIG_LPF_DIRECT +typedef enum { + VERT_HORZ, + DEGREE_30, + DEGREE_45, + DEGREE_60, + DEGREE_120, + DEGREE_135, + DEGREE_150, + FILTER_DEGREES, +} FILTER_DEGREE; +#endif // CONFIG_LPF_DIRECT + #ifdef __cplusplus } // extern "C" #endif -- cgit v1.2.3 From ec910d81405c736a4490383a250299a7837c2e64 Mon Sep 17 00:00:00 2001 From: trav90 Date: Thu, 18 Oct 2018 21:53:44 -0500 Subject: Update aom to commit id e87fb2378f01103d5d6e477a4ef6892dc714e614 --- third_party/aom/av1/common/enums.h | 358 ++++++++++++++++++++++++------------- 1 file changed, 230 insertions(+), 128 deletions(-) (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h index 2b18d32a9..e8c4003cc 100644 --- a/third_party/aom/av1/common/enums.h +++ b/third_party/aom/av1/common/enums.h @@ -22,6 +22,16 @@ extern "C" { #undef MAX_SB_SIZE +#if CONFIG_NCOBMC_ADAPT_WEIGHT +#define TWO_MODE +#endif + +#if CONFIG_NCOBMC || CONFIG_NCOBMC_ADAPT_WEIGHT +#define NC_MODE_INFO 1 +#else +#define NC_MODE_INFO 0 +#endif + // Max superblock size #if CONFIG_EXT_PARTITION #define MAX_SB_SIZE_LOG2 7 @@ -57,16 +67,45 @@ extern "C" { #define MAX_TILE_ROWS 1024 #define MAX_TILE_COLS 1024 #else +#if CONFIG_MAX_TILE +#define MAX_TILE_ROWS 64 +#define MAX_TILE_COLS 64 +#else #define MAX_TILE_ROWS 4 #define MAX_TILE_COLS 64 +#endif #endif // CONFIG_EXT_TILE #if CONFIG_VAR_TX #define MAX_VARTX_DEPTH 2 +#define SQR_VARTX_DEPTH_INIT 0 +#define RECT_VARTX_DEPTH_INIT 0 #endif #define MI_SIZE_64X64 (64 >> MI_SIZE_LOG2) +#if CONFIG_LOOPFILTER_LEVEL +// 4 frame filter levels: y plane vertical, y plane horizontal, +// u plane, and v plane +#define FRAME_LF_COUNT 4 +#define DEFAULT_DELTA_LF_MULTI 0 +#endif // CONFIG_LOOPFILTER_LEVEL + +#if CONFIG_LPF_SB +#define LPF_DELTA_BITS 3 +#define LPF_STEP 2 +#define DELTA_RANGE (1 << LPF_DELTA_BITS) +#define MAX_LPF_OFFSET (LPF_STEP * ((1 << LPF_DELTA_BITS) - 1)) + +#define LPF_REUSE_CONTEXT 2 +#define LPF_DELTA_CONTEXT DELTA_RANGE +#define LPF_SIGN_CONTEXT 2 + +// Half of maximum loop filter length (15-tap) +#define FILT_BOUNDARY_OFFSET 8 +#define FILT_BOUNDARY_MI_OFFSET (FILT_BOUNDARY_OFFSET >> MI_SIZE_LOG2) +#endif // CONFIG_LPF_SB + // Bitstream profiles indicated by 2-3 bits in the uncompressed header. // 00: Profile 0. 8-bit 4:2:0 only. // 10: Profile 1. 8-bit 4:4:4, 4:2:2, and 4:4:0. @@ -113,6 +152,12 @@ typedef enum ATTRIBUTE_PACKED { BLOCK_16X4, BLOCK_8X32, BLOCK_32X8, + BLOCK_16X64, + BLOCK_64X16, +#if CONFIG_EXT_PARTITION + BLOCK_32X128, + BLOCK_128X32, +#endif // CONFIG_EXT_PARTITION BLOCK_SIZES_ALL, BLOCK_SIZES = BLOCK_4X16, BLOCK_INVALID = 255, @@ -125,10 +170,10 @@ typedef enum { PARTITION_VERT, PARTITION_SPLIT, #if CONFIG_EXT_PARTITION_TYPES - PARTITION_HORZ_A, // HORZ split and the left partition is split again - PARTITION_HORZ_B, // HORZ split and the right partition is split again - PARTITION_VERT_A, // VERT split and the top partition is split again - PARTITION_VERT_B, // VERT split and the bottom partition is split again + PARTITION_HORZ_A, // HORZ split and the top partition is split again + PARTITION_HORZ_B, // HORZ split and the bottom partition is split again + PARTITION_VERT_A, // VERT split and the left partition is split again + PARTITION_VERT_B, // VERT split and the right partition is split again PARTITION_HORZ_4, // 4:1 horizontal partition PARTITION_VERT_4, // 4:1 vertical partition EXT_PARTITION_TYPES, @@ -142,6 +187,7 @@ typedef char PARTITION_CONTEXT; #define PARTITION_BLOCK_SIZES (4 + CONFIG_EXT_PARTITION) #define PARTITION_CONTEXTS_PRIMARY (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET) #if CONFIG_UNPOISON_PARTITION_CTX +#define INVALID_PARTITION_CTX (-1) #define PARTITION_CONTEXTS \ (PARTITION_CONTEXTS_PRIMARY + 2 * PARTITION_BLOCK_SIZES) #else @@ -158,14 +204,18 @@ typedef enum ATTRIBUTE_PACKED { TX_16X16, // 16x16 transform TX_32X32, // 32x32 transform #if CONFIG_TX64X64 - TX_64X64, // 64x64 transform + TX_64X64, // 64x64 transform +#endif // CONFIG_TX64X64 + TX_4X8, // 4x8 transform + TX_8X4, // 8x4 transform + TX_8X16, // 8x16 transform + TX_16X8, // 16x8 transform + TX_16X32, // 16x32 transform + TX_32X16, // 32x16 transform +#if CONFIG_TX64X64 + TX_32X64, // 32x64 transform + TX_64X32, // 64x32 transform #endif // CONFIG_TX64X64 - TX_4X8, // 4x8 transform - TX_8X4, // 8x4 transform - TX_8X16, // 8x16 transform - TX_16X8, // 16x8 transform - TX_16X32, // 16x32 transform - TX_32X16, // 32x16 transform TX_4X16, // 4x16 transform TX_16X4, // 16x4 transform TX_8X32, // 8x32 transform @@ -182,6 +232,10 @@ typedef enum ATTRIBUTE_PACKED { #define MAX_TX_DEPTH (TX_SIZES - TX_SIZE_CTX_MIN) +#if CONFIG_CTX1D +#define MAX_HVTX_SIZE (1 << 5) +#endif // CONFIG_CTX1D + #define MAX_TX_SIZE_LOG2 (5 + CONFIG_TX64X64) #define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2) #define MIN_TX_SIZE_LOG2 2 @@ -192,11 +246,9 @@ typedef enum ATTRIBUTE_PACKED { #define MAX_TX_BLOCKS_IN_MAX_SB_LOG2 ((MAX_SB_SIZE_LOG2 - MAX_TX_SIZE_LOG2) * 2) #define MAX_TX_BLOCKS_IN_MAX_SB (1 << MAX_TX_BLOCKS_IN_MAX_SB_LOG2) -#define MAX_NUM_TXB (1 << (MAX_SB_SIZE_LOG2 - MIN_TX_SIZE_LOG2)) - -#if CONFIG_NCOBMC_ADAPT_WEIGHT && CONFIG_MOTION_VAR +#if CONFIG_NCOBMC_ADAPT_WEIGHT typedef enum ATTRIBUTE_PACKED { - NO_OVERLAP, + NCOBMC_MODE_0, NCOBMC_MODE_1, NCOBMC_MODE_2, NCOBMC_MODE_3, @@ -204,20 +256,33 @@ typedef enum ATTRIBUTE_PACKED { NCOBMC_MODE_5, NCOBMC_MODE_6, NCOBMC_MODE_7, - NCOBMC_MODE_8, - MAX_NCOBMC_MODES -} NCOBMC_MODE; -// #define MAX_INTRPL_MODES 9 + ALL_NCOBMC_MODES, +#ifdef TWO_MODE + MAX_NCOBMC_MODES = NCOBMC_MODE_1 + 1, +#else + MAX_NCOBMC_MODES = ALL_NCOBMC_MODES, #endif + NO_OVERLAP = MAX_NCOBMC_MODES + 1 +} NCOBMC_MODE; + +typedef enum { + ADAPT_OVERLAP_BLOCK_8X8, + ADAPT_OVERLAP_BLOCK_16X16, + ADAPT_OVERLAP_BLOCK_32X32, + ADAPT_OVERLAP_BLOCK_64X64, + ADAPT_OVERLAP_BLOCKS, + ADAPT_OVERLAP_BLOCK_INVALID = 255 +} ADAPT_OVERLAP_BLOCK; +#endif // CONFIG_NCOBMC_ADAPT_WEIGHT // frame transform mode typedef enum { - ONLY_4X4 = 0, // only 4x4 transform used - ALLOW_8X8 = 1, // allow block transform size up to 8x8 - ALLOW_16X16 = 2, // allow block transform size up to 16x16 - ALLOW_32X32 = 3, // allow block transform size up to 32x32 + ONLY_4X4, // only 4x4 transform used + ALLOW_8X8, // allow block transform size up to 8x8 + ALLOW_16X16, // allow block transform size up to 16x16 + ALLOW_32X32, // allow block transform size up to 32x32 #if CONFIG_TX64X64 - ALLOW_64X64 = 4, // allow block transform size up to 64x64 + ALLOW_64X64, // allow block transform size up to 64x64 #endif TX_MODE_SELECT, // transform specified for each block TX_MODES, @@ -225,33 +290,33 @@ typedef enum { // 1D tx types typedef enum { - DCT_1D = 0, - ADST_1D = 1, - FLIPADST_1D = 2, - IDTX_1D = 3, + DCT_1D, + ADST_1D, + FLIPADST_1D, + IDTX_1D, // TODO(sarahparker) need to eventually put something here for the // mrc experiment to make this work with the ext-tx pruning functions - TX_TYPES_1D = 4, + TX_TYPES_1D, } TX_TYPE_1D; typedef enum { - DCT_DCT = 0, // DCT in both horizontal and vertical - ADST_DCT = 1, // ADST in vertical, DCT in horizontal - DCT_ADST = 2, // DCT in vertical, ADST in horizontal - ADST_ADST = 3, // ADST in both directions + DCT_DCT, // DCT in both horizontal and vertical + ADST_DCT, // ADST in vertical, DCT in horizontal + DCT_ADST, // DCT in vertical, ADST in horizontal + ADST_ADST, // ADST in both directions #if CONFIG_EXT_TX - FLIPADST_DCT = 4, - DCT_FLIPADST = 5, - FLIPADST_FLIPADST = 6, - ADST_FLIPADST = 7, - FLIPADST_ADST = 8, - IDTX = 9, - V_DCT = 10, - H_DCT = 11, - V_ADST = 12, - H_ADST = 13, - V_FLIPADST = 14, - H_FLIPADST = 15, + FLIPADST_DCT, + DCT_FLIPADST, + FLIPADST_FLIPADST, + ADST_FLIPADST, + FLIPADST_ADST, + IDTX, + V_DCT, + H_DCT, + V_ADST, + H_ADST, + V_FLIPADST, + H_FLIPADST, #endif // CONFIG_EXT_TX #if CONFIG_MRC_TX MRC_DCT, // DCT in both directions with mrc based bitmask @@ -260,6 +325,28 @@ typedef enum { } TX_TYPE; #if CONFIG_EXT_TX +typedef enum { + // DCT only + EXT_TX_SET_DCTONLY, + // DCT + Identity only + EXT_TX_SET_DCT_IDTX, +#if CONFIG_MRC_TX + // DCT + MRC_DCT + EXT_TX_SET_MRC_DCT, + // DCT + MRC_DCT + IDTX + EXT_TX_SET_MRC_DCT_IDTX, +#endif // CONFIG_MRC_TX + // Discrete Trig transforms w/o flip (4) + Identity (1) + EXT_TX_SET_DTT4_IDTX, + // Discrete Trig transforms w/o flip (4) + Identity (1) + 1D Hor/vert DCT (2) + EXT_TX_SET_DTT4_IDTX_1DDCT, + // Discrete Trig transforms w/ flip (9) + Identity (1) + 1D Hor/Ver DCT (2) + EXT_TX_SET_DTT9_IDTX_1DDCT, + // Discrete Trig transforms w/ flip (9) + Identity (1) + 1D Hor/Ver (6) + EXT_TX_SET_ALL16, + EXT_TX_SET_TYPES +} TxSetType; + #define IS_2D_TRANSFORM(tx_type) (tx_type < IDTX) #else #define IS_2D_TRANSFORM(tx_type) 1 @@ -304,14 +391,9 @@ typedef enum { AOM_LAST3_FLAG = 1 << 2, AOM_GOLD_FLAG = 1 << 3, AOM_BWD_FLAG = 1 << 4, -#if CONFIG_ALTREF2 AOM_ALT2_FLAG = 1 << 5, AOM_ALT_FLAG = 1 << 6, AOM_REFFRAME_ALL = (1 << 7) - 1 -#else // !CONFIG_ALTREF2 - AOM_ALT_FLAG = 1 << 5, - AOM_REFFRAME_ALL = (1 << 6) - 1 -#endif // CONFIG_ALTREF2 #else // !CONFIG_EXT_REFS AOM_GOLD_FLAG = 1 << 1, AOM_ALT_FLAG = 1 << 2, @@ -323,28 +405,56 @@ typedef enum { #define USE_UNI_COMP_REFS 1 typedef enum { - UNIDIR_COMP_REFERENCE = 0, - BIDIR_COMP_REFERENCE = 1, - COMP_REFERENCE_TYPES = 2, + UNIDIR_COMP_REFERENCE, + BIDIR_COMP_REFERENCE, + COMP_REFERENCE_TYPES, } COMP_REFERENCE_TYPE; #else // !CONFIG_EXT_COMP_REFS #define USE_UNI_COMP_REFS 0 #endif // CONFIG_EXT_COMP_REFS -typedef enum { PLANE_TYPE_Y = 0, PLANE_TYPE_UV = 1, PLANE_TYPES } PLANE_TYPE; +typedef enum { PLANE_TYPE_Y, PLANE_TYPE_UV, PLANE_TYPES } PLANE_TYPE; #if CONFIG_CFL -// TODO(ltrudeau) this should change based on QP size -#define CB_ALPHABET_SIZE 4 -#define CR_ALPHABET_SIZE 4 -#define CFL_ALPHABET_SIZE (CB_ALPHABET_SIZE * CR_ALPHABET_SIZE) -#define CFL_MAGS_SIZE 7 - -typedef enum { CFL_PRED_U = 0, CFL_PRED_V = 1, CFL_PRED_PLANES } CFL_PRED_TYPE; -typedef enum { CFL_SIGN_NEG = 0, CFL_SIGN_POS = 1, CFL_SIGNS } CFL_SIGN_TYPE; +#define CFL_ALPHABET_SIZE_LOG2 4 +#define CFL_ALPHABET_SIZE (1 << CFL_ALPHABET_SIZE_LOG2) +#define CFL_MAGS_SIZE ((2 << CFL_ALPHABET_SIZE_LOG2) + 1) +#define CFL_IDX_U(idx) (idx >> CFL_ALPHABET_SIZE_LOG2) +#define CFL_IDX_V(idx) (idx & (CFL_ALPHABET_SIZE - 1)) + +typedef enum { CFL_PRED_U, CFL_PRED_V, CFL_PRED_PLANES } CFL_PRED_TYPE; + +typedef enum { + CFL_SIGN_ZERO, + CFL_SIGN_NEG, + CFL_SIGN_POS, + CFL_SIGNS +} CFL_SIGN_TYPE; + +// CFL_SIGN_ZERO,CFL_SIGN_ZERO is invalid +#define CFL_JOINT_SIGNS (CFL_SIGNS * CFL_SIGNS - 1) +// CFL_SIGN_U is equivalent to (js + 1) / 3 for js in 0 to 8 +#define CFL_SIGN_U(js) (((js + 1) * 11) >> 5) +// CFL_SIGN_V is equivalent to (js + 1) % 3 for js in 0 to 8 +#define CFL_SIGN_V(js) ((js + 1) - CFL_SIGNS * CFL_SIGN_U(js)) + +// There is no context when the alpha for a given plane is zero. +// So there are 2 fewer contexts than joint signs. +#define CFL_ALPHA_CONTEXTS (CFL_JOINT_SIGNS + 1 - CFL_SIGNS) +#define CFL_CONTEXT_U(js) (js + 1 - CFL_SIGNS) +// Also, the contexts are symmetric under swapping the planes. +#define CFL_CONTEXT_V(js) \ + (CFL_SIGN_V(js) * CFL_SIGNS + CFL_SIGN_U(js) - CFL_SIGNS) #endif -#if CONFIG_PALETTE +typedef enum { + PALETTE_MAP, +#if CONFIG_MRC_TX + MRC_MAP, +#endif // CONFIG_MRC_TX + COLOR_MAP_TYPES, +} COLOR_MAP_TYPE; + typedef enum { TWO_COLORS, THREE_COLORS, @@ -367,33 +477,29 @@ typedef enum { PALETTE_COLOR_EIGHT, PALETTE_COLORS } PALETTE_COLOR; -#endif // CONFIG_PALETTE // Note: All directional predictors must be between V_PRED and D63_PRED (both // inclusive). typedef enum ATTRIBUTE_PACKED { - DC_PRED, // Average of above and left pixels - V_PRED, // Vertical - H_PRED, // Horizontal - D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) - D135_PRED, // Directional 135 deg = 180 - 45 - D117_PRED, // Directional 117 deg = 180 - 63 - D153_PRED, // Directional 153 deg = 180 - 27 - D207_PRED, // Directional 207 deg = 180 + 27 - D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) -#if CONFIG_ALT_INTRA + DC_PRED, // Average of above and left pixels + V_PRED, // Vertical + H_PRED, // Horizontal + D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) + D135_PRED, // Directional 135 deg = 180 - 45 + D117_PRED, // Directional 117 deg = 180 - 63 + D153_PRED, // Directional 153 deg = 180 - 27 + D207_PRED, // Directional 207 deg = 180 + 27 + D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) SMOOTH_PRED, // Combination of horizontal and vertical interpolation #if CONFIG_SMOOTH_HV SMOOTH_V_PRED, // Vertical interpolation SMOOTH_H_PRED, // Horizontal interpolation #endif // CONFIG_SMOOTH_HV -#endif // CONFIG_ALT_INTRA TM_PRED, // True-motion NEARESTMV, NEARMV, ZEROMV, NEWMV, -#if CONFIG_EXT_INTER #if CONFIG_COMPOUND_SINGLEREF // Single ref compound modes SR_NEAREST_NEARMV, @@ -411,7 +517,6 @@ typedef enum ATTRIBUTE_PACKED { NEW_NEARMV, ZERO_ZEROMV, NEW_NEWMV, -#endif // CONFIG_EXT_INTER MB_MODE_COUNT, INTRA_MODES = TM_PRED + 1, // TM_PRED has to be the last intra mode. INTRA_INVALID = MB_MODE_COUNT // For uv_mode in inter blocks @@ -421,23 +526,22 @@ typedef enum ATTRIBUTE_PACKED { // TODO(ltrudeau) Do we really want to pack this? // TODO(ltrudeau) Do we match with PREDICTION_MODE? typedef enum ATTRIBUTE_PACKED { - UV_DC_PRED, // Average of above and left pixels - UV_V_PRED, // Vertical - UV_H_PRED, // Horizontal - UV_D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) - UV_D135_PRED, // Directional 135 deg = 180 - 45 - UV_D117_PRED, // Directional 117 deg = 180 - 63 - UV_D153_PRED, // Directional 153 deg = 180 - 27 - UV_D207_PRED, // Directional 207 deg = 180 + 27 - UV_D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) -#if CONFIG_ALT_INTRA + UV_DC_PRED, // Average of above and left pixels + UV_V_PRED, // Vertical + UV_H_PRED, // Horizontal + UV_D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) + UV_D135_PRED, // Directional 135 deg = 180 - 45 + UV_D117_PRED, // Directional 117 deg = 180 - 63 + UV_D153_PRED, // Directional 153 deg = 180 - 27 + UV_D207_PRED, // Directional 207 deg = 180 + 27 + UV_D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) UV_SMOOTH_PRED, // Combination of horizontal and vertical interpolation #if CONFIG_SMOOTH_HV UV_SMOOTH_V_PRED, // Vertical interpolation UV_SMOOTH_H_PRED, // Horizontal interpolation #endif // CONFIG_SMOOTH_HV -#endif // CONFIG_ALT_INTRA UV_TM_PRED, // True-motion + UV_CFL_PRED, // Chroma-from-Luma UV_INTRA_MODES, UV_MODE_INVALID, // For uv_mode in inter blocks } UV_PREDICTION_MODE; @@ -449,47 +553,35 @@ typedef enum ATTRIBUTE_PACKED { #endif // CONFIG_CFL typedef enum { - SIMPLE_TRANSLATION = 0, + SIMPLE_TRANSLATION, #if CONFIG_MOTION_VAR OBMC_CAUSAL, // 2-sided OBMC -#endif // CONFIG_MOTION_VAR +#if CONFIG_NCOBMC_ADAPT_WEIGHT + NCOBMC_ADAPT_WEIGHT, +#endif // CONFIG_NCOBMC_ADAPT_WEIGHT +#endif // CONFIG_MOTION_VAR #if CONFIG_WARPED_MOTION WARPED_CAUSAL, // 2-sided WARPED #endif // CONFIG_WARPED_MOTION -#if CONFIG_NCOBMC_ADAPT_WEIGHT - NCOBMC_ADAPT_WEIGHT, -#endif MOTION_MODES -} MOTION_MODE; - -#if CONFIG_NCOBMC_ADAPT_WEIGHT -typedef enum { - ADAPT_OVERLAP_BLOCK_8X8, - ADAPT_OVERLAP_BLOCK_16X16, - ADAPT_OVERLAP_BLOCK_32X32, - ADAPT_OVERLAP_BLOCK_64X64, - ADAPT_OVERLAP_BLOCKS, - ADAPT_OVERLAP_BLOCK_INVALID = 255 -} ADAPT_OVERLAP_BLOCK; +#if CONFIG_NCOBMC_ADAPT_WEIGHT && CONFIG_WARPED_MOTION + , + OBMC_FAMILY_MODES = NCOBMC_ADAPT_WEIGHT + 1 #endif +} MOTION_MODE; -#if CONFIG_EXT_INTER #if CONFIG_INTERINTRA typedef enum { - II_DC_PRED = 0, + II_DC_PRED, II_V_PRED, II_H_PRED, -#if CONFIG_ALT_INTRA II_SMOOTH_PRED, -#else - II_TM_PRED, -#endif // CONFIG_ALT_INTRA INTERINTRA_MODES } INTERINTRA_MODE; #endif typedef enum { - COMPOUND_AVERAGE = 0, + COMPOUND_AVERAGE, #if CONFIG_WEDGE COMPOUND_WEDGE, #endif // CONFIG_WEDGE @@ -498,7 +590,6 @@ typedef enum { #endif // CONFIG_COMPOUND_SEGMENT COMPOUND_TYPES, } COMPOUND_TYPE; -#endif // CONFIG_EXT_INTER // TODO(huisu): Consider adding FILTER_SMOOTH_PRED to "FILTER_INTRA_MODE". #if CONFIG_FILTER_INTRA @@ -523,13 +614,11 @@ typedef enum { #define INTER_MODES (1 + NEWMV - NEARESTMV) -#if CONFIG_EXT_INTER #if CONFIG_COMPOUND_SINGLEREF #define INTER_SINGLEREF_COMP_MODES (1 + SR_NEW_NEWMV - SR_NEAREST_NEARMV) #endif // CONFIG_COMPOUND_SINGLEREF #define INTER_COMPOUND_MODES (1 + NEW_NEWMV - NEAREST_NEARESTMV) -#endif // CONFIG_EXT_INTER #define SKIP_CONTEXTS 3 @@ -553,7 +642,6 @@ typedef enum { #define SKIP_NEARESTMV_SUB8X8_OFFSET 11 #define INTER_MODE_CONTEXTS 7 -#if CONFIG_DELTA_Q #define DELTA_Q_SMALL 3 #define DELTA_Q_PROBS (DELTA_Q_SMALL) #define DEFAULT_DELTA_Q_RES 4 @@ -562,7 +650,6 @@ typedef enum { #define DELTA_LF_PROBS (DELTA_LF_SMALL) #define DEFAULT_DELTA_LF_RES 2 #endif -#endif /* Segment Feature Masks */ #define MAX_MV_REF_CANDIDATES 2 @@ -583,9 +670,9 @@ typedef enum { #define UNI_COMP_REF_CONTEXTS 3 #endif // CONFIG_EXT_COMP_REFS -#if CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF +#if CONFIG_COMPOUND_SINGLEREF #define COMP_INTER_MODE_CONTEXTS 4 -#endif // CONFIG_EXT_INTER && CONFIG_COMPOUND_SINGLEREF +#endif // CONFIG_COMPOUND_SINGLEREF #if CONFIG_VAR_TX #define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 2) @@ -601,14 +688,8 @@ typedef uint8_t TXFM_CONTEXT; #define LAST3_FRAME 3 #define GOLDEN_FRAME 4 #define BWDREF_FRAME 5 - -#if CONFIG_ALTREF2 #define ALTREF2_FRAME 6 #define ALTREF_FRAME 7 -#else // !CONFIG_ALTREF2 -#define ALTREF_FRAME 6 -#endif // CONFIG_ALTREF2 - #define LAST_REF_FRAMES (LAST3_FRAME - LAST_FRAME + 1) #else // !CONFIG_EXT_REFS #define GOLDEN_FRAME 2 @@ -651,9 +732,9 @@ typedef enum { #if CONFIG_LOOP_RESTORATION typedef enum { - RESTORE_NONE = 0, - RESTORE_WIENER = 1, - RESTORE_SGRPROJ = 2, + RESTORE_NONE, + RESTORE_WIENER, + RESTORE_SGRPROJ, RESTORE_SWITCHABLE, RESTORE_SWITCHABLE_TYPES = RESTORE_SWITCHABLE, RESTORE_TYPES, @@ -662,7 +743,7 @@ typedef enum { #if CONFIG_FRAME_SUPERRES #define SUPERRES_SCALE_BITS 3 -#define SUPERRES_SCALE_NUMERATOR_MIN 8 +#define SUPERRES_SCALE_DENOMINATOR_MIN 8 #endif // CONFIG_FRAME_SUPERRES #if CONFIG_LPF_DIRECT @@ -678,6 +759,27 @@ typedef enum { } FILTER_DEGREE; #endif // CONFIG_LPF_DIRECT +#if CONFIG_OBU +// R19 +typedef enum { + OBU_SEQUENCE_HEADER = 1, + OBU_TD = 2, + OBU_FRAME_HEADER = 3, + OBU_TILE_GROUP = 4, + OBU_METADATA = 5, + OBU_PADDING = 15, +} OBU_TYPE; +#endif + +#if CONFIG_LGT_FROM_PRED +#define LGT_SIZES 2 +// Note: at least one of LGT_FROM_PRED_INTRA and LGT_FROM_PRED_INTER must be 1 +#define LGT_FROM_PRED_INTRA 1 +#define LGT_FROM_PRED_INTER 1 +// LGT_SL_INTRA: LGTs with a mode-dependent first self-loop and a break point +#define LGT_SL_INTRA 0 +#endif // CONFIG_LGT_FROM_PRED + #ifdef __cplusplus } // extern "C" #endif -- cgit v1.2.3 From bbcc64772580c8a979288791afa02d30bc476d2e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:52:15 -0500 Subject: Update aom to v1.0.0 Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0. --- third_party/aom/av1/common/enums.h | 624 ++++++++++++++----------------------- 1 file changed, 226 insertions(+), 398 deletions(-) (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h index e8c4003cc..a37ee9f24 100644 --- a/third_party/aom/av1/common/enums.h +++ b/third_party/aom/av1/common/enums.h @@ -12,7 +12,8 @@ #ifndef AV1_COMMON_ENUMS_H_ #define AV1_COMMON_ENUMS_H_ -#include "./aom_config.h" +#include "config/aom_config.h" + #include "aom/aom_codec.h" #include "aom/aom_integer.h" @@ -22,22 +23,8 @@ extern "C" { #undef MAX_SB_SIZE -#if CONFIG_NCOBMC_ADAPT_WEIGHT -#define TWO_MODE -#endif - -#if CONFIG_NCOBMC || CONFIG_NCOBMC_ADAPT_WEIGHT -#define NC_MODE_INFO 1 -#else -#define NC_MODE_INFO 0 -#endif - // Max superblock size -#if CONFIG_EXT_PARTITION #define MAX_SB_SIZE_LOG2 7 -#else -#define MAX_SB_SIZE_LOG2 6 -#endif // CONFIG_EXT_PARTITION #define MAX_SB_SIZE (1 << MAX_SB_SIZE_LOG2) #define MAX_SB_SQUARE (MAX_SB_SIZE * MAX_SB_SIZE) @@ -45,11 +32,7 @@ extern "C" { #define MIN_SB_SIZE_LOG2 6 // Pixels per Mode Info (MI) unit -#if CONFIG_CB4X4 #define MI_SIZE_LOG2 2 -#else -#define MI_SIZE_LOG2 3 -#endif #define MI_SIZE (1 << MI_SIZE_LOG2) // MI-units per max superblock (MI Block - MIB) @@ -63,73 +46,78 @@ extern "C" { #define MAX_MIB_MASK (MAX_MIB_SIZE - 1) // Maximum number of tile rows and tile columns -#if CONFIG_EXT_TILE -#define MAX_TILE_ROWS 1024 -#define MAX_TILE_COLS 1024 -#else -#if CONFIG_MAX_TILE #define MAX_TILE_ROWS 64 #define MAX_TILE_COLS 64 -#else -#define MAX_TILE_ROWS 4 -#define MAX_TILE_COLS 64 -#endif -#endif // CONFIG_EXT_TILE -#if CONFIG_VAR_TX #define MAX_VARTX_DEPTH 2 -#define SQR_VARTX_DEPTH_INIT 0 -#define RECT_VARTX_DEPTH_INIT 0 -#endif #define MI_SIZE_64X64 (64 >> MI_SIZE_LOG2) +#define MI_SIZE_128X128 (128 >> MI_SIZE_LOG2) + +#define MAX_PALETTE_SQUARE (64 * 64) +// Maximum number of colors in a palette. +#define PALETTE_MAX_SIZE 8 +// Minimum number of colors in a palette. +#define PALETTE_MIN_SIZE 2 + +#define FRAME_OFFSET_BITS 5 +#define MAX_FRAME_DISTANCE ((1 << FRAME_OFFSET_BITS) - 1) + +#define REF_FRAMES_LOG2 3 +#define REF_FRAMES (1 << REF_FRAMES_LOG2) + +// 4 scratch frames for the new frames to support a maximum of 4 cores decoding +// in parallel, 3 for scaled references on the encoder. +// TODO(hkuang): Add ondemand frame buffers instead of hardcoding the number +// of framebuffers. +// TODO(jkoleszar): These 3 extra references could probably come from the +// normal reference pool. +#define FRAME_BUFFERS (REF_FRAMES + 7) -#if CONFIG_LOOPFILTER_LEVEL // 4 frame filter levels: y plane vertical, y plane horizontal, // u plane, and v plane #define FRAME_LF_COUNT 4 #define DEFAULT_DELTA_LF_MULTI 0 -#endif // CONFIG_LOOPFILTER_LEVEL - -#if CONFIG_LPF_SB -#define LPF_DELTA_BITS 3 -#define LPF_STEP 2 -#define DELTA_RANGE (1 << LPF_DELTA_BITS) -#define MAX_LPF_OFFSET (LPF_STEP * ((1 << LPF_DELTA_BITS) - 1)) - -#define LPF_REUSE_CONTEXT 2 -#define LPF_DELTA_CONTEXT DELTA_RANGE -#define LPF_SIGN_CONTEXT 2 - -// Half of maximum loop filter length (15-tap) -#define FILT_BOUNDARY_OFFSET 8 -#define FILT_BOUNDARY_MI_OFFSET (FILT_BOUNDARY_OFFSET >> MI_SIZE_LOG2) -#endif // CONFIG_LPF_SB - -// Bitstream profiles indicated by 2-3 bits in the uncompressed header. -// 00: Profile 0. 8-bit 4:2:0 only. -// 10: Profile 1. 8-bit 4:4:4, 4:2:2, and 4:4:0. -// 01: Profile 2. 10-bit and 12-bit color only, with 4:2:0 sampling. -// 110: Profile 3. 10-bit and 12-bit color only, with 4:2:2/4:4:4/4:4:0 -// sampling. -// 111: Undefined profile. +#define MAX_MODE_LF_DELTAS 2 + +#define DIST_PRECISION_BITS 4 +#define DIST_PRECISION (1 << DIST_PRECISION_BITS) // 16 + +// TODO(chengchen): Temporal flag serve as experimental flag for WIP +// bitmask construction. +// Shall be removed when bitmask code is completely checkedin +#define LOOP_FILTER_BITMASK 0 + +#define PROFILE_BITS 3 +// The following three profiles are currently defined. +// Profile 0. 8-bit and 10-bit 4:2:0 and 4:0:0 only. +// Profile 1. 8-bit and 10-bit 4:4:4 +// Profile 2. 8-bit and 10-bit 4:2:2 +// 12-bit 4:0:0, 4:2:2 and 4:4:4 +// Since we have three bits for the profiles, it can be extended later. typedef enum BITSTREAM_PROFILE { PROFILE_0, PROFILE_1, PROFILE_2, - PROFILE_3, - MAX_PROFILES + MAX_PROFILES, } BITSTREAM_PROFILE; +#define LEVEL_MAJOR_BITS 3 +#define LEVEL_MINOR_BITS 2 +#define LEVEL_BITS (LEVEL_MAJOR_BITS + LEVEL_MINOR_BITS) + +#define LEVEL_MAJOR_MIN 2 +#define LEVEL_MAJOR_MAX ((1 << LEVEL_MAJOR_BITS) - 1 + LEVEL_MAJOR_MIN) +#define LEVEL_MINOR_MIN 0 +#define LEVEL_MINOR_MAX ((1 << LEVEL_MINOR_BITS) - 1) + +#define OP_POINTS_CNT_MINUS_1_BITS 5 +#define OP_POINTS_IDC_BITS 12 + // Note: Some enums use the attribute 'packed' to use smallest possible integer // type, so that we can save memory when they are used in structs/arrays. typedef enum ATTRIBUTE_PACKED { -#if CONFIG_CHROMA_2X2 || CONFIG_CHROMA_SUB8X8 - BLOCK_2X2, - BLOCK_2X4, - BLOCK_4X2, -#endif BLOCK_4X4, BLOCK_4X8, BLOCK_8X4, @@ -143,33 +131,29 @@ typedef enum ATTRIBUTE_PACKED { BLOCK_32X64, BLOCK_64X32, BLOCK_64X64, -#if CONFIG_EXT_PARTITION BLOCK_64X128, BLOCK_128X64, BLOCK_128X128, -#endif // CONFIG_EXT_PARTITION BLOCK_4X16, BLOCK_16X4, BLOCK_8X32, BLOCK_32X8, BLOCK_16X64, BLOCK_64X16, -#if CONFIG_EXT_PARTITION - BLOCK_32X128, - BLOCK_128X32, -#endif // CONFIG_EXT_PARTITION BLOCK_SIZES_ALL, BLOCK_SIZES = BLOCK_4X16, BLOCK_INVALID = 255, BLOCK_LARGEST = (BLOCK_SIZES - 1) } BLOCK_SIZE; -typedef enum { +// 4X4, 8X8, 16X16, 32X32, 64X64, 128X128 +#define SQR_BLOCK_SIZES 6 + +typedef enum ATTRIBUTE_PACKED { PARTITION_NONE, PARTITION_HORZ, PARTITION_VERT, PARTITION_SPLIT, -#if CONFIG_EXT_PARTITION_TYPES PARTITION_HORZ_A, // HORZ split and the top partition is split again PARTITION_HORZ_B, // HORZ split and the bottom partition is split again PARTITION_VERT_A, // VERT split and the left partition is split again @@ -177,134 +161,104 @@ typedef enum { PARTITION_HORZ_4, // 4:1 horizontal partition PARTITION_VERT_4, // 4:1 vertical partition EXT_PARTITION_TYPES, -#endif // CONFIG_EXT_PARTITION_TYPES PARTITION_TYPES = PARTITION_SPLIT + 1, PARTITION_INVALID = 255 } PARTITION_TYPE; typedef char PARTITION_CONTEXT; #define PARTITION_PLOFFSET 4 // number of probability models per block size -#define PARTITION_BLOCK_SIZES (4 + CONFIG_EXT_PARTITION) -#define PARTITION_CONTEXTS_PRIMARY (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET) -#if CONFIG_UNPOISON_PARTITION_CTX -#define INVALID_PARTITION_CTX (-1) -#define PARTITION_CONTEXTS \ - (PARTITION_CONTEXTS_PRIMARY + 2 * PARTITION_BLOCK_SIZES) -#else -#define PARTITION_CONTEXTS PARTITION_CONTEXTS_PRIMARY -#endif +#define PARTITION_BLOCK_SIZES 5 +#define PARTITION_CONTEXTS (PARTITION_BLOCK_SIZES * PARTITION_PLOFFSET) // block transform size +#if defined(_MSC_VER) +typedef uint8_t TX_SIZE; +enum ATTRIBUTE_PACKED { +#else typedef enum ATTRIBUTE_PACKED { -#if CONFIG_CHROMA_2X2 - TX_2X2, // 2x2 transform #endif - TX_4X4, // 4x4 transform - TX_8X8, // 8x8 transform - TX_16X16, // 16x16 transform - TX_32X32, // 32x32 transform -#if CONFIG_TX64X64 - TX_64X64, // 64x64 transform -#endif // CONFIG_TX64X64 - TX_4X8, // 4x8 transform - TX_8X4, // 8x4 transform - TX_8X16, // 8x16 transform - TX_16X8, // 16x8 transform - TX_16X32, // 16x32 transform - TX_32X16, // 32x16 transform -#if CONFIG_TX64X64 + TX_4X4, // 4x4 transform + TX_8X8, // 8x8 transform + TX_16X16, // 16x16 transform + TX_32X32, // 32x32 transform + TX_64X64, // 64x64 transform + TX_4X8, // 4x8 transform + TX_8X4, // 8x4 transform + TX_8X16, // 8x16 transform + TX_16X8, // 16x8 transform + TX_16X32, // 16x32 transform + TX_32X16, // 32x16 transform TX_32X64, // 32x64 transform TX_64X32, // 64x32 transform -#endif // CONFIG_TX64X64 TX_4X16, // 4x16 transform TX_16X4, // 16x4 transform TX_8X32, // 8x32 transform TX_32X8, // 32x8 transform + TX_16X64, // 16x64 transform + TX_64X16, // 64x16 transform TX_SIZES_ALL, // Includes rectangular transforms TX_SIZES = TX_4X8, // Does NOT include rectangular transforms - TX_INVALID = 255 // Invalid transform size + TX_SIZES_LARGEST = TX_64X64, + TX_INVALID = 255 // Invalid transform size +#if defined(_MSC_VER) +}; +#else } TX_SIZE; +#endif #define TX_SIZE_LUMA_MIN (TX_4X4) /* We don't need to code a transform size unless the allowed size is at least one more than the minimum. */ #define TX_SIZE_CTX_MIN (TX_SIZE_LUMA_MIN + 1) -#define MAX_TX_DEPTH (TX_SIZES - TX_SIZE_CTX_MIN) +// Maximum tx_size categories +#define MAX_TX_CATS (TX_SIZES - TX_SIZE_CTX_MIN) +#define MAX_TX_DEPTH 2 -#if CONFIG_CTX1D -#define MAX_HVTX_SIZE (1 << 5) -#endif // CONFIG_CTX1D - -#define MAX_TX_SIZE_LOG2 (5 + CONFIG_TX64X64) +#define MAX_TX_SIZE_LOG2 (6) #define MAX_TX_SIZE (1 << MAX_TX_SIZE_LOG2) #define MIN_TX_SIZE_LOG2 2 #define MIN_TX_SIZE (1 << MIN_TX_SIZE_LOG2) #define MAX_TX_SQUARE (MAX_TX_SIZE * MAX_TX_SIZE) +// Pad 4 extra columns to remove horizontal availability check. +#define TX_PAD_HOR_LOG2 2 +#define TX_PAD_HOR 4 +// Pad 6 extra rows (2 on top and 4 on bottom) to remove vertical availability +// check. +#define TX_PAD_TOP 2 +#define TX_PAD_BOTTOM 4 +#define TX_PAD_VER (TX_PAD_TOP + TX_PAD_BOTTOM) +// Pad 16 extra bytes to avoid reading overflow in SIMD optimization. +#define TX_PAD_END 16 +#define TX_PAD_2D ((32 + TX_PAD_HOR) * (32 + TX_PAD_VER) + TX_PAD_END) + // Number of maxium size transform blocks in the maximum size superblock #define MAX_TX_BLOCKS_IN_MAX_SB_LOG2 ((MAX_SB_SIZE_LOG2 - MAX_TX_SIZE_LOG2) * 2) #define MAX_TX_BLOCKS_IN_MAX_SB (1 << MAX_TX_BLOCKS_IN_MAX_SB_LOG2) -#if CONFIG_NCOBMC_ADAPT_WEIGHT -typedef enum ATTRIBUTE_PACKED { - NCOBMC_MODE_0, - NCOBMC_MODE_1, - NCOBMC_MODE_2, - NCOBMC_MODE_3, - NCOBMC_MODE_4, - NCOBMC_MODE_5, - NCOBMC_MODE_6, - NCOBMC_MODE_7, - ALL_NCOBMC_MODES, -#ifdef TWO_MODE - MAX_NCOBMC_MODES = NCOBMC_MODE_1 + 1, -#else - MAX_NCOBMC_MODES = ALL_NCOBMC_MODES, -#endif - NO_OVERLAP = MAX_NCOBMC_MODES + 1 -} NCOBMC_MODE; - -typedef enum { - ADAPT_OVERLAP_BLOCK_8X8, - ADAPT_OVERLAP_BLOCK_16X16, - ADAPT_OVERLAP_BLOCK_32X32, - ADAPT_OVERLAP_BLOCK_64X64, - ADAPT_OVERLAP_BLOCKS, - ADAPT_OVERLAP_BLOCK_INVALID = 255 -} ADAPT_OVERLAP_BLOCK; -#endif // CONFIG_NCOBMC_ADAPT_WEIGHT - // frame transform mode -typedef enum { - ONLY_4X4, // only 4x4 transform used - ALLOW_8X8, // allow block transform size up to 8x8 - ALLOW_16X16, // allow block transform size up to 16x16 - ALLOW_32X32, // allow block transform size up to 32x32 -#if CONFIG_TX64X64 - ALLOW_64X64, // allow block transform size up to 64x64 -#endif - TX_MODE_SELECT, // transform specified for each block +typedef enum ATTRIBUTE_PACKED { + ONLY_4X4, // use only 4x4 transform + TX_MODE_LARGEST, // transform size is the largest possible for pu size + TX_MODE_SELECT, // transform specified for each block TX_MODES, } TX_MODE; // 1D tx types -typedef enum { +typedef enum ATTRIBUTE_PACKED { DCT_1D, ADST_1D, FLIPADST_1D, IDTX_1D, - // TODO(sarahparker) need to eventually put something here for the - // mrc experiment to make this work with the ext-tx pruning functions TX_TYPES_1D, } TX_TYPE_1D; -typedef enum { +typedef enum ATTRIBUTE_PACKED { DCT_DCT, // DCT in both horizontal and vertical ADST_DCT, // ADST in vertical, DCT in horizontal DCT_ADST, // DCT in vertical, ADST in horizontal ADST_ADST, // ADST in both directions -#if CONFIG_EXT_TX FLIPADST_DCT, DCT_FLIPADST, FLIPADST_FLIPADST, @@ -317,25 +271,26 @@ typedef enum { H_ADST, V_FLIPADST, H_FLIPADST, -#endif // CONFIG_EXT_TX -#if CONFIG_MRC_TX - MRC_DCT, // DCT in both directions with mrc based bitmask -#endif // CONFIG_MRC_TX TX_TYPES, } TX_TYPE; -#if CONFIG_EXT_TX typedef enum { + REG_REG, + REG_SMOOTH, + REG_SHARP, + SMOOTH_REG, + SMOOTH_SMOOTH, + SMOOTH_SHARP, + SHARP_REG, + SHARP_SMOOTH, + SHARP_SHARP, +} DUAL_FILTER_TYPE; + +typedef enum ATTRIBUTE_PACKED { // DCT only EXT_TX_SET_DCTONLY, // DCT + Identity only EXT_TX_SET_DCT_IDTX, -#if CONFIG_MRC_TX - // DCT + MRC_DCT - EXT_TX_SET_MRC_DCT, - // DCT + MRC_DCT + IDTX - EXT_TX_SET_MRC_DCT_IDTX, -#endif // CONFIG_MRC_TX // Discrete Trig transforms w/o flip (4) + Identity (1) EXT_TX_SET_DTT4_IDTX, // Discrete Trig transforms w/o flip (4) + Identity (1) + 1D Hor/vert DCT (2) @@ -348,45 +303,13 @@ typedef enum { } TxSetType; #define IS_2D_TRANSFORM(tx_type) (tx_type < IDTX) -#else -#define IS_2D_TRANSFORM(tx_type) 1 -#endif -typedef enum { - TILE_LEFT_BOUNDARY = 1, - TILE_RIGHT_BOUNDARY = 2, - TILE_ABOVE_BOUNDARY = 4, - TILE_BOTTOM_BOUNDARY = 8, - FRAME_LEFT_BOUNDARY = 16, - FRAME_RIGHT_BOUNDARY = 32, - FRAME_ABOVE_BOUNDARY = 64, - FRAME_BOTTOM_BOUNDARY = 128, -} BOUNDARY_TYPE; - -#if CONFIG_EXT_TX -#if CONFIG_CHROMA_2X2 -#define EXT_TX_SIZES 5 // number of sizes that use extended transforms -#else -#define EXT_TX_SIZES 4 // number of sizes that use extended transforms -#endif // CONFIG_CHROMA_2X2 -#if CONFIG_MRC_TX -#define EXT_TX_SETS_INTER 5 // Sets of transform selections for INTER -#define EXT_TX_SETS_INTRA 4 // Sets of transform selections for INTRA -#else // CONFIG_MRC_TX +#define EXT_TX_SIZES 4 // number of sizes that use extended transforms #define EXT_TX_SETS_INTER 4 // Sets of transform selections for INTER #define EXT_TX_SETS_INTRA 3 // Sets of transform selections for INTRA -#endif // CONFIG_MRC_TX -#else -#if CONFIG_CHROMA_2X2 -#define EXT_TX_SIZES 4 // number of sizes that use extended transforms -#else -#define EXT_TX_SIZES 3 // number of sizes that use extended transforms -#endif -#endif // CONFIG_EXT_TX -typedef enum { +typedef enum ATTRIBUTE_PACKED { AOM_LAST_FLAG = 1 << 0, -#if CONFIG_EXT_REFS AOM_LAST2_FLAG = 1 << 1, AOM_LAST3_FLAG = 1 << 2, AOM_GOLD_FLAG = 1 << 3, @@ -394,43 +317,45 @@ typedef enum { AOM_ALT2_FLAG = 1 << 5, AOM_ALT_FLAG = 1 << 6, AOM_REFFRAME_ALL = (1 << 7) - 1 -#else // !CONFIG_EXT_REFS - AOM_GOLD_FLAG = 1 << 1, - AOM_ALT_FLAG = 1 << 2, - AOM_REFFRAME_ALL = (1 << 3) - 1 -#endif // CONFIG_EXT_REFS } AOM_REFFRAME; -#if CONFIG_EXT_COMP_REFS -#define USE_UNI_COMP_REFS 1 - -typedef enum { +typedef enum ATTRIBUTE_PACKED { UNIDIR_COMP_REFERENCE, BIDIR_COMP_REFERENCE, COMP_REFERENCE_TYPES, } COMP_REFERENCE_TYPE; -#else // !CONFIG_EXT_COMP_REFS -#define USE_UNI_COMP_REFS 0 -#endif // CONFIG_EXT_COMP_REFS -typedef enum { PLANE_TYPE_Y, PLANE_TYPE_UV, PLANE_TYPES } PLANE_TYPE; +typedef enum ATTRIBUTE_PACKED { + PLANE_TYPE_Y, + PLANE_TYPE_UV, + PLANE_TYPES +} PLANE_TYPE; -#if CONFIG_CFL #define CFL_ALPHABET_SIZE_LOG2 4 #define CFL_ALPHABET_SIZE (1 << CFL_ALPHABET_SIZE_LOG2) #define CFL_MAGS_SIZE ((2 << CFL_ALPHABET_SIZE_LOG2) + 1) #define CFL_IDX_U(idx) (idx >> CFL_ALPHABET_SIZE_LOG2) #define CFL_IDX_V(idx) (idx & (CFL_ALPHABET_SIZE - 1)) -typedef enum { CFL_PRED_U, CFL_PRED_V, CFL_PRED_PLANES } CFL_PRED_TYPE; +typedef enum ATTRIBUTE_PACKED { + CFL_PRED_U, + CFL_PRED_V, + CFL_PRED_PLANES +} CFL_PRED_TYPE; -typedef enum { +typedef enum ATTRIBUTE_PACKED { CFL_SIGN_ZERO, CFL_SIGN_NEG, CFL_SIGN_POS, CFL_SIGNS } CFL_SIGN_TYPE; +typedef enum ATTRIBUTE_PACKED { + CFL_DISALLOWED, + CFL_ALLOWED, + CFL_ALLOWED_TYPES +} CFL_ALLOWED_TYPE; + // CFL_SIGN_ZERO,CFL_SIGN_ZERO is invalid #define CFL_JOINT_SIGNS (CFL_SIGNS * CFL_SIGNS - 1) // CFL_SIGN_U is equivalent to (js + 1) / 3 for js in 0 to 8 @@ -445,17 +370,13 @@ typedef enum { // Also, the contexts are symmetric under swapping the planes. #define CFL_CONTEXT_V(js) \ (CFL_SIGN_V(js) * CFL_SIGNS + CFL_SIGN_U(js) - CFL_SIGNS) -#endif -typedef enum { +typedef enum ATTRIBUTE_PACKED { PALETTE_MAP, -#if CONFIG_MRC_TX - MRC_MAP, -#endif // CONFIG_MRC_TX COLOR_MAP_TYPES, } COLOR_MAP_TYPE; -typedef enum { +typedef enum ATTRIBUTE_PACKED { TWO_COLORS, THREE_COLORS, FOUR_COLORS, @@ -466,7 +387,7 @@ typedef enum { PALETTE_SIZES } PALETTE_SIZE; -typedef enum { +typedef enum ATTRIBUTE_PACKED { PALETTE_COLOR_ONE, PALETTE_COLOR_TWO, PALETTE_COLOR_THREE, @@ -478,36 +399,26 @@ typedef enum { PALETTE_COLORS } PALETTE_COLOR; -// Note: All directional predictors must be between V_PRED and D63_PRED (both +// Note: All directional predictors must be between V_PRED and D67_PRED (both // inclusive). typedef enum ATTRIBUTE_PACKED { - DC_PRED, // Average of above and left pixels - V_PRED, // Vertical - H_PRED, // Horizontal - D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) - D135_PRED, // Directional 135 deg = 180 - 45 - D117_PRED, // Directional 117 deg = 180 - 63 - D153_PRED, // Directional 153 deg = 180 - 27 - D207_PRED, // Directional 207 deg = 180 + 27 - D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) - SMOOTH_PRED, // Combination of horizontal and vertical interpolation -#if CONFIG_SMOOTH_HV + DC_PRED, // Average of above and left pixels + V_PRED, // Vertical + H_PRED, // Horizontal + D45_PRED, // Directional 45 degree + D135_PRED, // Directional 135 degree + D113_PRED, // Directional 113 degree + D157_PRED, // Directional 157 degree + D203_PRED, // Directional 203 degree + D67_PRED, // Directional 67 degree + SMOOTH_PRED, // Combination of horizontal and vertical interpolation SMOOTH_V_PRED, // Vertical interpolation SMOOTH_H_PRED, // Horizontal interpolation -#endif // CONFIG_SMOOTH_HV - TM_PRED, // True-motion + PAETH_PRED, // Predict from the direction of smallest gradient NEARESTMV, NEARMV, - ZEROMV, + GLOBALMV, NEWMV, -#if CONFIG_COMPOUND_SINGLEREF - // Single ref compound modes - SR_NEAREST_NEARMV, - // SR_NEAREST_NEWMV, - SR_NEAR_NEWMV, - SR_ZERO_NEWMV, - SR_NEW_NEWMV, -#endif // CONFIG_COMPOUND_SINGLEREF // Compound ref compound modes NEAREST_NEARESTMV, NEAR_NEARMV, @@ -515,175 +426,131 @@ typedef enum ATTRIBUTE_PACKED { NEW_NEARESTMV, NEAR_NEWMV, NEW_NEARMV, - ZERO_ZEROMV, + GLOBAL_GLOBALMV, NEW_NEWMV, MB_MODE_COUNT, - INTRA_MODES = TM_PRED + 1, // TM_PRED has to be the last intra mode. + INTRA_MODE_START = DC_PRED, + INTRA_MODE_END = NEARESTMV, + INTRA_MODE_NUM = INTRA_MODE_END - INTRA_MODE_START, + SINGLE_INTER_MODE_START = NEARESTMV, + SINGLE_INTER_MODE_END = NEAREST_NEARESTMV, + SINGLE_INTER_MODE_NUM = SINGLE_INTER_MODE_END - SINGLE_INTER_MODE_START, + COMP_INTER_MODE_START = NEAREST_NEARESTMV, + COMP_INTER_MODE_END = MB_MODE_COUNT, + COMP_INTER_MODE_NUM = COMP_INTER_MODE_END - COMP_INTER_MODE_START, + INTRA_MODES = PAETH_PRED + 1, // PAETH_PRED has to be the last intra mode. INTRA_INVALID = MB_MODE_COUNT // For uv_mode in inter blocks } PREDICTION_MODE; -#if CONFIG_CFL // TODO(ltrudeau) Do we really want to pack this? // TODO(ltrudeau) Do we match with PREDICTION_MODE? typedef enum ATTRIBUTE_PACKED { - UV_DC_PRED, // Average of above and left pixels - UV_V_PRED, // Vertical - UV_H_PRED, // Horizontal - UV_D45_PRED, // Directional 45 deg = round(arctan(1/1) * 180/pi) - UV_D135_PRED, // Directional 135 deg = 180 - 45 - UV_D117_PRED, // Directional 117 deg = 180 - 63 - UV_D153_PRED, // Directional 153 deg = 180 - 27 - UV_D207_PRED, // Directional 207 deg = 180 + 27 - UV_D63_PRED, // Directional 63 deg = round(arctan(2/1) * 180/pi) - UV_SMOOTH_PRED, // Combination of horizontal and vertical interpolation -#if CONFIG_SMOOTH_HV + UV_DC_PRED, // Average of above and left pixels + UV_V_PRED, // Vertical + UV_H_PRED, // Horizontal + UV_D45_PRED, // Directional 45 degree + UV_D135_PRED, // Directional 135 degree + UV_D113_PRED, // Directional 113 degree + UV_D157_PRED, // Directional 157 degree + UV_D203_PRED, // Directional 203 degree + UV_D67_PRED, // Directional 67 degree + UV_SMOOTH_PRED, // Combination of horizontal and vertical interpolation UV_SMOOTH_V_PRED, // Vertical interpolation UV_SMOOTH_H_PRED, // Horizontal interpolation -#endif // CONFIG_SMOOTH_HV - UV_TM_PRED, // True-motion + UV_PAETH_PRED, // Predict from the direction of smallest gradient UV_CFL_PRED, // Chroma-from-Luma UV_INTRA_MODES, UV_MODE_INVALID, // For uv_mode in inter blocks } UV_PREDICTION_MODE; -#else -#define UV_INTRA_MODES (INTRA_MODES) -#define UV_PREDICTION_MODE PREDICTION_MODE -#define UV_DC_PRED (DC_PRED) -#define UV_MODE_INVALID (INTRA_INVALID) -#endif // CONFIG_CFL -typedef enum { +typedef enum ATTRIBUTE_PACKED { SIMPLE_TRANSLATION, -#if CONFIG_MOTION_VAR - OBMC_CAUSAL, // 2-sided OBMC -#if CONFIG_NCOBMC_ADAPT_WEIGHT - NCOBMC_ADAPT_WEIGHT, -#endif // CONFIG_NCOBMC_ADAPT_WEIGHT -#endif // CONFIG_MOTION_VAR -#if CONFIG_WARPED_MOTION + OBMC_CAUSAL, // 2-sided OBMC WARPED_CAUSAL, // 2-sided WARPED -#endif // CONFIG_WARPED_MOTION MOTION_MODES -#if CONFIG_NCOBMC_ADAPT_WEIGHT && CONFIG_WARPED_MOTION - , - OBMC_FAMILY_MODES = NCOBMC_ADAPT_WEIGHT + 1 -#endif } MOTION_MODE; -#if CONFIG_INTERINTRA -typedef enum { +typedef enum ATTRIBUTE_PACKED { II_DC_PRED, II_V_PRED, II_H_PRED, II_SMOOTH_PRED, INTERINTRA_MODES } INTERINTRA_MODE; -#endif typedef enum { COMPOUND_AVERAGE, -#if CONFIG_WEDGE COMPOUND_WEDGE, -#endif // CONFIG_WEDGE -#if CONFIG_COMPOUND_SEGMENT - COMPOUND_SEG, -#endif // CONFIG_COMPOUND_SEGMENT + COMPOUND_DIFFWTD, COMPOUND_TYPES, } COMPOUND_TYPE; -// TODO(huisu): Consider adding FILTER_SMOOTH_PRED to "FILTER_INTRA_MODE". -#if CONFIG_FILTER_INTRA -typedef enum { +typedef enum ATTRIBUTE_PACKED { FILTER_DC_PRED, FILTER_V_PRED, FILTER_H_PRED, - FILTER_D45_PRED, - FILTER_D135_PRED, - FILTER_D117_PRED, - FILTER_D153_PRED, - FILTER_D207_PRED, - FILTER_D63_PRED, - FILTER_TM_PRED, + FILTER_D157_PRED, + FILTER_PAETH_PRED, FILTER_INTRA_MODES, } FILTER_INTRA_MODE; -#endif // CONFIG_FILTER_INTRA -#if CONFIG_EXT_INTRA #define DIRECTIONAL_MODES 8 -#endif // CONFIG_EXT_INTRA +#define MAX_ANGLE_DELTA 3 +#define ANGLE_STEP 3 #define INTER_MODES (1 + NEWMV - NEARESTMV) -#if CONFIG_COMPOUND_SINGLEREF -#define INTER_SINGLEREF_COMP_MODES (1 + SR_NEW_NEWMV - SR_NEAREST_NEARMV) -#endif // CONFIG_COMPOUND_SINGLEREF - #define INTER_COMPOUND_MODES (1 + NEW_NEWMV - NEAREST_NEARESTMV) #define SKIP_CONTEXTS 3 +#define SKIP_MODE_CONTEXTS 3 + +#define COMP_INDEX_CONTEXTS 6 +#define COMP_GROUP_IDX_CONTEXTS 6 #define NMV_CONTEXTS 3 -#define NEWMV_MODE_CONTEXTS 7 -#define ZEROMV_MODE_CONTEXTS 2 -#define REFMV_MODE_CONTEXTS 9 -#define DRL_MODE_CONTEXTS 5 +#define NEWMV_MODE_CONTEXTS 6 +#define GLOBALMV_MODE_CONTEXTS 2 +#define REFMV_MODE_CONTEXTS 6 +#define DRL_MODE_CONTEXTS 3 -#define ZEROMV_OFFSET 3 +#define GLOBALMV_OFFSET 3 #define REFMV_OFFSET 4 -#define NEWMV_CTX_MASK ((1 << ZEROMV_OFFSET) - 1) -#define ZEROMV_CTX_MASK ((1 << (REFMV_OFFSET - ZEROMV_OFFSET)) - 1) +#define NEWMV_CTX_MASK ((1 << GLOBALMV_OFFSET) - 1) +#define GLOBALMV_CTX_MASK ((1 << (REFMV_OFFSET - GLOBALMV_OFFSET)) - 1) #define REFMV_CTX_MASK ((1 << (8 - REFMV_OFFSET)) - 1) -#define ALL_ZERO_FLAG_OFFSET 8 -#define SKIP_NEARESTMV_OFFSET 9 -#define SKIP_NEARMV_OFFSET 10 -#define SKIP_NEARESTMV_SUB8X8_OFFSET 11 +#define COMP_NEWMV_CTXS 5 +#define INTER_MODE_CONTEXTS 8 -#define INTER_MODE_CONTEXTS 7 #define DELTA_Q_SMALL 3 #define DELTA_Q_PROBS (DELTA_Q_SMALL) #define DEFAULT_DELTA_Q_RES 4 -#if CONFIG_EXT_DELTA_Q #define DELTA_LF_SMALL 3 #define DELTA_LF_PROBS (DELTA_LF_SMALL) #define DEFAULT_DELTA_LF_RES 2 -#endif /* Segment Feature Masks */ #define MAX_MV_REF_CANDIDATES 2 -#define MAX_REF_MV_STACK_SIZE 16 -#if CONFIG_EXT_PARTITION +#define MAX_REF_MV_STACK_SIZE 8 #define REF_CAT_LEVEL 640 -#else -#define REF_CAT_LEVEL 255 -#endif // CONFIG_EXT_PARTITION #define INTRA_INTER_CONTEXTS 4 #define COMP_INTER_CONTEXTS 5 -#define REF_CONTEXTS 5 +#define REF_CONTEXTS 3 -#if CONFIG_EXT_COMP_REFS #define COMP_REF_TYPE_CONTEXTS 5 #define UNI_COMP_REF_CONTEXTS 3 -#endif // CONFIG_EXT_COMP_REFS - -#if CONFIG_COMPOUND_SINGLEREF -#define COMP_INTER_MODE_CONTEXTS 4 -#endif // CONFIG_COMPOUND_SINGLEREF -#if CONFIG_VAR_TX -#define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 2) +#define TXFM_PARTITION_CONTEXTS ((TX_SIZES - TX_8X8) * 6 - 3) typedef uint8_t TXFM_CONTEXT; -#endif #define NONE_FRAME -1 #define INTRA_FRAME 0 #define LAST_FRAME 1 - -#if CONFIG_EXT_REFS #define LAST2_FRAME 2 #define LAST3_FRAME 3 #define GOLDEN_FRAME 4 @@ -691,94 +558,55 @@ typedef uint8_t TXFM_CONTEXT; #define ALTREF2_FRAME 6 #define ALTREF_FRAME 7 #define LAST_REF_FRAMES (LAST3_FRAME - LAST_FRAME + 1) -#else // !CONFIG_EXT_REFS -#define GOLDEN_FRAME 2 -#define ALTREF_FRAME 3 -#endif // CONFIG_EXT_REFS #define INTER_REFS_PER_FRAME (ALTREF_FRAME - LAST_FRAME + 1) -#define TOTAL_REFS_PER_FRAME (ALTREF_FRAME - INTRA_FRAME + 1) #define FWD_REFS (GOLDEN_FRAME - LAST_FRAME + 1) #define FWD_RF_OFFSET(ref) (ref - LAST_FRAME) -#if CONFIG_EXT_REFS #define BWD_REFS (ALTREF_FRAME - BWDREF_FRAME + 1) #define BWD_RF_OFFSET(ref) (ref - BWDREF_FRAME) -#else -#define BWD_REFS 1 -#define BWD_RF_OFFSET(ref) (ref - ALTREF_FRAME) -#endif // CONFIG_EXT_REFS #define SINGLE_REFS (FWD_REFS + BWD_REFS) -#if CONFIG_EXT_COMP_REFS -typedef enum { - LAST_LAST2_FRAMES, // { LAST_FRAME, LAST2_FRAME } - LAST_LAST3_FRAMES, // { LAST_FRAME, LAST3_FRAME } - LAST_GOLDEN_FRAMES, // { LAST_FRAME, GOLDEN_FRAME } - BWDREF_ALTREF_FRAMES, // { BWDREF_FRAME, ALTREF_FRAME } - UNIDIR_COMP_REFS + +typedef enum ATTRIBUTE_PACKED { + LAST_LAST2_FRAMES, // { LAST_FRAME, LAST2_FRAME } + LAST_LAST3_FRAMES, // { LAST_FRAME, LAST3_FRAME } + LAST_GOLDEN_FRAMES, // { LAST_FRAME, GOLDEN_FRAME } + BWDREF_ALTREF_FRAMES, // { BWDREF_FRAME, ALTREF_FRAME } + LAST2_LAST3_FRAMES, // { LAST2_FRAME, LAST3_FRAME } + LAST2_GOLDEN_FRAMES, // { LAST2_FRAME, GOLDEN_FRAME } + LAST3_GOLDEN_FRAMES, // { LAST3_FRAME, GOLDEN_FRAME } + BWDREF_ALTREF2_FRAMES, // { BWDREF_FRAME, ALTREF2_FRAME } + ALTREF2_ALTREF_FRAMES, // { ALTREF2_FRAME, ALTREF_FRAME } + TOTAL_UNIDIR_COMP_REFS, + // NOTE: UNIDIR_COMP_REFS is the number of uni-directional reference pairs + // that are explicitly signaled. + UNIDIR_COMP_REFS = BWDREF_ALTREF_FRAMES + 1, } UNIDIR_COMP_REF; -#define COMP_REFS (FWD_REFS * BWD_REFS + UNIDIR_COMP_REFS) -#else // !CONFIG_EXT_COMP_REFS -#define COMP_REFS (FWD_REFS * BWD_REFS) -#endif // CONFIG_EXT_COMP_REFS -#define MODE_CTX_REF_FRAMES (TOTAL_REFS_PER_FRAME + COMP_REFS) +#define TOTAL_COMP_REFS (FWD_REFS * BWD_REFS + TOTAL_UNIDIR_COMP_REFS) -#if CONFIG_SUPERTX -#define PARTITION_SUPERTX_CONTEXTS 2 -#define MAX_SUPERTX_BLOCK_SIZE BLOCK_32X32 -#endif // CONFIG_SUPERTX +#define COMP_REFS (FWD_REFS * BWD_REFS + UNIDIR_COMP_REFS) -#if CONFIG_LOOP_RESTORATION -typedef enum { +// NOTE: A limited number of unidirectional reference pairs can be signalled for +// compound prediction. The use of skip mode, on the other hand, makes it +// possible to have a reference pair not listed for explicit signaling. +#define MODE_CTX_REF_FRAMES (REF_FRAMES + TOTAL_COMP_REFS) + +typedef enum ATTRIBUTE_PACKED { RESTORE_NONE, RESTORE_WIENER, RESTORE_SGRPROJ, RESTORE_SWITCHABLE, RESTORE_SWITCHABLE_TYPES = RESTORE_SWITCHABLE, - RESTORE_TYPES, + RESTORE_TYPES = 4, } RestorationType; -#endif // CONFIG_LOOP_RESTORATION -#if CONFIG_FRAME_SUPERRES #define SUPERRES_SCALE_BITS 3 -#define SUPERRES_SCALE_DENOMINATOR_MIN 8 -#endif // CONFIG_FRAME_SUPERRES - -#if CONFIG_LPF_DIRECT -typedef enum { - VERT_HORZ, - DEGREE_30, - DEGREE_45, - DEGREE_60, - DEGREE_120, - DEGREE_135, - DEGREE_150, - FILTER_DEGREES, -} FILTER_DEGREE; -#endif // CONFIG_LPF_DIRECT - -#if CONFIG_OBU -// R19 -typedef enum { - OBU_SEQUENCE_HEADER = 1, - OBU_TD = 2, - OBU_FRAME_HEADER = 3, - OBU_TILE_GROUP = 4, - OBU_METADATA = 5, - OBU_PADDING = 15, -} OBU_TYPE; -#endif +#define SUPERRES_SCALE_DENOMINATOR_MIN (SCALE_NUMERATOR + 1) -#if CONFIG_LGT_FROM_PRED -#define LGT_SIZES 2 -// Note: at least one of LGT_FROM_PRED_INTRA and LGT_FROM_PRED_INTER must be 1 -#define LGT_FROM_PRED_INTRA 1 -#define LGT_FROM_PRED_INTER 1 -// LGT_SL_INTRA: LGTs with a mode-dependent first self-loop and a break point -#define LGT_SL_INTRA 0 -#endif // CONFIG_LGT_FROM_PRED +// In large_scale_tile coding, external references are used. +#define MAX_EXTERNAL_REFERENCES 128 #ifdef __cplusplus } // extern "C" -- cgit v1.2.3 From b8df135c97a854c2ff9b4394b016649c601177fa Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:00:02 -0500 Subject: Update libaom to rev b25610052a1398032320008d69b51d2da94f5928 --- third_party/aom/av1/common/enums.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h index a37ee9f24..689c25f30 100644 --- a/third_party/aom/av1/common/enums.h +++ b/third_party/aom/av1/common/enums.h @@ -557,6 +557,7 @@ typedef uint8_t TXFM_CONTEXT; #define BWDREF_FRAME 5 #define ALTREF2_FRAME 6 #define ALTREF_FRAME 7 +#define EXTREF_FRAME REF_FRAMES #define LAST_REF_FRAMES (LAST3_FRAME - LAST_FRAME + 1) #define INTER_REFS_PER_FRAME (ALTREF_FRAME - LAST_FRAME + 1) @@ -607,6 +608,7 @@ typedef enum ATTRIBUTE_PACKED { // In large_scale_tile coding, external references are used. #define MAX_EXTERNAL_REFERENCES 128 +#define MAX_TILES 512 #ifdef __cplusplus } // extern "C" -- cgit v1.2.3 From d2499ead93dc4298c0882fe98902acb1b5209f99 Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 23:05:00 -0500 Subject: Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591 --- third_party/aom/av1/common/enums.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'third_party/aom/av1/common/enums.h') diff --git a/third_party/aom/av1/common/enums.h b/third_party/aom/av1/common/enums.h index 689c25f30..869c06ef2 100644 --- a/third_party/aom/av1/common/enums.h +++ b/third_party/aom/av1/common/enums.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef AV1_COMMON_ENUMS_H_ -#define AV1_COMMON_ENUMS_H_ +#ifndef AOM_AV1_COMMON_ENUMS_H_ +#define AOM_AV1_COMMON_ENUMS_H_ #include "config/aom_config.h" @@ -274,7 +274,7 @@ typedef enum ATTRIBUTE_PACKED { TX_TYPES, } TX_TYPE; -typedef enum { +typedef enum ATTRIBUTE_PACKED { REG_REG, REG_SMOOTH, REG_SHARP, @@ -438,6 +438,8 @@ typedef enum ATTRIBUTE_PACKED { COMP_INTER_MODE_START = NEAREST_NEARESTMV, COMP_INTER_MODE_END = MB_MODE_COUNT, COMP_INTER_MODE_NUM = COMP_INTER_MODE_END - COMP_INTER_MODE_START, + INTER_MODE_START = NEARESTMV, + INTER_MODE_END = MB_MODE_COUNT, INTRA_MODES = PAETH_PRED + 1, // PAETH_PRED has to be the last intra mode. INTRA_INVALID = MB_MODE_COUNT // For uv_mode in inter blocks } PREDICTION_MODE; @@ -478,7 +480,7 @@ typedef enum ATTRIBUTE_PACKED { INTERINTRA_MODES } INTERINTRA_MODE; -typedef enum { +typedef enum ATTRIBUTE_PACKED { COMPOUND_AVERAGE, COMPOUND_WEDGE, COMPOUND_DIFFWTD, @@ -614,4 +616,4 @@ typedef enum ATTRIBUTE_PACKED { } // extern "C" #endif -#endif // AV1_COMMON_ENUMS_H_ +#endif // AOM_AV1_COMMON_ENUMS_H_ -- cgit v1.2.3