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
3d89d059
Commit
3d89d059
authored
Mar 01, 2016
by
Yaowu Xu
Committed by
Gerrit Code Review
Mar 01, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix an overflow issue for HBD" into nextgenv2
parents
76677339
5c613ea8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
vp10/encoder/rdopt.c
vp10/encoder/rdopt.c
+6
-6
No files found.
vp10/encoder/rdopt.c
View file @
3d89d059
...
...
@@ -2404,7 +2404,7 @@ void vp10_tx_block_rd_b(const VP10_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
MACROBLOCKD
*
xd
=
&
x
->
e_mbd
;
const
struct
macroblock_plane
*
const
p
=
&
x
->
plane
[
plane
];
struct
macroblockd_plane
*
const
pd
=
&
xd
->
plane
[
plane
];
unsigned
in
t
tmp
;
int64_
t
tmp
;
tran_low_t
*
const
dqcoeff
=
BLOCK_OFFSET
(
pd
->
dqcoeff
,
block
);
PLANE_TYPE
plane_type
=
(
plane
==
0
)
?
PLANE_TYPE_Y
:
PLANE_TYPE_UV
;
TX_TYPE
tx_type
=
get_tx_type
(
plane_type
,
xd
,
block
,
tx_size
);
...
...
@@ -2472,7 +2472,7 @@ void vp10_tx_block_rd_b(const VP10_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
tmp
=
ROUNDZ_POWER_OF_TWO
(
tmp
,
(
xd
->
bd
-
8
)
*
2
);
#endif // CONFIG_VP9_HIGHBITDEPTH
*
bsse
+=
(
int64_t
)
tmp
*
16
;
*
bsse
+=
tmp
*
16
;
if
(
p
->
eobs
[
block
]
>
0
)
{
const
int
lossless
=
xd
->
lossless
[
xd
->
mi
[
0
]
->
mbmi
.
segment_id
];
...
...
@@ -2544,12 +2544,12 @@ void vp10_tx_block_rd_b(const VP10_COMP *cpi, MACROBLOCK *x, TX_SIZE tx_size,
}
}
}
else
{
cpi
->
fn_ptr
[
txm_bsize
].
vf
(
src
,
src_stride
,
rec_buffer
,
32
,
&
tmp
);
uint32_t
this_dist
;
cpi
->
fn_ptr
[
txm_bsize
].
vf
(
src
,
src_stride
,
rec_buffer
,
32
,
&
this_dist
);
tmp
=
this_dist
;
}
}
*
dist
+=
(
int64_t
)
tmp
*
16
;
*
dist
+=
tmp
*
16
;
*
rate
+=
cost_coeffs
(
x
,
plane
,
block
,
coeff_ctx
,
tx_size
,
scan_order
->
scan
,
scan_order
->
neighbors
,
0
);
*
skip
&=
(
p
->
eobs
[
block
]
==
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