Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
5ae09677
Commit
5ae09677
authored
Jun 25, 2013
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Jun 25, 2013
Browse files
Merge "Removing unused code."
parents
cd6932db
87ee34aa
Changes
6
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
5ae09677
...
...
@@ -527,34 +527,30 @@ static TX_TYPE txfm_map(MB_PREDICTION_MODE bmode) {
}
static
TX_TYPE
get_tx_type_4x4
(
const
MACROBLOCKD
*
xd
,
int
ib
)
{
TX_TYPE
tx_type
;
MODE_INFO
*
mi
=
xd
->
mode_info_context
;
MODE_INFO
*
const
mi
=
xd
->
mode_info_context
;
MB_MODE_INFO
*
const
mbmi
=
&
mi
->
mbmi
;
if
(
xd
->
lossless
||
mbmi
->
ref_frame
[
0
]
!=
INTRA_FRAME
)
return
DCT_DCT
;
if
(
mbmi
->
sb_type
<
BLOCK_SIZE_SB8X8
)
{
tx_type
=
txfm_map
(
mi
->
bmi
[
ib
].
as_mode
.
first
);
return
txfm_map
(
mi
->
bmi
[
ib
].
as_mode
.
first
);
}
else
{
assert
(
mbmi
->
mode
<=
TM_PRED
);
tx_type
=
txfm_map
(
mbmi
->
mode
);
return
txfm_map
(
mbmi
->
mode
);
}
return
tx_type
;
}
static
TX_TYPE
get_tx_type_8x8
(
const
MACROBLOCKD
*
xd
,
int
ib
)
{
TX_TYPE
tx_type
=
DCT_DCT
;
if
(
xd
->
mode_info_context
->
mbmi
.
mode
<=
TM_PRED
)
{
tx_type
=
txfm_map
(
xd
->
mode_info_context
->
mbmi
.
mode
);
}
return
tx_type
;
static
TX_TYPE
get_tx_type_8x8
(
const
MACROBLOCKD
*
xd
)
{
return
xd
->
mode_info_context
->
mbmi
.
mode
<=
TM_PRED
?
txfm_map
(
xd
->
mode_info_context
->
mbmi
.
mode
)
:
DCT_DCT
;
}
static
TX_TYPE
get_tx_type_16x16
(
const
MACROBLOCKD
*
xd
,
int
ib
)
{
TX_TYPE
tx_type
=
DCT_DCT
;
if
(
xd
->
mode_info_context
->
mbmi
.
mode
<=
TM_PRED
)
{
tx_type
=
txfm_map
(
xd
->
mode_info_context
->
mbmi
.
mode
);
}
return
tx_type
;
static
TX_TYPE
get_tx_type_16x16
(
const
MACROBLOCKD
*
xd
)
{
return
xd
->
mode_info_context
->
mbmi
.
mode
<=
TM_PRED
?
txfm_map
(
xd
->
mode_info_context
->
mbmi
.
mode
)
:
DCT_DCT
;
}
void
vp9_setup_block_dptrs
(
MACROBLOCKD
*
xd
,
...
...
vp9/decoder/vp9_decodframe.c
View file @
5ae09677
...
...
@@ -218,11 +218,11 @@ static void decode_block(int plane, int block, BLOCK_SIZE_TYPE bsize,
vp9_iht_add_c
(
tx_type
,
qcoeff
,
dst
,
stride
,
pd
->
eobs
[
block
]);
break
;
case
TX_8X8
:
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
vp9_iht_add_8x8_c
(
tx_type
,
qcoeff
,
dst
,
stride
,
pd
->
eobs
[
block
]);
break
;
case
TX_16X16
:
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
vp9_iht_add_16x16_c
(
tx_type
,
qcoeff
,
dst
,
stride
,
pd
->
eobs
[
block
]);
break
;
case
TX_32X32
:
...
...
vp9/decoder/vp9_detokenize.c
View file @
5ae09677
...
...
@@ -113,7 +113,6 @@ static int decode_coefs(FRAME_CONTEXT *fc, const MACROBLOCKD *xd,
vp9_prob
*
prob
;
vp9_coeff_count_model
*
coef_counts
;
const
int
ref
=
xd
->
mode_info_context
->
mbmi
.
ref_frame
[
0
]
!=
INTRA_FRAME
;
TX_TYPE
tx_type
=
DCT_DCT
;
const
int
*
scan
,
*
nb
;
uint8_t
token_cache
[
1024
];
const
uint8_t
*
band_translate
;
...
...
@@ -126,8 +125,8 @@ static int decode_coefs(FRAME_CONTEXT *fc, const MACROBLOCKD *xd,
switch
(
txfm_size
)
{
default:
case
TX_4X4
:
{
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_4x4
(
xd
,
block_idx
)
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_4x4
(
xd
,
block_idx
)
:
DCT_DCT
;
scan
=
get_scan_4x4
(
tx_type
);
above_ec
=
A
[
0
]
!=
0
;
left_ec
=
L
[
0
]
!=
0
;
...
...
@@ -136,12 +135,8 @@ static int decode_coefs(FRAME_CONTEXT *fc, const MACROBLOCKD *xd,
break
;
}
case
TX_8X8
:
{
const
BLOCK_SIZE_TYPE
sb_type
=
xd
->
mode_info_context
->
mbmi
.
sb_type
;
const
int
sz
=
1
+
b_width_log2
(
sb_type
);
const
int
x
=
block_idx
&
((
1
<<
sz
)
-
1
);
const
int
y
=
block_idx
-
x
;
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_8x8
(
xd
,
y
+
(
x
>>
1
))
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
scan
=
get_scan_8x8
(
tx_type
);
above_ec
=
(
A
[
0
]
+
A
[
1
])
!=
0
;
left_ec
=
(
L
[
0
]
+
L
[
1
])
!=
0
;
...
...
@@ -150,12 +145,8 @@ static int decode_coefs(FRAME_CONTEXT *fc, const MACROBLOCKD *xd,
break
;
}
case
TX_16X16
:
{
const
BLOCK_SIZE_TYPE
sb_type
=
xd
->
mode_info_context
->
mbmi
.
sb_type
;
const
int
sz
=
2
+
b_width_log2
(
sb_type
);
const
int
x
=
block_idx
&
((
1
<<
sz
)
-
1
);
const
int
y
=
block_idx
-
x
;
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_16x16
(
xd
,
y
+
(
x
>>
2
))
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
scan
=
get_scan_16x16
(
tx_type
);
above_ec
=
(
A
[
0
]
+
A
[
1
]
+
A
[
2
]
+
A
[
3
])
!=
0
;
left_ec
=
(
L
[
0
]
+
L
[
1
]
+
L
[
2
]
+
L
[
3
])
!=
0
;
...
...
vp9/encoder/vp9_encodemb.c
View file @
5ae09677
...
...
@@ -164,14 +164,14 @@ static void optimize_b(VP9_COMMON *const cm, MACROBLOCK *mb,
break
;
}
case
TX_8X8
:
{
const
TX_TYPE
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
,
ib
)
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
scan
=
get_scan_8x8
(
tx_type
);
default_eob
=
64
;
band_translate
=
vp9_coefband_trans_8x8plus
;
break
;
}
case
TX_16X16
:
{
const
TX_TYPE
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
,
ib
)
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
scan
=
get_scan_16x16
(
tx_type
);
default_eob
=
256
;
band_translate
=
vp9_coefband_trans_8x8plus
;
...
...
@@ -468,14 +468,14 @@ static void xform_quant(int plane, int block, BLOCK_SIZE_TYPE bsize,
vp9_short_fdct32x32
(
src_diff
,
coeff
,
bw
*
2
);
break
;
case
TX_16X16
:
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
if
(
tx_type
!=
DCT_DCT
)
vp9_short_fht16x16
(
src_diff
,
coeff
,
bw
,
tx_type
);
else
x
->
fwd_txm16x16
(
src_diff
,
coeff
,
bw
*
2
);
break
;
case
TX_8X8
:
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
if
(
tx_type
!=
DCT_DCT
)
vp9_short_fht8x8
(
src_diff
,
coeff
,
bw
,
tx_type
);
else
...
...
@@ -519,14 +519,14 @@ static void encode_block(int plane, int block, BLOCK_SIZE_TYPE bsize,
vp9_short_idct32x32_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
break
;
case
TX_16X16
:
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
if
(
tx_type
==
DCT_DCT
)
vp9_short_idct16x16_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
else
vp9_short_iht16x16_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
tx_type
);
break
;
case
TX_8X8
:
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
if
(
tx_type
==
DCT_DCT
)
vp9_short_idct8x8_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
else
...
...
@@ -659,14 +659,14 @@ static void encode_block_intra(int plane, int block, BLOCK_SIZE_TYPE bsize,
vp9_short_idct32x32_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
break
;
case
TX_16X16
:
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
if
(
tx_type
==
DCT_DCT
)
vp9_short_idct16x16_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
else
vp9_short_iht16x16_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
,
tx_type
);
break
;
case
TX_8X8
:
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
,
raster_block
)
:
DCT_DCT
;
tx_type
=
plane
==
0
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
if
(
tx_type
==
DCT_DCT
)
vp9_short_idct8x8_add
(
dqcoeff
,
dst
,
pd
->
dst
.
stride
);
else
...
...
vp9/encoder/vp9_rdopt.c
View file @
5ae09677
...
...
@@ -337,11 +337,8 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
break
;
}
case
TX_8X8
:
{
const
BLOCK_SIZE_TYPE
sb_type
=
xd
->
mode_info_context
->
mbmi
.
sb_type
;
const
int
sz
=
1
+
b_width_log2
(
sb_type
);
const
int
x
=
block
&
((
1
<<
sz
)
-
1
),
y
=
block
-
x
;
TX_TYPE
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_8x8
(
xd
,
y
+
(
x
>>
1
))
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
above_ec
=
(
A
[
0
]
+
A
[
1
])
!=
0
;
left_ec
=
(
L
[
0
]
+
L
[
1
])
!=
0
;
scan
=
get_scan_8x8
(
tx_type
);
...
...
@@ -350,11 +347,8 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
break
;
}
case
TX_16X16
:
{
const
BLOCK_SIZE_TYPE
sb_type
=
xd
->
mode_info_context
->
mbmi
.
sb_type
;
const
int
sz
=
2
+
b_width_log2
(
sb_type
);
const
int
x
=
block
&
((
1
<<
sz
)
-
1
),
y
=
block
-
x
;
TX_TYPE
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_16x16
(
xd
,
y
+
(
x
>>
2
))
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
scan
=
get_scan_16x16
(
tx_type
);
seg_eob
=
256
;
above_ec
=
(
A
[
0
]
+
A
[
1
]
+
A
[
2
]
+
A
[
3
])
!=
0
;
...
...
@@ -370,7 +364,7 @@ static INLINE int cost_coeffs(VP9_COMMON *const cm, MACROBLOCK *mb,
band_translate
=
vp9_coefband_trans_8x8plus
;
break
;
default:
a
bo
rt
();
a
sse
rt
(
0
);
break
;
}
assert
(
eob
<=
seg_eob
);
...
...
vp9/encoder/vp9_tokenize.c
View file @
5ae09677
...
...
@@ -133,8 +133,7 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize,
const
int
ref
=
mbmi
->
ref_frame
[
0
]
!=
INTRA_FRAME
;
ENTROPY_CONTEXT
above_ec
,
left_ec
;
uint8_t
token_cache
[
1024
];
TX_TYPE
tx_type
=
DCT_DCT
;
const
uint8_t
*
band_translate
;
const
uint8_t
*
band_translate
;
assert
((
!
type
&&
!
plane
)
||
(
type
&&
plane
));
counts
=
cpi
->
coef_counts
[
tx_size
];
...
...
@@ -142,8 +141,8 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize,
switch
(
tx_size
)
{
default:
case
TX_4X4
:
{
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_4x4
(
xd
,
block
)
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_4x4
(
xd
,
block
)
:
DCT_DCT
;
above_ec
=
A
[
0
]
!=
0
;
left_ec
=
L
[
0
]
!=
0
;
seg_eob
=
16
;
...
...
@@ -152,10 +151,8 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize,
break
;
}
case
TX_8X8
:
{
const
int
sz
=
1
+
b_width_log2
(
sb_type
);
const
int
x
=
block
&
((
1
<<
sz
)
-
1
),
y
=
block
-
x
;
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_8x8
(
xd
,
y
+
(
x
>>
1
))
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_8x8
(
xd
)
:
DCT_DCT
;
above_ec
=
(
A
[
0
]
+
A
[
1
])
!=
0
;
left_ec
=
(
L
[
0
]
+
L
[
1
])
!=
0
;
seg_eob
=
64
;
...
...
@@ -164,10 +161,8 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize,
break
;
}
case
TX_16X16
:
{
const
int
sz
=
2
+
b_width_log2
(
sb_type
);
const
int
x
=
block
&
((
1
<<
sz
)
-
1
),
y
=
block
-
x
;
tx_type
=
(
type
==
PLANE_TYPE_Y_WITH_DC
)
?
get_tx_type_16x16
(
xd
,
y
+
(
x
>>
2
))
:
DCT_DCT
;
const
TX_TYPE
tx_type
=
type
==
PLANE_TYPE_Y_WITH_DC
?
get_tx_type_16x16
(
xd
)
:
DCT_DCT
;
above_ec
=
(
A
[
0
]
+
A
[
1
]
+
A
[
2
]
+
A
[
3
])
!=
0
;
left_ec
=
(
L
[
0
]
+
L
[
1
]
+
L
[
2
]
+
L
[
3
])
!=
0
;
seg_eob
=
256
;
...
...
@@ -263,8 +258,7 @@ int vp9_sb_is_skippable(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize) {
int
vp9_sby_is_skippable
(
MACROBLOCKD
*
xd
,
BLOCK_SIZE_TYPE
bsize
)
{
int
result
=
1
;
struct
is_skippable_args
args
=
{
xd
,
&
result
};
foreach_transformed_block_in_plane
(
xd
,
bsize
,
0
,
is_skippable
,
&
args
);
foreach_transformed_block_in_plane
(
xd
,
bsize
,
0
,
is_skippable
,
&
args
);
return
result
;
}
...
...
Write
Preview
Supports
Markdown
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