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
ac4535c8
Commit
ac4535c8
authored
Feb 21, 2017
by
Yushin Cho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change PVQ's skip_dir symbols to use dyadic and ec_adapt adaptation
Change-Id: Idfe23c1aef5d080567094af6e87d65bda3835ae5
parent
b9802238
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
11 deletions
+8
-11
av1/common/pvq.c
av1/common/pvq.c
+1
-2
av1/common/pvq.h
av1/common/pvq.h
+1
-2
av1/decoder/pvq_decoder.c
av1/decoder/pvq_decoder.c
+2
-2
av1/encoder/bitstream.c
av1/encoder/bitstream.c
+2
-2
av1/encoder/pvq_encoder.c
av1/encoder/pvq_encoder.c
+2
-3
No files found.
av1/common/pvq.c
View file @
ac4535c8
...
...
@@ -208,8 +208,7 @@ void od_adapt_pvq_ctx_reset(od_pvq_adapt_ctx *state, int is_keyframe) {
}
state
->
pvq_gaintheta_increment
=
128
;
OD_CDFS_INIT
(
state
->
pvq_gaintheta_cdf
,
state
->
pvq_gaintheta_increment
>>
2
);
state
->
pvq_skip_dir_increment
=
128
;
OD_CDFS_INIT
(
state
->
pvq_skip_dir_cdf
,
state
->
pvq_skip_dir_increment
>>
2
);
OD_CDFS_INIT_Q15
(
state
->
pvq_skip_dir_cdf
);
OD_CDFS_INIT
(
ctx
->
pvq_split_cdf
,
0
);
}
...
...
av1/common/pvq.h
View file @
ac4535c8
...
...
@@ -133,8 +133,7 @@ struct od_pvq_adapt_ctx {
int
pvq_exg
[
OD_NPLANES_MAX
][
OD_TXSIZES
][
PVQ_MAX_PARTITIONS
];
int
pvq_gaintheta_increment
;
uint16_t
pvq_gaintheta_cdf
[
2
*
OD_TXSIZES
*
PVQ_MAX_PARTITIONS
][
16
];
int
pvq_skip_dir_increment
;
uint16_t
pvq_skip_dir_cdf
[
2
*
(
OD_TXSIZES
-
1
)][
7
];
uint16_t
pvq_skip_dir_cdf
[
2
*
(
OD_TXSIZES
-
1
)][
CDF_SIZE
(
7
)];
};
typedef
struct
od_qm_entry
{
...
...
av1/decoder/pvq_decoder.c
View file @
ac4535c8
...
...
@@ -370,9 +370,9 @@ void od_pvq_decode(daala_dec_ctx *dec,
if
(
i
==
0
&&
!
skip_rest
[
0
]
&&
bs
>
0
)
{
int
skip_dir
;
int
j
;
skip_dir
=
aom_
decode_cdf_adapt
(
dec
->
r
,
skip_dir
=
aom_
read_symbol
(
dec
->
r
,
&
dec
->
state
.
adapt
.
pvq
.
pvq_skip_dir_cdf
[(
pli
!=
0
)
+
2
*
(
bs
-
1
)][
0
],
7
,
dec
->
state
.
adapt
.
pvq
.
pvq_skip_dir_increment
,
"pvq:skiprest"
);
"pvq:skiprest"
);
for
(
j
=
0
;
j
<
3
;
j
++
)
skip_rest
[
j
]
=
!!
(
skip_dir
&
(
1
<<
j
));
}
}
...
...
av1/encoder/bitstream.c
View file @
ac4535c8
...
...
@@ -1076,11 +1076,11 @@ static void pack_pvq_tokens(aom_writer *w, MACROBLOCK *const x,
encode_flip
,
flip
);
}
if
(
i
==
0
&&
!
pvq
->
skip_rest
&&
pvq
->
bs
>
0
)
{
aom_
encode_cdf_adapt
(
aom_
write_symbol
(
w
,
pvq
->
skip_dir
,
&
adapt
->
pvq
.
pvq_skip_dir_cdf
[(
plane
!=
0
)
+
2
*
(
pvq
->
bs
-
1
)][
0
],
7
,
adapt
->
pvq
.
pvq_skip_dir_increment
);
7
);
}
}
}
...
...
av1/encoder/pvq_encoder.c
View file @
ac4535c8
...
...
@@ -932,9 +932,8 @@ PVQ_SKIP_TYPE od_pvq_encode(daala_enc_ctx *enc,
skip_rest
,
encode_flip
,
flip
);
}
if
(
i
==
0
&&
!
skip_rest
&&
bs
>
0
)
{
aom_encode_cdf_adapt
(
&
enc
->
w
,
skip_dir
,
&
enc
->
state
.
adapt
.
pvq
.
pvq_skip_dir_cdf
[(
pli
!=
0
)
+
2
*
(
bs
-
1
)][
0
],
7
,
enc
->
state
.
adapt
.
pvq
.
pvq_skip_dir_increment
);
aom_write_symbol
(
&
enc
->
w
,
skip_dir
,
&
enc
->
state
.
adapt
.
pvq
.
pvq_skip_dir_cdf
[(
pli
!=
0
)
+
2
*
(
bs
-
1
)][
0
],
7
);
}
if
(
encode_flip
)
cfl_encoded
=
1
;
}
...
...
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