Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
e8032a5f
Commit
e8032a5f
authored
Aug 25, 2015
by
Shunyao Li
Committed by
Gerrit Code Review
Aug 25, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Add transform size rate for intra skip mode in rdopt"
parents
071b781e
aa006d71
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
16 deletions
+30
-16
vp10/encoder/rdopt.c
vp10/encoder/rdopt.c
+15
-8
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+15
-8
No files found.
vp10/encoder/rdopt.c
View file @
e8032a5f
...
...
@@ -646,22 +646,29 @@ static void choose_tx_size_from_rd(VP10_COMP *cpi, MACROBLOCK *x,
}
for
(
n
=
start_tx
;
n
>=
end_tx
;
n
--
)
{
int
r_tx_size
=
0
;
for
(
m
=
0
;
m
<=
n
-
(
n
==
(
int
)
max_tx_size
);
m
++
)
{
if
(
m
==
n
)
r_tx_size
+=
vp10_cost_zero
(
tx_probs
[
m
]);
else
r_tx_size
+=
vp10_cost_one
(
tx_probs
[
m
]);
}
txfm_rd_in_plane
(
x
,
&
r
[
n
][
0
],
&
d
[
n
],
&
s
[
n
],
&
sse
[
n
],
ref_best_rd
,
0
,
bs
,
n
,
cpi
->
sf
.
use_fast_coef_costing
);
r
[
n
][
1
]
=
r
[
n
][
0
];
if
(
r
[
n
][
0
]
<
INT_MAX
)
{
for
(
m
=
0
;
m
<=
n
-
(
n
==
(
int
)
max_tx_size
);
m
++
)
{
if
(
m
==
n
)
r
[
n
][
1
]
+=
vp10_cost_zero
(
tx_probs
[
m
]);
else
r
[
n
][
1
]
+=
vp10_cost_one
(
tx_probs
[
m
]);
}
r
[
n
][
1
]
+=
r_tx_size
;
}
if
(
d
[
n
]
==
INT64_MAX
)
{
if
(
d
[
n
]
==
INT64_MAX
||
r
[
n
][
0
]
==
INT_MAX
)
{
rd
[
n
][
0
]
=
rd
[
n
][
1
]
=
INT64_MAX
;
}
else
if
(
s
[
n
])
{
rd
[
n
][
0
]
=
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
,
d
[
n
]);
if
(
is_inter_block
(
mbmi
))
{
rd
[
n
][
0
]
=
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
,
sse
[
n
]);
}
else
{
rd
[
n
][
0
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
,
sse
[
n
]);
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
+
r_tx_size
,
sse
[
n
]);
}
}
else
{
rd
[
n
][
0
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
r
[
n
][
0
]
+
s0
,
d
[
n
]);
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
r
[
n
][
1
]
+
s0
,
d
[
n
]);
...
...
vp9/encoder/vp9_rdopt.c
View file @
e8032a5f
...
...
@@ -644,22 +644,29 @@ static void choose_tx_size_from_rd(VP9_COMP *cpi, MACROBLOCK *x,
}
for
(
n
=
start_tx
;
n
>=
end_tx
;
n
--
)
{
int
r_tx_size
=
0
;
for
(
m
=
0
;
m
<=
n
-
(
n
==
(
int
)
max_tx_size
);
m
++
)
{
if
(
m
==
n
)
r_tx_size
+=
vp9_cost_zero
(
tx_probs
[
m
]);
else
r_tx_size
+=
vp9_cost_one
(
tx_probs
[
m
]);
}
txfm_rd_in_plane
(
x
,
&
r
[
n
][
0
],
&
d
[
n
],
&
s
[
n
],
&
sse
[
n
],
ref_best_rd
,
0
,
bs
,
n
,
cpi
->
sf
.
use_fast_coef_costing
);
r
[
n
][
1
]
=
r
[
n
][
0
];
if
(
r
[
n
][
0
]
<
INT_MAX
)
{
for
(
m
=
0
;
m
<=
n
-
(
n
==
(
int
)
max_tx_size
);
m
++
)
{
if
(
m
==
n
)
r
[
n
][
1
]
+=
vp9_cost_zero
(
tx_probs
[
m
]);
else
r
[
n
][
1
]
+=
vp9_cost_one
(
tx_probs
[
m
]);
}
r
[
n
][
1
]
+=
r_tx_size
;
}
if
(
d
[
n
]
==
INT64_MAX
)
{
if
(
d
[
n
]
==
INT64_MAX
||
r
[
n
][
0
]
==
INT_MAX
)
{
rd
[
n
][
0
]
=
rd
[
n
][
1
]
=
INT64_MAX
;
}
else
if
(
s
[
n
])
{
rd
[
n
][
0
]
=
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
,
d
[
n
]);
if
(
is_inter_block
(
mbmi
))
{
rd
[
n
][
0
]
=
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
,
sse
[
n
]);
}
else
{
rd
[
n
][
0
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
,
sse
[
n
]);
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
s1
+
r_tx_size
,
sse
[
n
]);
}
}
else
{
rd
[
n
][
0
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
r
[
n
][
0
]
+
s0
,
d
[
n
]);
rd
[
n
][
1
]
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
r
[
n
][
1
]
+
s0
,
d
[
n
]);
...
...
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