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
7b011c54
Commit
7b011c54
authored
Nov 06, 2013
by
Dmitry Kovalev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replacing mi_{width,height}_log2 with num_8x8_blocks_{wide,high}_lookup.
Change-Id: I04c55daef89bca2b85cb7db0850f9b052abc5a7c
parent
2f4bade3
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
11 deletions
+12
-11
vp9/common/vp9_pred_common.c
vp9/common/vp9_pred_common.c
+2
-2
vp9/decoder/vp9_decodemv.c
vp9/decoder/vp9_decodemv.c
+4
-4
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+2
-1
vp9/encoder/vp9_firstpass.c
vp9/encoder/vp9_firstpass.c
+2
-2
vp9/encoder/vp9_vaq.c
vp9/encoder/vp9_vaq.c
+2
-2
No files found.
vp9/common/vp9_pred_common.c
View file @
7b011c54
...
...
@@ -403,8 +403,8 @@ void vp9_set_pred_flag_seg_id(MACROBLOCKD *xd, uint8_t pred_flag) {
int
vp9_get_segment_id
(
VP9_COMMON
*
cm
,
const
uint8_t
*
segment_ids
,
BLOCK_SIZE
bsize
,
int
mi_row
,
int
mi_col
)
{
const
int
mi_offset
=
mi_row
*
cm
->
mi_cols
+
mi_col
;
const
int
bw
=
1
<<
mi_width_log2
(
bsize
)
;
const
int
bh
=
1
<<
mi_height_log2
(
bsize
)
;
const
int
bw
=
num_8x8_blocks_wide_lookup
[
bsize
]
;
const
int
bh
=
num_8x8_blocks_high_lookup
[
bsize
]
;
const
int
xmis
=
MIN
(
cm
->
mi_cols
-
mi_col
,
bw
);
const
int
ymis
=
MIN
(
cm
->
mi_rows
-
mi_row
,
bh
);
int
x
,
y
,
segment_id
=
INT_MAX
;
...
...
vp9/decoder/vp9_decodemv.c
View file @
7b011c54
...
...
@@ -91,8 +91,8 @@ static TX_SIZE read_tx_size(VP9_COMMON *const cm, MACROBLOCKD *const xd,
static
void
set_segment_id
(
VP9_COMMON
*
cm
,
BLOCK_SIZE
bsize
,
int
mi_row
,
int
mi_col
,
int
segment_id
)
{
const
int
mi_offset
=
mi_row
*
cm
->
mi_cols
+
mi_col
;
const
int
bw
=
1
<<
mi_width_log2
(
bsize
)
;
const
int
bh
=
1
<<
mi_height_log2
(
bsize
)
;
const
int
bw
=
num_8x8_blocks_wide_lookup
[
bsize
]
;
const
int
bh
=
num_8x8_blocks_high_lookup
[
bsize
]
;
const
int
xmis
=
MIN
(
cm
->
mi_cols
-
mi_col
,
bw
);
const
int
ymis
=
MIN
(
cm
->
mi_rows
-
mi_row
,
bh
);
int
x
,
y
;
...
...
@@ -550,8 +550,8 @@ void vp9_read_mode_info(VP9_COMMON *cm, MACROBLOCKD *xd,
int
mi_row
,
int
mi_col
,
vp9_reader
*
r
)
{
MODE_INFO
*
const
mi
=
xd
->
mi_8x8
[
0
];
const
BLOCK_SIZE
bsize
=
mi
->
mbmi
.
sb_type
;
const
int
bw
=
1
<<
mi_width_log2
(
bsize
)
;
const
int
bh
=
1
<<
mi_height_log2
(
bsize
)
;
const
int
bw
=
num_8x8_blocks_wide_lookup
[
bsize
]
;
const
int
bh
=
num_8x8_blocks_high_lookup
[
bsize
]
;
const
int
y_mis
=
MIN
(
bh
,
cm
->
mi_rows
-
mi_row
);
const
int
x_mis
=
MIN
(
bw
,
cm
->
mi_cols
-
mi_col
);
int
x
,
y
,
z
;
...
...
vp9/encoder/vp9_encodeframe.c
View file @
7b011c54
...
...
@@ -1490,7 +1490,8 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
return
;
}
}
assert
(
mi_height_log2
(
bsize
)
==
mi_width_log2
(
bsize
));
assert
(
num_8x8_blocks_wide_lookup
[
bsize
]
==
num_8x8_blocks_high_lookup
[
bsize
]);
if
(
bsize
==
BLOCK_16X16
)
{
set_offsets
(
cpi
,
tile
,
mi_row
,
mi_col
,
bsize
);
...
...
vp9/encoder/vp9_firstpass.c
View file @
7b011c54
...
...
@@ -584,9 +584,9 @@ void vp9_first_pass(VP9_COMP *cpi) {
xd
->
mi_8x8
[
0
]
->
mbmi
.
ref_frame
[
0
]
=
INTRA_FRAME
;
set_mi_row_col
(
xd
,
&
tile
,
mb_row
<<
1
,
1
<<
mi_height_log2
(
xd
->
mi_8x8
[
0
]
->
mbmi
.
sb_type
)
,
num_8x8_blocks_high_lookup
[
xd
->
mi_8x8
[
0
]
->
mbmi
.
sb_type
]
,
mb_col
<<
1
,
1
<<
mi_width_log2
(
xd
->
mi_8x8
[
0
]
->
mbmi
.
sb_type
)
,
num_8x8_blocks_wide_lookup
[
xd
->
mi_8x8
[
0
]
->
mbmi
.
sb_type
]
,
cm
->
mi_rows
,
cm
->
mi_cols
);
if
(
cpi
->
sf
.
variance_adaptive_quantization
)
{
...
...
vp9/encoder/vp9_vaq.c
View file @
7b011c54
...
...
@@ -118,8 +118,8 @@ static unsigned int block_variance(VP9_COMP *cpi, MACROBLOCK *x,
((
-
xd
->
mb_to_bottom_edge
)
>>
3
)
:
0
;
if
(
right_overflow
||
bottom_overflow
)
{
int
bw
=
(
1
<<
(
mi_width_log2
(
bs
)
+
3
))
-
right_overflow
;
int
bh
=
(
1
<<
(
mi_height_log2
(
bs
)
+
3
))
-
bottom_overflow
;
const
int
bw
=
8
*
num_8x8_blocks_wide_lookup
[
bs
]
-
right_overflow
;
const
int
bh
=
8
*
num_8x8_blocks_high_lookup
[
bs
]
-
bottom_overflow
;
int
avg
;
variance
(
x
->
plane
[
0
].
src
.
buf
,
x
->
plane
[
0
].
src
.
stride
,
vp9_64_zeros
,
0
,
bw
,
bh
,
&
sse
,
&
avg
);
...
...
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