Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
aom-rav1e
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Xiph.Org
aom-rav1e
Commits
27dad215
Commit
27dad215
authored
Feb 14, 2011
by
Yaowu Xu
Committed by
Code Review
Feb 14, 2011
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Improved vp8_rd_pick_intra_mbuv_mode"
parents
404e998e
94d4fee0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
25 deletions
+6
-25
vp8/encoder/encodeintra.c
vp8/encoder/encodeintra.c
+0
-14
vp8/encoder/encodeintra.h
vp8/encoder/encodeintra.h
+0
-1
vp8/encoder/rdopt.c
vp8/encoder/rdopt.c
+6
-10
No files found.
vp8/encoder/encodeintra.c
View file @
27dad215
...
...
@@ -153,17 +153,3 @@ void vp8_encode_intra16x16mbuv(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *x)
vp8_recon_intra_mbuv
(
IF_RTCD
(
&
rtcd
->
common
->
recon
),
&
x
->
e_mbd
);
}
void
vp8_encode_intra16x16mbuvrd
(
const
VP8_ENCODER_RTCD
*
rtcd
,
MACROBLOCK
*
x
)
{
vp8_build_intra_predictors_mbuv
(
&
x
->
e_mbd
);
ENCODEMB_INVOKE
(
&
rtcd
->
encodemb
,
submbuv
)(
x
->
src_diff
,
x
->
src
.
u_buffer
,
x
->
src
.
v_buffer
,
x
->
e_mbd
.
predictor
,
x
->
src
.
uv_stride
);
vp8_transform_mbuv
(
x
);
vp8_quantize_mbuv
(
x
);
vp8_inverse_transform_mbuv
(
IF_RTCD
(
&
rtcd
->
common
->
idct
),
&
x
->
e_mbd
);
vp8_recon_intra_mbuv
(
IF_RTCD
(
&
rtcd
->
common
->
recon
),
&
x
->
e_mbd
);
}
vp8/encoder/encodeintra.h
View file @
27dad215
...
...
@@ -19,6 +19,5 @@ void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *, MACROBLOCK *mb);
void
vp8_encode_intra4x4block
(
const
VP8_ENCODER_RTCD
*
,
MACROBLOCK
*
x
,
BLOCK
*
be
,
BLOCKD
*
b
,
int
best_mode
);
void
vp8_update_mode_context
(
int
*
abmode
,
int
*
lbmode
,
int
i
,
int
best_mode
);
void
vp8_encode_intra4x4block_rd
(
const
VP8_ENCODER_RTCD
*
,
MACROBLOCK
*
x
,
BLOCK
*
be
,
BLOCKD
*
b
,
int
best_mode
);
void
vp8_encode_intra16x16mbuvrd
(
const
VP8_ENCODER_RTCD
*
,
MACROBLOCK
*
x
);
#endif
vp8/encoder/rdopt.c
View file @
27dad215
...
...
@@ -813,15 +813,6 @@ static int rd_cost_mbuv(MACROBLOCK *mb)
}
unsigned
int
vp8_get_mbuvrecon_error
(
const
vp8_variance_rtcd_vtable_t
*
rtcd
,
const
MACROBLOCK
*
x
)
// sum of squares
{
unsigned
int
sse0
,
sse1
;
int
sum0
,
sum1
;
VARIANCE_INVOKE
(
rtcd
,
get8x8var
)(
x
->
src
.
u_buffer
,
x
->
src
.
uv_stride
,
x
->
e_mbd
.
dst
.
u_buffer
,
x
->
e_mbd
.
dst
.
uv_stride
,
&
sse0
,
&
sum0
);
VARIANCE_INVOKE
(
rtcd
,
get8x8var
)(
x
->
src
.
v_buffer
,
x
->
src
.
uv_stride
,
x
->
e_mbd
.
dst
.
v_buffer
,
x
->
e_mbd
.
dst
.
uv_stride
,
&
sse1
,
&
sum1
);
return
(
sse0
+
sse1
);
}
static
int
vp8_rd_inter_uv
(
VP8_COMP
*
cpi
,
MACROBLOCK
*
x
,
int
*
rate
,
int
*
distortion
,
int
fullpixel
)
{
vp8_build_uvmvs
(
&
x
->
e_mbd
,
fullpixel
);
...
...
@@ -849,7 +840,12 @@ int vp8_rd_pick_intra_mbuv_mode(VP8_COMP *cpi, MACROBLOCK *x, int *rate, int *ra
int
this_rd
;
x
->
e_mbd
.
mode_info_context
->
mbmi
.
uv_mode
=
mode
;
vp8_encode_intra16x16mbuvrd
(
IF_RTCD
(
&
cpi
->
rtcd
),
x
);
vp8_build_intra_predictors_mbuv
(
&
x
->
e_mbd
);
ENCODEMB_INVOKE
(
IF_RTCD
(
&
cpi
->
rtcd
.
encodemb
),
submbuv
)(
x
->
src_diff
,
x
->
src
.
u_buffer
,
x
->
src
.
v_buffer
,
x
->
e_mbd
.
predictor
,
x
->
src
.
uv_stride
);
vp8_transform_mbuv
(
x
);
vp8_quantize_mbuv
(
x
);
rate_to
=
rd_cost_mbuv
(
x
);
rate
=
rate_to
+
x
->
intra_uv_mode_cost
[
x
->
e_mbd
.
frame_type
][
x
->
e_mbd
.
mode_info_context
->
mbmi
.
uv_mode
];
...
...
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