Fix Hybrid redundancy assertion failure in ec_enc_shrink(), even
if SILK produces more than maxBits, by reducing or eliminating
redundancy when necessary.  Don't reserve space for redundancy that
is too small to be used for redundancy.  When there is not enough
space for redundancy, allow the regular frame to use all the bits.

With packets of 80 ms or more, a SILK bandwidth switch was missing
the second half of the redundancy, because st->silk_bw_switch was
cleared too early before any recursive calls.

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Also clean up comments from the last patches

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Felicia Lim authored 8 years ago and Jean-Marc Valin committed 8 years ago

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

Without that, we could bust the budget and end up with the
if (ec_tell(&enc) <= 8*nb_compr_bytes)
being false, followed by an assert failure later.

Reported by Mark Warner.

memcpy() aliasing bug caught by Felicia's encoder fuzzing test

This should also avoid cases where stereo streams receive fewer
bits than mono streams.

Michael Graczyk authored 8 years ago and Jean-Marc Valin committed 8 years ago

Change-Id: I16bd4cd990d8ad5888c9e30016218ac25242ecb5

Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>

The encoder would reserve bytes for redundancy and then decide to use
CELT, but not use those bytes.

Also avoids stupidly high/low rates

Also clarify in doc that conformance issue relates to decoder only.

The multistream encoder input has st->layout.nb_channels channels.
The number of channels actually encoded is st->layout.nb_streams +
st->layout.nb_coupled_streams, which may be fewer, so ideally it
would only analyze those when computing the optimal frame size, but
there is no code to do that currently.

Divide by the actual number of channels mixed

Adding a "channels" argument to compute_frame_energy() and is_digital_silence()

This avoids an overflow on extreme signals

Thanks to Mark Harris for pointing it out.

Gives another ~2% speedup

Speeds up the encoder by about 1%

Felicia Lim authored 8 years ago and Timothy B. Terriberry committed 8 years ago

Signed-off-by: Timothy B. Terriberry <tterribe@xiph.org>

That was likely a mistake from a misunderstanding on the SILK bit allocation

Hybrid CBR now simply forces the SILK CBR rate to the "target" value. Also,
we're getting rid of the -2 kb/s offset for CBR, which appeared to be harmful.
In the case of hybrid constrained VBR, the cap is computed in the same way
as the target.