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
6a2fb544
Commit
6a2fb544
authored
Apr 02, 2014
by
Dmitry Kovalev
Browse files
Removing unused seg0_* vars.
Change-Id: I87b0668e23c54429a06bba85437606c4780be9ba
parent
8b8606a7
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
6a2fb544
...
...
@@ -258,22 +258,6 @@ static void set_offsets(VP9_COMP *cpi, const TileInfo *const tile,
}
vp9_init_plane_quantizers
(
cpi
,
x
);
if
(
seg
->
enabled
&&
cpi
->
seg0_cnt
>
0
&&
!
vp9_segfeature_active
(
seg
,
0
,
SEG_LVL_REF_FRAME
)
&&
vp9_segfeature_active
(
seg
,
1
,
SEG_LVL_REF_FRAME
))
{
cpi
->
seg0_progress
=
(
cpi
->
seg0_idx
<<
16
)
/
cpi
->
seg0_cnt
;
}
else
{
const
int
y
=
mb_row
&
~
3
;
const
int
x
=
mb_col
&
~
3
;
const
int
p16
=
((
mb_row
&
1
)
<<
1
)
+
(
mb_col
&
1
);
const
int
p32
=
((
mb_row
&
2
)
<<
2
)
+
((
mb_col
&
2
)
<<
1
);
const
int
tile_progress
=
tile
->
mi_col_start
*
cm
->
mb_rows
>>
1
;
const
int
mb_cols
=
(
tile
->
mi_col_end
-
tile
->
mi_col_start
)
>>
1
;
cpi
->
seg0_progress
=
((
y
*
mb_cols
+
x
*
4
+
p32
+
p16
+
tile_progress
)
<<
16
)
/
cm
->
MBs
;
}
x
->
encode_breakout
=
cpi
->
segment_encode_breakout
[
mbmi
->
segment_id
];
}
else
{
mbmi
->
segment_id
=
0
;
...
...
@@ -2404,7 +2388,6 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) {
const
int
aligned_mi_cols
=
mi_cols_aligned_to_sb
(
cm
->
mi_cols
);
x
->
act_zbin_adj
=
0
;
cpi
->
seg0_idx
=
0
;
// Copy data over into macro block data structures.
vp9_setup_src_planes
(
x
,
cpi
->
Source
,
0
,
0
);
...
...
vp9/encoder/vp9_mbgraph.c
View file @
6a2fb544
...
...
@@ -370,7 +370,6 @@ static void separate_arf_mbs(VP9_COMP *cpi) {
else
cpi
->
static_mb_pct
=
0
;
cpi
->
seg0_cnt
=
ncnt
[
0
];
vp9_enable_segmentation
(
&
cm
->
seg
);
}
else
{
cpi
->
static_mb_pct
=
0
;
...
...
vp9/encoder/vp9_onyx_int.h
View file @
6a2fb544
...
...
@@ -392,7 +392,6 @@ typedef struct VP9_COMP {
MBGRAPH_FRAME_STATS
mbgraph_stats
[
MAX_LAG_BUFFERS
];
int
mbgraph_n_frames
;
// number of frames filled in the above
int
static_mb_pct
;
// % forced skip mbs by segmentation
int
seg0_progress
,
seg0_idx
,
seg0_cnt
;
// for real time encoding
int
speed
;
...
...
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