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
dde6e2b1
Commit
dde6e2b1
authored
Jun 23, 2016
by
Jingning Han
Committed by
Gerrit Code Review
Jun 23, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Enforce trellis optimization for 1-pass encoding" into nextgenv2
parents
76ff9b30
8aca4c34
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
17 deletions
+8
-17
vp10/encoder/encodemb.c
vp10/encoder/encodemb.c
+8
-17
No files found.
vp10/encoder/encodemb.c
View file @
dde6e2b1
...
...
@@ -1053,7 +1053,7 @@ static void encode_block(int plane, int block, int blk_row, int blk_col,
}
#endif
if
(
x
->
optimize
&&
p
->
eobs
[
block
])
{
if
(
p
->
eobs
[
block
])
{
int
ctx
;
#if CONFIG_VAR_TX
switch
(
tx_size
)
{
...
...
@@ -1234,24 +1234,15 @@ void vp10_encode_sb(MACROBLOCK *x, BLOCK_SIZE bsize) {
int
idx
,
idy
;
int
block
=
0
;
int
step
=
1
<<
(
max_tx_size
*
2
);
vp10_get_entropy_contexts
(
bsize
,
TX_4X4
,
pd
,
ctx
.
ta
[
plane
],
ctx
.
tl
[
plane
]);
#else
const
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
const
TX_SIZE
tx_size
=
plane
?
get_uv_tx_size
(
mbmi
,
pd
)
:
mbmi
->
tx_size
;
vp10_get_entropy_contexts
(
bsize
,
tx_size
,
pd
,
ctx
.
ta
[
plane
],
ctx
.
tl
[
plane
]);
#endif
vp10_subtract_plane
(
x
,
bsize
,
plane
);
arg
.
ta
=
ctx
.
ta
[
plane
];
arg
.
tl
=
ctx
.
tl
[
plane
];
if
(
x
->
optimize
)
{
#if CONFIG_VAR_TX
vp10_get_entropy_contexts
(
bsize
,
TX_4X4
,
pd
,
ctx
.
ta
[
plane
],
ctx
.
tl
[
plane
]);
#else
const
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
const
TX_SIZE
tx_size
=
plane
?
get_uv_tx_size
(
mbmi
,
pd
)
:
mbmi
->
tx_size
;
vp10_get_entropy_contexts
(
bsize
,
tx_size
,
pd
,
ctx
.
ta
[
plane
],
ctx
.
tl
[
plane
]);
#endif
}
#if CONFIG_VAR_TX
for
(
idy
=
0
;
idy
<
mi_height
;
idy
+=
bh
)
{
for
(
idx
=
0
;
idx
<
mi_width
;
idx
+=
bh
)
{
...
...
@@ -1351,7 +1342,7 @@ void vp10_encode_block_intra(int plane, int block, int blk_row, int blk_col,
#endif // CONFIG_NEW_QUANT
a
=
&
args
->
ta
[
blk_col
];
l
=
&
args
->
tl
[
blk_row
];
if
(
x
->
optimize
&&
p
->
eobs
[
block
])
{
if
(
p
->
eobs
[
block
])
{
int
ctx
;
ctx
=
combine_entropy_contexts
(
*
a
,
*
l
);
*
a
=
*
l
=
vp10_optimize_b
(
x
,
plane
,
block
,
tx_size
,
ctx
)
>
0
;
...
...
@@ -1388,7 +1379,7 @@ void vp10_encode_intra_block_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane,
struct
encode_b_args
arg
=
{
x
,
NULL
,
&
xd
->
mi
[
0
]
->
mbmi
.
skip
,
ta
,
tl
};
if
(
enable_optimize_b
&&
x
->
optimize
)
{
if
(
enable_optimize_b
)
{
const
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
const
TX_SIZE
tx_size
=
plane
?
get_uv_tx_size
(
&
xd
->
mi
[
0
]
->
mbmi
,
pd
)
:
xd
->
mi
[
0
]
->
mbmi
.
tx_size
;
...
...
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