Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
9d924596
Commit
9d924596
authored
Sep 08, 2017
by
Cheng Chen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make braces consistent in encodemb.c for vim
Change-Id: Id3453fcf61fced97810d68cc7ca285bf8bca7881
parent
3e4df0ee
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
21 deletions
+22
-21
av1/encoder/encodemb.c
av1/encoder/encodemb.c
+22
-21
No files found.
av1/encoder/encodemb.c
View file @
9d924596
...
...
@@ -715,10 +715,9 @@ static void encode_block(int plane, int block, int blk_row, int blk_col,
// Assert not magic number (uninitialized).
assert
(
x
->
blk_skip
[
plane
][
blk_row
*
bw
+
blk_col
]
!=
234
);
if
(
x
->
blk_skip
[
plane
][
blk_row
*
bw
+
blk_col
]
==
0
)
{
#else
{
if
(
x
->
blk_skip
[
plane
][
blk_row
*
bw
+
blk_col
]
==
0
)
#endif
{
av1_xform_quant
(
cm
,
x
,
plane
,
block
,
blk_row
,
blk_col
,
plane_bsize
,
tx_size
,
ctx
,
AV1_XFORM_QUANT_FP
);
}
...
...
@@ -842,34 +841,36 @@ static void encode_block_pass1(int plane, int block, int blk_row, int blk_col,
av1_xform_quant
(
cm
,
x
,
plane
,
block
,
blk_row
,
blk_col
,
plane_bsize
,
tx_size
,
ctx
,
AV1_XFORM_QUANT_B
);
#if !CONFIG_PVQ
if
(
p
->
eobs
[
block
]
>
0
)
{
#else
#if CONFIG_PVQ
if
(
!
x
->
pvq_skip
[
plane
])
{
{
int
tx_blk_size
;
int
i
,
j
;
// transform block size in pixels
tx_blk_size
=
tx_size_wide
[
tx_size
];
int
tx_blk_size
;
int
i
,
j
;
// transform block size in pixels
tx_blk_size
=
tx_size_wide
[
tx_size
];
// Since av1 does not have separate function which does inverse transform
// but av1_inv_txfm_add_*x*() also does addition of predicted image to
// inverse transformed image,
// pass blank dummy image to av1_inv_txfm_add_*x*(), i.e. set dst as zeros
#if CONFIG_HIGHBITDEPTH
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
for
(
j
=
0
;
j
<
tx_blk_size
;
j
++
)
for
(
i
=
0
;
i
<
tx_blk_size
;
i
++
)
CONVERT_TO_SHORTPTR
(
dst
)[
j
*
pd
->
dst
.
stride
+
i
]
=
0
;
}
else
{
if
(
xd
->
cur_buf
->
flags
&
YV12_FLAG_HIGHBITDEPTH
)
{
for
(
j
=
0
;
j
<
tx_blk_size
;
j
++
)
for
(
i
=
0
;
i
<
tx_blk_size
;
i
++
)
CONVERT_TO_SHORTPTR
(
dst
)[
j
*
pd
->
dst
.
stride
+
i
]
=
0
;
}
else
{
#endif // CONFIG_HIGHBITDEPTH
for
(
j
=
0
;
j
<
tx_blk_size
;
j
++
)
for
(
i
=
0
;
i
<
tx_blk_size
;
i
++
)
dst
[
j
*
pd
->
dst
.
stride
+
i
]
=
0
;
for
(
j
=
0
;
j
<
tx_blk_size
;
j
++
)
for
(
i
=
0
;
i
<
tx_blk_size
;
i
++
)
dst
[
j
*
pd
->
dst
.
stride
+
i
]
=
0
;
#if CONFIG_HIGHBITDEPTH
}
#endif // CONFIG_HIGHBITDEPTH
}
#endif // !CONFIG_PVQ
#endif // CONFIG_HIGHBITDEPTH
}
#endif // CONFIG_PVQ
#if !CONFIG_PVQ
if
(
p
->
eobs
[
block
]
>
0
)
#endif
{
txfm_param
.
bd
=
xd
->
bd
;
txfm_param
.
tx_type
=
DCT_DCT
;
txfm_param
.
eob
=
p
->
eobs
[
block
];
...
...
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