Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
859a5278
Commit
859a5278
authored
Nov 10, 2016
by
Yaowu Xu
Committed by
Debargha Mukherjee
Nov 11, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Apply clang-format
Change-Id: Ie57676814833824b1f3612b60ed9b0485c7ffd52
parent
cf3d0b00
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
7 deletions
+10
-7
aomenc.c
aomenc.c
+4
-3
av1/encoder/encodemb.c
av1/encoder/encodemb.c
+2
-2
av1/encoder/encodemv.c
av1/encoder/encodemv.c
+2
-1
av1/encoder/encoder.c
av1/encoder/encoder.c
+2
-1
No files found.
aomenc.c
View file @
859a5278
...
...
@@ -389,11 +389,12 @@ static const arg_def_t qm_max = ARG_DEF(
NULL
,
"qm_max"
,
1
,
"Max quant matrix flatness (0..15), default is 16"
);
#endif
#if CONFIG_TILE_GROUPS
static
const
arg_def_t
num_tg
=
ARG_DEF
(
NULL
,
"num-tile-groups"
,
1
,
"Maximum number of tile groups, default is 1"
);
static
const
arg_def_t
num_tg
=
ARG_DEF
(
NULL
,
"num-tile-groups"
,
1
,
"Maximum number of tile groups, default is 1"
);
static
const
arg_def_t
mtu_size
=
ARG_DEF
(
NULL
,
"mtu-size"
,
1
,
"MTU size for a tile group, default is 0 (no MTU targeting), overrides maximum number of tile groups"
);
"MTU size for a tile group, default is 0 (no MTU targeting), "
"overrides maximum number of tile groups"
);
#endif
static
const
arg_def_t
frame_parallel_decoding
=
ARG_DEF
(
NULL
,
"frame-parallel"
,
1
,
...
...
av1/encoder/encodemb.c
View file @
859a5278
...
...
@@ -1347,7 +1347,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
*
(
args
->
skip
)
=
0
;
}
#else
// #if !CONFIG_PVQ
#else // #if !CONFIG_PVQ
(
void
)
ctx
;
av1_xform_quant
(
cm
,
x
,
plane
,
block
,
blk_row
,
blk_col
,
plane_bsize
,
tx_size
,
...
...
@@ -1376,7 +1376,7 @@ void av1_encode_block_intra(int plane, int block, int blk_row, int blk_col,
inv_txfm_param
.
eob
=
*
eob
;
inv_txfm_param
.
lossless
=
xd
->
lossless
[
mbmi
->
segment_id
];
#if CONFIG_AOM_HIGHBITDEPTH
#error
#error
#else
inv_txfm_add
(
dqcoeff
,
dst
,
dst_stride
,
&
inv_txfm_param
);
...
...
av1/encoder/encodemv.c
View file @
859a5278
...
...
@@ -142,7 +142,8 @@ static void update_mv(aom_writer *w, const unsigned int ct[2], aom_prob *cur_p,
aom_prob
upd_p
)
{
(
void
)
upd_p
;
#if CONFIG_TILE_GROUPS
// Just use the default maximum number of tile groups to avoid passing in the actual
// Just use the default maximum number of tile groups to avoid passing in the
// actual
// number
av1_cond_prob_diff_update
(
w
,
cur_p
,
ct
,
DEFAULT_MAX_NUM_TG
);
#else
...
...
av1/encoder/encoder.c
View file @
859a5278
...
...
@@ -4588,7 +4588,8 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
if
(
cpi
->
oxcf
.
mtu
==
0
)
{
cm
->
num_tg
=
cpi
->
oxcf
.
num_tile_groups
;
}
else
{
// Use a default value for the purposes of weighting costs in probability updates
// Use a default value for the purposes of weighting costs in probability
// updates
cm
->
num_tg
=
DEFAULT_MAX_NUM_TG
;
}
#endif
...
...
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