Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
d6c2dc4f
Commit
d6c2dc4f
authored
Nov 15, 2016
by
Nathan E. Egge
Committed by
Nathan Egge
Jan 05, 2017
Browse files
Rename od_cdf_adapt_q15() to aom_cdf_adapt_q15().
Change-Id: I79addac857ff10c89f2ad79a5d2bf8d4c5e89ef4
parent
85001429
Changes
4
Hide whitespace changes
Inline
Side-by-side
av1/common/generic_code.c
View file @
d6c2dc4f
...
...
@@ -28,7 +28,7 @@ void aom_cdf_init(uint16_t *cdf, int ncdfs, int nsyms, int val, int first) {
}
/** Adapts a Q15 cdf after encoding/decoding a symbol. */
void
od
_cdf_adapt_q15
(
int
val
,
uint16_t
*
cdf
,
int
n
,
int
*
count
,
int
rate
)
{
void
aom
_cdf_adapt_q15
(
int
val
,
uint16_t
*
cdf
,
int
n
,
int
*
count
,
int
rate
)
{
int
i
;
*
count
=
OD_MINI
(
*
count
+
1
,
1
<<
rate
);
OD_ASSERT
(
cdf
[
n
-
1
]
==
32768
);
...
...
av1/common/generic_code.h
View file @
d6c2dc4f
...
...
@@ -54,7 +54,7 @@ void generic_model_init(generic_encoder *model);
void
aom_cdf_init
(
uint16_t
*
cdf
,
int
ncdfs
,
int
nsyms
,
int
val
,
int
first
);
void
od
_cdf_adapt_q15
(
int
val
,
uint16_t
*
cdf
,
int
n
,
int
*
count
,
int
rate
);
void
aom
_cdf_adapt_q15
(
int
val
,
uint16_t
*
cdf
,
int
n
,
int
*
count
,
int
rate
);
void
od_encode_cdf_adapt_q15
(
od_ec_enc
*
ec
,
int
val
,
uint16_t
*
cdf
,
int
n
,
int
*
count
,
int
rate
);
...
...
av1/decoder/generic_decoder.c
View file @
d6c2dc4f
...
...
@@ -44,7 +44,7 @@ int od_decode_cdf_adapt_q15_(od_ec_dec *ec, uint16_t *cdf, int n,
}
}
val
=
od_ec_decode_cdf_q15
(
ec
,
cdf
,
n
);
od
_cdf_adapt_q15
(
val
,
cdf
,
n
,
count
,
rate
);
aom
_cdf_adapt_q15
(
val
,
cdf
,
n
,
count
,
rate
);
return
val
;
}
...
...
av1/encoder/generic_encoder.c
View file @
d6c2dc4f
...
...
@@ -47,7 +47,7 @@ void od_encode_cdf_adapt_q15(od_ec_enc *ec, int val, uint16_t *cdf, int n,
}
}
od_ec_encode_cdf_q15
(
ec
,
val
,
cdf
,
n
);
od
_cdf_adapt_q15
(
val
,
cdf
,
n
,
count
,
rate
);
aom
_cdf_adapt_q15
(
val
,
cdf
,
n
,
count
,
rate
);
}
/** Encodes a value from 0 to N-1 (with N up to 16) based on a cdf and adapts
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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