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
6298e232
Commit
6298e232
authored
Jul 11, 2014
by
Yunqing Wang
Committed by
Gerrit Code Review
Jul 11, 2014
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Code refactoring: use defined inline functions"
parents
84744a49
1b5e9871
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
vp9/encoder/vp9_encodeframe.c
vp9/encoder/vp9_encodeframe.c
+5
-5
vp9/encoder/vp9_pickmode.c
vp9/encoder/vp9_pickmode.c
+2
-2
vp9/encoder/vp9_rdopt.c
vp9/encoder/vp9_rdopt.c
+4
-4
No files found.
vp9/encoder/vp9_encodeframe.c
View file @
6298e232
...
...
@@ -1827,7 +1827,7 @@ static void auto_partition_range(VP9_COMP *cpi, const TileInfo *const tile,
int
bh
,
bw
;
BLOCK_SIZE
min_size
=
BLOCK_32X32
;
BLOCK_SIZE
max_size
=
BLOCK_8X8
;
int
bsl
=
mi_width_log2
_lookup
[
BLOCK_64X64
]
;
int
bsl
=
mi_width_log2
(
BLOCK_64X64
)
;
const
int
search_range_ctrl
=
(((
mi_row
+
mi_col
)
>>
bsl
)
+
get_chessboard_index
(
cm
))
%
2
;
// Trap case where we do not have a prediction.
...
...
@@ -1976,8 +1976,8 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
pc_tree
->
partitioning
=
PARTITION_NONE
;
// Adjust threshold according to partition size.
stop_thresh
>>=
8
-
(
b_width_log2
_lookup
[
bsize
]
+
b_height_log2
_lookup
[
bsize
]
);
stop_thresh
>>=
8
-
(
b_width_log2
(
bsize
)
+
b_height_log2
(
bsize
)
);
stop_thresh_rd
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
0
,
stop_thresh
);
// If obtained distortion is very small, choose current partition
...
...
@@ -2548,8 +2548,8 @@ static void nonrd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile,
pc_tree
->
partitioning
=
PARTITION_NONE
;
// Adjust threshold according to partition size.
stop_thresh
>>=
8
-
(
b_width_log2
_lookup
[
bsize
]
+
b_height_log2
_lookup
[
bsize
]
);
stop_thresh
>>=
8
-
(
b_width_log2
(
bsize
)
+
b_height_log2
(
bsize
)
);
stop_thresh_rd
=
RDCOST
(
x
->
rdmult
,
x
->
rddiv
,
0
,
stop_thresh
);
// If obtained distortion is very small, choose current partition
...
...
vp9/encoder/vp9_pickmode.c
View file @
6298e232
...
...
@@ -287,7 +287,7 @@ static void encode_breakout_test(VP9_COMP *cpi, MACROBLOCK *x,
// Adjust ac threshold according to partition size.
thresh_ac
>>=
8
-
(
b_width_log2
_lookup
[
bsize
]
+
b_height_log2_lookup
[
bsize
]
);
8
-
(
b_width_log2
(
bsize
)
+
b_height_log2
(
bsize
)
);
thresh_dc
=
(
xd
->
plane
[
0
].
dequant
[
0
]
*
xd
->
plane
[
0
].
dequant
[
0
]
>>
6
);
}
else
{
...
...
@@ -387,7 +387,7 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
// Mode index conversion form THR_MODES to PREDICTION_MODE for a ref frame.
int
mode_idx
[
MB_MODE_COUNT
]
=
{
0
};
INTERP_FILTER
filter_ref
=
cm
->
interp_filter
;
int
bsl
=
mi_width_log2
_lookup
[
bsize
]
;
int
bsl
=
mi_width_log2
(
bsize
)
;
const
int
pred_filter_search
=
cm
->
interp_filter
==
SWITCHABLE
?
(((
mi_row
+
mi_col
)
>>
bsl
)
+
get_chessboard_index
(
cm
))
%
2
:
0
;
int
const_motion
[
MAX_REF_FRAMES
]
=
{
0
};
...
...
vp9/encoder/vp9_rdopt.c
View file @
6298e232
...
...
@@ -1793,8 +1793,8 @@ static void single_motion_search(VP9_COMP *cpi, MACROBLOCK *x,
}
if
(
cpi
->
sf
.
adaptive_motion_search
)
{
int
bwl
=
b_width_log2
_lookup
[
bsize
]
;
int
bhl
=
b_height_log2
_lookup
[
bsize
]
;
int
bwl
=
b_width_log2
(
bsize
)
;
int
bhl
=
b_height_log2
(
bsize
)
;
int
i
;
int
tlevel
=
x
->
pred_mv_sad
[
ref
]
>>
(
bwl
+
bhl
+
4
);
...
...
@@ -2266,8 +2266,8 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
thresh_ac
=
clamp
(
thresh_ac
,
min_thresh
,
max_thresh
);
// Adjust threshold according to partition size.
thresh_ac
>>=
8
-
(
b_width_log2
_lookup
[
bsize
]
+
b_height_log2
_lookup
[
bsize
]
);
thresh_ac
>>=
8
-
(
b_width_log2
(
bsize
)
+
b_height_log2
(
bsize
)
);
thresh_dc
=
(
xd
->
plane
[
0
].
dequant
[
0
]
*
xd
->
plane
[
0
].
dequant
[
0
]
>>
6
);
}
else
{
thresh_ac
=
0
;
...
...
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