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
e2c696a7
Commit
e2c696a7
authored
Jan 14, 2013
by
Paul Wilkins
Committed by
Gerrit Code Review
Jan 14, 2013
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix compiler warnings" into experimental
parents
c7576f97
113005b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
21 deletions
+5
-21
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+0
-9
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+5
-12
No files found.
vp9/encoder/vp9_encodeframe.c
View file @
e2c696a7
...
...
@@ -2266,7 +2266,6 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t,
uint8_t
*
vdst
=
xd
->
dst
.
v_buffer
;
int
src_y_stride
=
x
->
src
.
y_stride
,
dst_y_stride
=
xd
->
dst
.
y_stride
;
int
src_uv_stride
=
x
->
src
.
uv_stride
,
dst_uv_stride
=
xd
->
dst
.
uv_stride
;
int
seg_ref_active
;
unsigned
char
ref_pred_flag
;
int
n
;
TOKENEXTRA
*
tp
[
4
];
...
...
@@ -2308,10 +2307,7 @@ static void encode_superblock32(VP9_COMP *cpi, TOKENEXTRA **t,
vp9_update_zbin_extra
(
cpi
,
x
);
seg_ref_active
=
vp9_segfeature_active
(
xd
,
segment_id
,
SEG_LVL_REF_FRAME
);
// SET VARIOUS PREDICTION FLAGS
// Did the chosen reference frame match its predicted value.
ref_pred_flag
=
((
xd
->
mode_info_context
->
mbmi
.
ref_frame
==
vp9_get_pred_ref
(
cm
,
xd
)));
...
...
@@ -2502,7 +2498,6 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t,
uint8_t
*
vdst
=
xd
->
dst
.
v_buffer
;
int
src_y_stride
=
x
->
src
.
y_stride
,
dst_y_stride
=
xd
->
dst
.
y_stride
;
int
src_uv_stride
=
x
->
src
.
uv_stride
,
dst_uv_stride
=
xd
->
dst
.
uv_stride
;
int
seg_ref_active
;
unsigned
char
ref_pred_flag
;
int
n
;
TOKENEXTRA
*
tp
[
16
];
...
...
@@ -2545,10 +2540,6 @@ static void encode_superblock64(VP9_COMP *cpi, TOKENEXTRA **t,
vp9_update_zbin_extra
(
cpi
,
x
);
seg_ref_active
=
vp9_segfeature_active
(
xd
,
segment_id
,
SEG_LVL_REF_FRAME
);
// SET VARIOUS PREDICTION FLAGS
// Did the chosen reference frame match its predicted value.
ref_pred_flag
=
((
xd
->
mode_info_context
->
mbmi
.
ref_frame
==
vp9_get_pred_ref
(
cm
,
xd
)));
...
...
vp9/encoder/vp9_rdopt.c
View file @
e2c696a7
...
...
@@ -4464,14 +4464,13 @@ void vp9_rd_pick_intra_mode_sb32(VP9_COMP *cpi, MACROBLOCK *x,
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
int
rate_y
,
rate_uv
;
int
rate_y_tokenonly
,
rate_uv_tokenonly
;
int
error_y
,
error_uv
;
int
dist_y
,
dist_uv
;
int
y_skip
,
uv_skip
;
int64_t
txfm_cache
[
NB_TXFM_MODES
];
error_y
=
rd_pick_intra_sby_mode
(
cpi
,
x
,
&
rate_y
,
&
rate_y_tokenonly
,
rd_pick_intra_sby_mode
(
cpi
,
x
,
&
rate_y
,
&
rate_y_tokenonly
,
&
dist_y
,
&
y_skip
,
txfm_cache
);
error_uv
=
rd_pick_intra_sbuv_mode
(
cpi
,
x
,
&
rate_uv
,
&
rate_uv_tokenonly
,
rd_pick_intra_sbuv_mode
(
cpi
,
x
,
&
rate_uv
,
&
rate_uv_tokenonly
,
&
dist_uv
,
&
uv_skip
);
if
(
cpi
->
common
.
mb_no_coeff_skip
&&
y_skip
&&
uv_skip
)
{
...
...
@@ -4493,14 +4492,13 @@ void vp9_rd_pick_intra_mode_sb64(VP9_COMP *cpi, MACROBLOCK *x,
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
int
rate_y
,
rate_uv
;
int
rate_y_tokenonly
,
rate_uv_tokenonly
;
int
error_y
,
error_uv
;
int
dist_y
,
dist_uv
;
int
y_skip
,
uv_skip
;
int64_t
txfm_cache
[
NB_TXFM_MODES
];
error_y
=
rd_pick_intra_sb64y_mode
(
cpi
,
x
,
&
rate_y
,
&
rate_y_tokenonly
,
rd_pick_intra_sb64y_mode
(
cpi
,
x
,
&
rate_y
,
&
rate_y_tokenonly
,
&
dist_y
,
&
y_skip
,
txfm_cache
);
error_uv
=
rd_pick_intra_sb64uv_mode
(
cpi
,
x
,
&
rate_uv
,
&
rate_uv_tokenonly
,
rd_pick_intra_sb64uv_mode
(
cpi
,
x
,
&
rate_uv
,
&
rate_uv_tokenonly
,
&
dist_uv
,
&
uv_skip
);
if
(
cpi
->
common
.
mb_no_coeff_skip
&&
y_skip
&&
uv_skip
)
{
...
...
@@ -4602,6 +4600,7 @@ void vp9_rd_pick_intra_mode(VP9_COMP *cpi, MACROBLOCK *x,
rate
=
rateuv8x8
+
rate16x16
-
rateuv8x8_tokenonly
-
rate16x16_tokenonly
+
vp9_cost_bit
(
vp9_get_pred_prob
(
cm
,
xd
,
PRED_MBSKIP
),
1
);
dist
=
dist16x16
+
(
distuv8x8
>>
2
);
mbmi
->
txfm_size
=
txfm_size_16x16
;
memset
(
x
->
mb_context
[
xd
->
sb_index
][
xd
->
mb_index
].
txfm_rd_diff
,
0
,
sizeof
(
x
->
mb_context
[
xd
->
sb_index
][
xd
->
mb_index
].
txfm_rd_diff
));
...
...
@@ -4697,7 +4696,6 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
int
near_sadidx
[
8
]
=
{
0
,
1
,
2
,
3
,
4
,
5
,
6
,
7
};
int
saddone
=
0
;
int64_t
best_rd
=
LLONG_MAX
;
int64_t
best_yrd
=
LLONG_MAX
;
int64_t
best_txfm_rd
[
NB_TXFM_MODES
];
int64_t
best_txfm_diff
[
NB_TXFM_MODES
];
int64_t
best_pred_diff
[
NB_PREDICTION_TYPES
];
...
...
@@ -5071,11 +5069,6 @@ static int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
}
other_cost
+=
ref_costs
[
xd
->
mode_info_context
->
mbmi
.
ref_frame
];
/* Calculate the final y RD estimate for this mode */
best_yrd
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
(
rate2
-
rate_uv
-
other_cost
),
(
distortion2
-
distortion_uv
));
*
returnrate
=
rate2
;
*
returndistortion
=
distortion2
;
best_rd
=
this_rd
;
...
...
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