Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
0109d757
Commit
0109d757
authored
Feb 12, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Feb 12, 2014
Browse files
Merge "Removing vp9_foreach_transformed_block_uv() function."
parents
4618952a
79dd1f84
Changes
5
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.c
View file @
0109d757
...
...
@@ -98,16 +98,6 @@ void vp9_foreach_transformed_block(const MACROBLOCKD* const xd,
vp9_foreach_transformed_block_in_plane
(
xd
,
bsize
,
plane
,
visit
,
arg
);
}
void
vp9_foreach_transformed_block_uv
(
const
MACROBLOCKD
*
const
xd
,
BLOCK_SIZE
bsize
,
foreach_transformed_block_visitor
visit
,
void
*
arg
)
{
int
plane
;
for
(
plane
=
1
;
plane
<
MAX_MB_PLANE
;
plane
++
)
vp9_foreach_transformed_block_in_plane
(
xd
,
bsize
,
plane
,
visit
,
arg
);
}
void
vp9_set_contexts
(
const
MACROBLOCKD
*
xd
,
struct
macroblockd_plane
*
pd
,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
,
int
has_eob
,
int
aoff
,
int
loff
)
{
...
...
vp9/common/vp9_blockd.h
View file @
0109d757
...
...
@@ -313,11 +313,6 @@ void vp9_foreach_transformed_block(
const
MACROBLOCKD
*
const
xd
,
BLOCK_SIZE
bsize
,
foreach_transformed_block_visitor
visit
,
void
*
arg
);
void
vp9_foreach_transformed_block_uv
(
const
MACROBLOCKD
*
const
xd
,
BLOCK_SIZE
bsize
,
foreach_transformed_block_visitor
visit
,
void
*
arg
);
static
INLINE
void
txfrm_block_to_raster_xy
(
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
,
int
block
,
int
*
x
,
int
*
y
)
{
...
...
vp9/encoder/vp9_encodeframe.c
View file @
0109d757
...
...
@@ -2847,9 +2847,10 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled,
}
if
(
!
is_inter_block
(
mbmi
))
{
int
plane
;
mbmi
->
skip_coeff
=
1
;
vp9_encode_intra_block_y
(
x
,
MAX
(
bsize
,
BLOCK_8X8
));
vp9_encode_intra_block_
uv
(
x
,
MAX
(
bsize
,
BLOCK_8X8
));
for
(
plane
=
0
;
plane
<
MAX_MB_PLANE
;
++
plane
)
vp9_encode_intra_block_
plane
(
x
,
MAX
(
bsize
,
BLOCK_8X8
)
,
plane
);
if
(
output_enabled
)
sum_intra_stats
(
&
cm
->
counts
,
mi
);
}
else
{
...
...
vp9/encoder/vp9_encodemb.c
View file @
0109d757
...
...
@@ -659,18 +659,13 @@ void vp9_encode_block_intra(MACROBLOCK *x, int plane, int block,
}
void
vp9_encode_intra_block_
y
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
)
{
void
vp9_encode_intra_block_
plane
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
,
int
plane
)
{
const
MACROBLOCKD
*
const
xd
=
&
x
->
e_mbd
;
struct
encode_b_args
arg
=
{
x
,
NULL
,
&
xd
->
mi_8x8
[
0
]
->
mbmi
.
skip_coeff
};
vp9_foreach_transformed_block_in_plane
(
xd
,
bsize
,
0
,
encode_block_intra
,
vp9_foreach_transformed_block_in_plane
(
xd
,
bsize
,
plane
,
encode_block_intra
,
&
arg
);
}
void
vp9_encode_intra_block_uv
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
)
{
const
MACROBLOCKD
*
const
xd
=
&
x
->
e_mbd
;
struct
encode_b_args
arg
=
{
x
,
NULL
,
&
xd
->
mi_8x8
[
0
]
->
mbmi
.
skip_coeff
};
vp9_foreach_transformed_block_uv
(
xd
,
bsize
,
encode_block_intra
,
&
arg
);
}
int
vp9_encode_intra
(
MACROBLOCK
*
x
,
int
use_16x16_pred
)
{
MB_MODE_INFO
*
mbmi
=
&
x
->
e_mbd
.
mi_8x8
[
0
]
->
mbmi
;
...
...
@@ -680,6 +675,6 @@ int vp9_encode_intra(MACROBLOCK *x, int use_16x16_pred) {
mbmi
->
tx_size
=
use_16x16_pred
?
(
mbmi
->
sb_type
>=
BLOCK_16X16
?
TX_16X16
:
TX_8X8
)
:
TX_4X4
;
vp9_encode_intra_block_
y
(
x
,
mbmi
->
sb_type
);
vp9_encode_intra_block_
plane
(
x
,
mbmi
->
sb_type
,
0
);
return
vp9_get_mb_ss
(
x
->
plane
[
0
].
src_diff
);
}
vp9/encoder/vp9_encodemb.h
View file @
0109d757
...
...
@@ -34,8 +34,7 @@ void vp9_encode_block_intra(MACROBLOCK *x, int plane, int block,
BLOCK_SIZE
plane_bsize
,
TX_SIZE
tx_size
,
unsigned
char
*
skip_coeff
);
void
vp9_encode_intra_block_y
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
);
void
vp9_encode_intra_block_uv
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
);
void
vp9_encode_intra_block_plane
(
MACROBLOCK
*
x
,
BLOCK_SIZE
bsize
,
int
plane
);
int
vp9_encode_intra
(
MACROBLOCK
*
x
,
int
use_16x16_pred
);
...
...
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