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
557cb9a8
Commit
557cb9a8
authored
Feb 24, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Feb 24, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Rename above and left offset variables." into nextgenv2
parents
c1e51beb
44dba01f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
7 deletions
+7
-7
vp10/common/reconintra.c
vp10/common/reconintra.c
+7
-7
No files found.
vp10/common/reconintra.c
View file @
557cb9a8
...
...
@@ -1323,12 +1323,12 @@ void vp10_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, int bhl_in,
TX_SIZE
tx_size
,
PREDICTION_MODE
mode
,
const
uint8_t
*
ref
,
int
ref_stride
,
uint8_t
*
dst
,
int
dst_stride
,
int
aoff
,
int
l
off
,
int
plane
)
{
int
col_off
,
int
row_
off
,
int
plane
)
{
const
int
txw
=
(
1
<<
tx_size
);
const
int
have_top
=
l
off
||
xd
->
up_available
;
const
int
have_left
=
a
off
||
xd
->
left_available
;
const
int
x
=
a
off
*
4
;
const
int
y
=
l
off
*
4
;
const
int
have_top
=
row_
off
||
xd
->
up_available
;
const
int
have_left
=
col_
off
||
xd
->
left_available
;
const
int
x
=
col_
off
*
4
;
const
int
y
=
row_
off
*
4
;
const
int
bw
=
VPXMAX
(
2
,
1
<<
bwl_in
);
const
int
bh
=
VPXMAX
(
2
,
1
<<
bhl_in
);
const
int
mi_row
=
-
xd
->
mb_to_top_edge
>>
(
3
+
MI_SIZE_LOG2
);
...
...
@@ -1339,11 +1339,11 @@ void vp10_predict_intra_block(const MACROBLOCKD *xd, int bwl_in, int bhl_in,
mi_col
+
(
bw
>>
!
pd
->
subsampling_x
)
<
xd
->
tile
.
mi_col_end
;
const
int
have_right
=
vp10_has_right
(
bsize
,
mi_row
,
mi_col
,
right_available
,
tx_size
,
loff
,
a
off
,
tx_size
,
row_off
,
col_
off
,
pd
->
subsampling_x
);
const
int
have_bottom
=
vp10_has_bottom
(
bsize
,
mi_row
,
mi_col
,
xd
->
mb_to_bottom_edge
>
0
,
tx_size
,
loff
,
a
off
,
tx_size
,
row_off
,
col_
off
,
pd
->
subsampling_y
);
const
int
wpx
=
4
*
bw
;
const
int
hpx
=
4
*
bh
;
...
...
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