Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Mark Harris
Opus
Commits
f9fdbffb
Commit
f9fdbffb
authored
Sep 05, 2010
by
Jean-Marc Valin
Browse files
Don't allow transients for 2.5 ms frames.
It never made sense anyway.
parent
9e72ae21
Changes
3
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
f9fdbffb
...
...
@@ -5,8 +5,8 @@ AC_INIT(libcelt/arch.h)
AM_CONFIG_HEADER([config.h])
CELT_MAJOR_VERSION=0
CELT_MINOR_VERSION=
8
CELT_MICRO_VERSION=
1
CELT_MINOR_VERSION=
9
CELT_MICRO_VERSION=
0
CELT_EXTRA_VERSION=
CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
LIBCELT_SUFFIX=0
...
...
@@ -118,7 +118,7 @@ AC_ARG_ENABLE(fixed-point-debug, [ --enable-fixed-point-debug debug fixed-poin
fi])
float_approx=$has_float_approx
AC_ARG_ENABLE(float-approx, [ --
dis
able-float-approx
do not us
e fast approximations for floating point],
AC_ARG_ENABLE(float-approx, [ --
en
able-float-approx
enabl
e fast approximations for floating point],
[ if test "$enableval" = yes; then
AC_WARN([Floating point approximations are not supported on all platforms.])
float_approx=yes
...
...
libcelt/celt.c
View file @
f9fdbffb
...
...
@@ -629,7 +629,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
resynth
=
optional_resynthesis
!=
NULL
;
if
(
st
->
complexity
>
1
)
if
(
st
->
complexity
>
1
&&
LM
>
0
)
{
isTransient
=
M
>
1
&&
transient_analysis
(
in
,
N
+
st
->
overlap
,
C
,
&
transient_time
,
...
...
@@ -746,7 +746,8 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, c
error
,
enc
,
C
,
LM
,
nbAvailableBytes
,
st
->
force_intra
,
&
st
->
delayedIntra
,
st
->
complexity
>=
4
);
ec_enc_bit_prob
(
enc
,
shortBlocks
!=
0
,
8192
);
if
(
LM
>
0
)
ec_enc_bit_prob
(
enc
,
shortBlocks
!=
0
,
8192
);
if
(
shortBlocks
)
{
...
...
@@ -1488,7 +1489,10 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da
unquant_coarse_energy
(
st
->
mode
,
st
->
start
,
st
->
end
,
bandE
,
oldBandE
,
intra_ener
,
st
->
mode
->
prob
,
dec
,
C
,
LM
);
isTransient
=
ec_dec_bit_prob
(
dec
,
8192
);
if
(
LM
>
0
)
isTransient
=
ec_dec_bit_prob
(
dec
,
8192
);
else
isTransient
=
0
;
if
(
isTransient
)
shortBlocks
=
M
;
...
...
libcelt/modes.h
View file @
f9fdbffb
...
...
@@ -43,7 +43,7 @@
#define MAX_CONFIG_SIZES 5
#define CELT_BITSTREAM_VERSION 0x8000000
d
#define CELT_BITSTREAM_VERSION 0x8000000
e
#ifdef STATIC_MODES
#include
"static_modes.h"
...
...
Write
Preview
Supports
Markdown
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