Commit graph

1515 commits

Author SHA1 Message Date
Timothy B. Terriberry
cf5d3a8cf2 Fix short length detection.
aa6fec66 added a check to reject modes with shorts longer than
 3.33 ms (less than 300 per second).
However, it only rejected modes which could not be split at all.
This expands the check to also reject modes which, even after
 splitting the maximum amount, still do not have shorts less than
 3.33 ms.
2011-02-03 01:07:27 -05:00
Jean-Marc Valin
51c786241b More Opus build work 2011-02-03 00:43:37 -05:00
Jean-Marc Valin
3a8f04db17 Enabling the post-filter and exporting the ec functions for Opus 2011-02-02 23:02:25 -05:00
Jean-Marc Valin
b44e94ef58 Also fixing the DoFs for intensity stereo 2011-02-02 21:23:21 -05:00
Jean-Marc Valin
0889e2ac15 Getting the right DoFs for dual stereo 2011-02-02 21:03:31 -05:00
Jean-Marc Valin
9cc56bf0af Removing ancient allocation matrix 2011-02-01 22:03:26 -05:00
Timothy B. Terriberry
ce6d0904a1 Increase caps/allocation accuracy.
This stores the caps array in 32nd bits/sample instead of 1/2 bits
 scaled by LM and the channel count, which is slightly less
 less accurate for the last two bands, and much more accurate for
 all the other bands.
A constant offset is subtracted to allow it to represent values
 larger than 255 in 8 bits (the range of unoffset values is
 77...304).
In addition, this replaces the last modeline in the allocation table
 with the caps array, allowing the initial interpolation to
 allocate 8 bits/sample or more, which was otherwise impossible.
2011-02-01 21:17:57 -05:00
Jean-Marc Valin
424eb74279 Only checking for a mismatch when RESYNTH is defined 2011-02-01 20:33:17 -05:00
Timothy B. Terriberry
aa6fec669e Limit mode creation to supported modes.
We did no real error checking to see if a mode is supported when it
 is created.
This patch implements checks for Jean-Marc's rules:
1) A mode must have frames at least 1ms in length (no more than
    1000 per second).
2) A mode must have shorts of at most 3.33 ms (at least 300 per
    second).
It also adds error checking to dump_modes so we report the error
 instead of crashing when we fail to create a mode.
2011-02-01 18:58:07 -05:00
Jean-Marc Valin
7e983194a3 Fixing the global stack -- and an overflow in collapse_mask 2011-02-01 18:00:29 -05:00
Timothy B. Terriberry
2799c29792 Add assertions for band size restrictions.
The way folding is implemented requires two restrictions:
1. The last band must be the largest (so we can use its size to
 allocate a temporary buffer to handle interleaving/TF changes).
2. No band can be larger than twice the size of the previous band
 (so that once we have enough data to start folding, we will always
 have enough data to fold).

Mode creation makes a heuristic attempt to satisfy these
 conditions, but nothing actually guarantees it.
This adds some asserts to check them during mode creation.
They current pass for all supported custom modes.
2011-02-01 17:06:58 -05:00
Timothy B. Terriberry
cb8f366af6 Don't allow empty eBands.
Currently compute_ebands()'s attempts to round bands to even sizes
 and enforce size constraints on consecutive bands can leave some
 bands entirely empty (e.g., Fs=8000, frame_size=64, i=11).
This adds a simple post-processing loop to remove such bands.
2011-02-01 17:06:28 -05:00
Jean-Marc Valin
7bb26e13ca Adds a generic CELT_SET_BITRATE() ctl() API for CBR and VBR 2011-02-01 17:04:27 -05:00
Jean-Marc Valin
263e271948 Tuning the split threshold 2011-02-01 11:20:09 -05:00
Timothy B. Terriberry
411a84faea Add a seprate qtheta offset for two-phase stereo.
9b34bd83 caused serious regressions for 240-sample frame stereo,
 because the previous qb limit was _always_ hit for two-phase
 stereo.
Two-phase stereo really does operate with a different model (for
 example, the single bit allocated to the side should really
 probably be thought of as a sign bit for qtheta, but we don't
 count it as part of qtheta's allocation).
The old code was equivalent to a separate two-phase offset of 12,
 however Greg Maxwell's testing demonstrates that 16 performs
 best.
2011-02-01 06:35:14 -05:00
Timothy B. Terriberry
4499263b44 Adjust the splitting threshold.
Previously, we would only split a band if it was allocated more than
 32 bits.
However, the N=4 codebook can only produce about 22.5 bits, and two
 N=2 bands combined can only produce 26 bits, including 8 bits for
 qtheta, so if we wait until we allocate 32, we're guaranteed to fall
 short.
Several of the larger bands come pretty far from filling 32 bits as
 well, though their split versions will.

Greg Maxwell also suggested adding an offset to the threshold to
 account for the inefficiency of using qtheta compared to another
 VQ dimension.
This patch uses 1 bit as a placeholder, as it's a clear
 improvement, but we may adjust this later after collecting data on
 more possibilities over more files.
2011-01-31 22:42:12 -05:00
Jean-Marc Valin
5cf41c9d1f Including static_mode* files in the distribution 2011-01-31 17:34:46 -05:00
Jean-Marc Valin
a350bf5262 Stop collapsing the background noise channels when switching to mono 2011-01-31 17:30:15 -05:00
Timothy B. Terriberry
682b6cf1ad Don't destroy stereo history when switching to mono.
The first version of the mono decoder with stereo output collapsed
 the historic energy values stored for anti-collapse down to one
 channel (by taking the max).
This means that a subsequent switch back would continue on using
 the the maximum of the two values instead of the original history,
 which would make anti-collapse produce louder noise (and
 potentially more pre-echo than otherwise).

This patch moves the max into the anti_collapse function itself,
 and does not store the values back into the source array, so the
 full stereo history is maintained if subsequent frames switch
 back.
It also fixes an encoder mismatch, which never took the max
 (assuming, apparently, that the output channel count would never
 change).
2011-01-31 17:26:02 -05:00
Timothy B. Terriberry
948d27c9bc Propagate balance from compute_allocation() to quant_all_bands().
Instead of just dumping excess bits into the first band after
 allocation, use them to initialize the rebalancing loop in
 quant_all_bands().
This allows these bits to be redistributed over several bands, like
 normal.
2011-01-31 15:37:01 -05:00
Jean-Marc Valin
713d7a4ce9 Fix sample type conversion when resampling 2011-01-31 13:41:01 -05:00
Jean-Marc Valin
b35807d75a No longer extracting the frame size from the mode to build the header 2011-01-31 13:27:21 -05:00
Jean-Marc Valin
00a98f5deb Making the stereo encoder capable of encoding in mono 2011-01-31 11:19:03 -05:00
Jean-Marc Valin
f1916a14fd Making it possible for the stereo decoder to decode a mono stream 2011-01-31 10:51:30 -05:00
Timothy B. Terriberry
89039a3ff9 Apply band caps to the band allocation table.
The average caps over all values of LM and C are well below the
 target allocations of the last two modelines.
Lower them to the caps, to prevent hitting them quite so early.
This helps quality at medium-high rates, in the 180-192 kbps range.
2011-01-31 01:38:52 -05:00
Timothy B. Terriberry
b5d123a5f5 More band caps updates.
Use measured cross-entropy to estimate the real cost of coding
 qtheta given the allocated qb parameter, instead of the entropy of
 the PDF.
This is generally much lower, and reduces waste at high rates.
This patch also removes some intermediate rounding from this
 computation.
2011-01-31 01:37:51 -05:00
Timothy B. Terriberry
13bffd288d Add generic fine-energy rebalancing.
This extends the previous rebalancing for fine energy in N=1 bands
 to also allocate extra fine bits for bands that go over their cap.
2011-01-31 00:52:42 -05:00
Jean-Marc Valin
8cf29f0991 Custom and non-custom versions of the get_size() functions 2011-01-30 23:38:28 -05:00
Jean-Marc Valin
aaca4a713f Making sure that itheta=0 or 16384 really cuts allocation to one band 2011-01-30 21:19:06 -05:00
Jean-Marc Valin
665da0ba4d Merge branch 'exp_api_change' 2011-01-30 13:39:56 -05:00
Timothy B. Terriberry
c564307463 Use a smarter per-band bitrate cap.
The previous "dumb cap" of (64<<LM)*(C<<BITRES) was not actually
 achievable by many (most) bands, and did not take the cost of
 coding theta for splits into account, and so was too small for some
 bands.
This patch adds code to compute a fairly accurate estimate of the
 real maximum per-band rate (an estimate only because of rounding
 effects and the fact that the bit usage for theta is variable),
 which is then truncated and stored in an 8-bit table in the mode.

This gives improved quality at all rates over 160 kbps/channel,
 prevents bits from being wasted all the way up to 255 kbps/channel
 (the maximum rate allowed, and approximately the maximum number of
 bits that can usefully be used regardless of the allocation), and
 prevents dynalloc and trim from producing enormous waste
 (eliminating the need for encoder logic to prevent this).
2011-01-30 11:42:38 -05:00
Jean-Marc Valin
d6c3d3ceae Error handling in _create() functions 2011-01-30 11:00:24 -05:00
Jean-Marc Valin
913a1742b9 Adding resampling support
We use the MDCT as low-pass filter.
2011-01-29 11:35:19 -05:00
Timothy B. Terriberry
9b34bd835c Change qb cap to prevent side-fold collapses.
Previously, in a stereo split with itheta==16384, but without
 enough bits left over to actually code a pulse, the target band
 would completely collapse, because the mid gain would be zero and
 we don't fold the side.
This changes the limit to ensure that we never set qn>1 unless we
 know we'll have enough bits for at least one pulse.
This should eliminate the last possible whole-band collapse.
2011-01-29 01:31:09 -05:00
Jean-Marc Valin
c97b258c62 celt_encoder_create() now defaults to Opus standard mode
The old constructor is renamed celt_encoder_create_custom(). Same
for the decoder.
2011-01-28 23:07:32 -05:00
Jean-Marc Valin
5ad35bf3bf Enabling the standard static mode by default 2011-01-28 22:42:09 -05:00
Jean-Marc Valin
d9e4b1d72c Adding the auto-generated static modes for float and fixed 2011-01-28 22:24:40 -05:00
Jean-Marc Valin
17cab431db Using the actual degrees of freedom rather than N*C for fine offset 2011-01-28 20:56:56 -05:00
Gregory Maxwell
420c325875 Prevent VBR from shooting up to the maximum rate if set to very low target rates, and prevent the encoder VBR from producing 1 byte frames (which are no longer allowed). 2011-01-27 22:58:12 -05:00
Jean-Marc Valin
09213de91c Don't rebalance bits for itheta=0 or 16384 2011-01-27 21:43:24 -05:00
Jean-Marc Valin
a928572055 Making rebalance a celt_int32 2011-01-27 18:44:26 -05:00
Jean-Marc Valin
47e905dce7 Making anti-collapse a bit more conservative again
The energy memory can be lowered (not increased) during a transient
2011-01-27 18:05:47 -05:00
Jean-Marc Valin
b417d8392e Changing some double constants to float 2011-01-27 17:19:49 -05:00
Jean-Marc Valin
61f40418fa Adjusting post-filter coefficients to be exact in 13 bit precision.
That way they can be exact in 16 bits once multiplied by the gain
2011-01-27 17:14:33 -05:00
Jean-Marc Valin
49f76805ba Adjusting pre-emphasis coefs to be exact in 16-bit precision 2011-01-27 17:01:59 -05:00
Jean-Marc Valin
097c5be8dc Using a real 16-bit value for the coarse beta on intra frames 2011-01-27 16:51:20 -05:00
Jean-Marc Valin
8ca161212b Reducing waste at high bit-rate
We now encode the highest bitrate part of the split first and transfer
any unused bits to the other part. We use a dead zone of three bits
to prevent redistributing in cases of random fluctuation (or else
we will statistically lower the allocation of higher frequencies at
low-mid bitrates).
2011-01-27 16:28:16 -05:00
Jean-Marc Valin
c30f8ca666 Minor opus_compare fix 2011-01-27 15:50:27 -05:00
Jean-Marc Valin
4cd3dd31ee Comparison tool for decoder compliance 2011-01-27 15:47:15 -05:00
Jean-Marc Valin
79afa9c605 Fixes fixed-point overflow on really low energy
Makes celt_exp2() use Q10 input to avoid problems on very low energy.
Also makes the pitch downsampling more conservative on gain to avoid
problems later.
2011-01-27 10:46:01 -05:00