Skip to content
GitLab
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
a4c69e9a
Commit
a4c69e9a
authored
May 19, 2011
by
Yaowu Xu
Browse files
revise two function definitions with less parameters
Change-Id: Ia96e5bf915e4d3c0ac9c1795114bd9e5dd07327a
parent
1f3f1844
Changes
4
Hide whitespace changes
Inline
Side-by-side
vp8/encoder/encodeintra.c
View file @
a4c69e9a
...
...
@@ -27,10 +27,16 @@
#else
#define IF_RTCD(x) NULL
#endif
void
vp8_encode_intra4x4block
(
const
VP8_ENCODER_RTCD
*
rtcd
,
MACROBLOCK
*
x
,
BLOCK
*
be
,
BLOCKD
*
b
,
int
best_mode
)
void
vp8_encode_intra4x4block
(
const
VP8_ENCODER_RTCD
*
rtcd
,
MACROBLOCK
*
x
,
int
ib
)
{
BLOCKD
*
b
=
&
x
->
e_mbd
.
block
[
ib
];
BLOCK
*
be
=
&
x
->
block
[
ib
];
RECON_INVOKE
(
&
rtcd
->
common
->
recon
,
intra4x4_predict
)
(
b
,
b
est_
mode
,
b
->
predictor
);
(
b
,
b
->
bmi
.
mode
,
b
->
predictor
);
ENCODEMB_INVOKE
(
&
rtcd
->
encodemb
,
subb
)(
be
,
b
,
16
);
...
...
@@ -51,13 +57,7 @@ void vp8_encode_intra4x4mby(const VP8_ENCODER_RTCD *rtcd, MACROBLOCK *mb)
vp8_intra_prediction_down_copy
(
x
);
for
(
i
=
0
;
i
<
16
;
i
++
)
{
BLOCK
*
be
=
&
mb
->
block
[
i
];
BLOCKD
*
b
=
&
x
->
block
[
i
];
vp8_encode_intra4x4block
(
rtcd
,
mb
,
be
,
b
,
b
->
bmi
.
mode
);
}
vp8_encode_intra4x4block
(
rtcd
,
mb
,
i
);
return
;
}
...
...
vp8/encoder/encodeintra.h
View file @
a4c69e9a
...
...
@@ -16,6 +16,6 @@
void
vp8_encode_intra16x16mby
(
const
VP8_ENCODER_RTCD
*
,
MACROBLOCK
*
x
);
void
vp8_encode_intra16x16mbuv
(
const
VP8_ENCODER_RTCD
*
,
MACROBLOCK
*
x
);
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_encode_intra4x4block
(
const
VP8_ENCODER_RTCD
*
rtcd
,
MACROBLOCK
*
x
,
int
ib
);
#endif
vp8/encoder/firstpass.c
View file @
a4c69e9a
...
...
@@ -100,10 +100,8 @@ static int encode_intra(VP8_COMP *cpi, MACROBLOCK *x, int use_dc_pred)
{
for
(
i
=
0
;
i
<
16
;
i
++
)
{
BLOCKD
*
b
=
&
x
->
e_mbd
.
block
[
i
];
BLOCK
*
be
=
&
x
->
block
[
i
];
vp8_encode_intra4x4block
(
IF_RTCD
(
&
cpi
->
rtcd
),
x
,
be
,
b
,
B_DC_PRED
);
x
->
e_mbd
.
block
[
i
].
bmi
.
mode
=
B_DC_PRED
;
vp8_encode_intra4x4block
(
IF_RTCD
(
&
cpi
->
rtcd
),
x
,
i
);
}
}
...
...
vp8/encoder/pickinter.c
View file @
a4c69e9a
...
...
@@ -170,8 +170,7 @@ static int get_prediction_error(BLOCK *be, BLOCKD *b, const vp8_variance_rtcd_vt
static
int
pick_intra4x4block
(
const
VP8_ENCODER_RTCD
*
rtcd
,
MACROBLOCK
*
x
,
BLOCK
*
be
,
BLOCKD
*
b
,
int
ib
,
B_PREDICTION_MODE
*
best_mode
,
B_PREDICTION_MODE
above
,
B_PREDICTION_MODE
left
,
...
...
@@ -179,6 +178,9 @@ static int pick_intra4x4block(
int
*
bestrate
,
int
*
bestdistortion
)
{
BLOCKD
*
b
=
&
x
->
e_mbd
.
block
[
ib
];
BLOCK
*
be
=
&
x
->
block
[
ib
];
B_PREDICTION_MODE
mode
;
int
best_rd
=
INT_MAX
;
// 1<<30
int
rate
;
...
...
@@ -214,8 +216,7 @@ static int pick_intra4x4block(
}
b
->
bmi
.
mode
=
(
B_PREDICTION_MODE
)(
*
best_mode
);
vp8_encode_intra4x4block
(
rtcd
,
x
,
be
,
b
,
b
->
bmi
.
mode
);
vp8_encode_intra4x4block
(
rtcd
,
x
,
ib
);
return
best_rd
;
}
...
...
@@ -245,8 +246,7 @@ int vp8_pick_intra4x4mby_modes
B_PREDICTION_MODE
UNINITIALIZED_IS_SAFE
(
best_mode
);
int
UNINITIALIZED_IS_SAFE
(
r
),
UNINITIALIZED_IS_SAFE
(
d
);
pick_intra4x4block
(
rtcd
,
mb
,
mb
->
block
+
i
,
xd
->
block
+
i
,
&
best_mode
,
A
,
L
,
&
r
,
&
d
);
pick_intra4x4block
(
rtcd
,
mb
,
i
,
&
best_mode
,
A
,
L
,
&
r
,
&
d
);
cost
+=
r
;
distortion
+=
d
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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