Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
ab3042ba
Commit
ab3042ba
authored
Sep 03, 2015
by
Debargha Mukherjee
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Some refactoring of EXT_TX
Change-Id: I61359787fdacdeb245e2798031a6e06e4afb83e0
parent
9fc691ef
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
55 additions
and
16 deletions
+55
-16
vp10/common/enums.h
vp10/common/enums.h
+1
-2
vp10/common/scan.c
vp10/common/scan.c
+52
-11
vp10/common/scan.h
vp10/common/scan.h
+1
-2
vp10/encoder/rdopt.c
vp10/encoder/rdopt.c
+1
-1
No files found.
vp10/common/enums.h
View file @
ab3042ba
...
...
@@ -94,15 +94,14 @@ typedef enum {
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
TX_TYPES
,
#if CONFIG_EXT_TX
FLIPADST_DCT
=
4
,
DCT_FLIPADST
=
5
,
FLIPADST_FLIPADST
=
6
,
ADST_FLIPADST
=
7
,
FLIPADST_ADST
=
8
,
TOTAL_TX_TYPES
,
#endif // CONFIG_EXT_TX
TX_TYPES
,
}
TX_TYPE
;
#if CONFIG_EXT_TX
...
...
vp10/common/scan.c
View file @
ab3042ba
...
...
@@ -695,39 +695,53 @@ DECLARE_ALIGNED(16, static const int16_t, vp10_default_iscan_32x32[1024]) = {
1023
,
};
const
scan_order
vp10_default_scan_orders
[
TX_SIZES
]
=
{
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
};
#if CONFIG_EXT_TX
const
scan_order
vp10_intra_scan_orders
[
TX_SIZES
][
TX_TYPES
]
=
{
{
// TX_4X4
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
row_scan_4x4
,
vp10_row_iscan_4x4
,
row_scan_4x4_neighbors
},
{
col_scan_4x4
,
vp10_col_iscan_4x4
,
col_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
}
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
},
{
// TX_8X8
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
row_scan_8x8
,
vp10_row_iscan_8x8
,
row_scan_8x8_neighbors
},
{
col_scan_8x8
,
vp10_col_iscan_8x8
,
col_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
}
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
},
{
// TX_16X16
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
row_scan_16x16
,
vp10_row_iscan_16x16
,
row_scan_16x16_neighbors
},
{
col_scan_16x16
,
vp10_col_iscan_16x16
,
col_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
}
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
},
{
// TX_32X32
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
}
};
#if CONFIG_EXT_TX
const
scan_order
vp10_inter_scan_orders
[
TX_SIZES
][
TOTAL_TX_TYPES
]
=
{
const
scan_order
vp10_inter_scan_orders
[
TX_SIZES
][
TX_TYPES
]
=
{
{
// TX_4X4
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
...
...
@@ -770,4 +784,31 @@ const scan_order vp10_inter_scan_orders[TX_SIZES][TOTAL_TX_TYPES] = {
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
}
};
#else // CONFIG_EXT_TX
const
scan_order
vp10_intra_scan_orders
[
TX_SIZES
][
TX_TYPES
]
=
{
{
// TX_4X4
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
},
{
row_scan_4x4
,
vp10_row_iscan_4x4
,
row_scan_4x4_neighbors
},
{
col_scan_4x4
,
vp10_col_iscan_4x4
,
col_scan_4x4_neighbors
},
{
default_scan_4x4
,
vp10_default_iscan_4x4
,
default_scan_4x4_neighbors
}
},
{
// TX_8X8
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
},
{
row_scan_8x8
,
vp10_row_iscan_8x8
,
row_scan_8x8_neighbors
},
{
col_scan_8x8
,
vp10_col_iscan_8x8
,
col_scan_8x8_neighbors
},
{
default_scan_8x8
,
vp10_default_iscan_8x8
,
default_scan_8x8_neighbors
}
},
{
// TX_16X16
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
},
{
row_scan_16x16
,
vp10_row_iscan_16x16
,
row_scan_16x16_neighbors
},
{
col_scan_16x16
,
vp10_col_iscan_16x16
,
col_scan_16x16_neighbors
},
{
default_scan_16x16
,
vp10_default_iscan_16x16
,
default_scan_16x16_neighbors
}
},
{
// TX_32X32
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
{
default_scan_32x32
,
vp10_default_iscan_32x32
,
default_scan_32x32_neighbors
},
}
};
#endif // CONFIG_EXT_TX
vp10/common/scan.h
View file @
ab3042ba
...
...
@@ -29,7 +29,6 @@ typedef struct {
const
int16_t
*
neighbors
;
}
scan_order
;
extern
const
scan_order
vp10_default_scan_orders
[
TX_SIZES
];
extern
const
scan_order
vp10_intra_scan_orders
[
TX_SIZES
][
TX_TYPES
];
static
INLINE
int
get_coef_context
(
const
int16_t
*
neighbors
,
...
...
@@ -44,7 +43,7 @@ static INLINE const scan_order *get_intra_scan(TX_SIZE tx_size,
}
#if CONFIG_EXT_TX
extern
const
scan_order
vp10_inter_scan_orders
[
TX_SIZES
][
TOTAL_
TX_TYPES
];
extern
const
scan_order
vp10_inter_scan_orders
[
TX_SIZES
][
TX_TYPES
];
static
INLINE
const
scan_order
*
get_inter_scan
(
TX_SIZE
tx_size
,
TX_TYPE
tx_type
)
{
...
...
vp10/encoder/rdopt.c
View file @
ab3042ba
...
...
@@ -54,7 +54,7 @@
#define NEW_MV_DISCOUNT_FACTOR 8
#if CONFIG_EXT_TX
const
double
ext_tx_th
=
0
.
9
8
;
const
double
ext_tx_th
=
0
.
9
9
;
#endif
typedef
struct
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment