eden-emu/opus
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Intensity stereo now in the bit-stream

Browse source 
Bands that are intensity-coded also get less bits than the others
This commit is contained in:
Jean-Marc Valin 2010-11-26 10:32:03 -05:00
parent fb031119d3
commit 4f177e8510
3 changed files with 81 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

42
libcelt/bands.c
View file

@ -476,7 +476,7 @@ static celt_uint32 lcg_rand(celt_uint32 seed)
in two and transmit the energy difference with the two half-bands. It
can be called recursively so bands can end up being split in 8 parts. */
static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_norm *Y,
int N, int b, int spread, int B, int tf_change, celt_norm *lowband, int resynth, void *ec,
int N, int b, int spread, int B, int intensity, int tf_change, celt_norm *lowband, int resynth, void *ec,
celt_int32 *remaining_bits, int LM, celt_norm *lowband_out, const celt_ener *bandE, int level,
celt_int32 *seed, celt_word16 gain, celt_norm *lowband_scratch)
{
@ -601,7 +601,7 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
offset = ((m->logN[i]+(LM<<BITRES))>>1) - (stereo ? QTHETA_OFFSET_STEREO : QTHETA_OFFSET);
qn = compute_qn(N, b, offset, stereo);
qalloc = 0;
if (stereo && b<12*N && i>=9)
if (stereo && i>=intensity)
qn = 1;
if (qn!=1)
{
@ -745,7 +745,7 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
}
}
sign = 2*sign - 1;
quant_band(encode, m, i, x2, NULL, N, mbits, spread, B, tf_change, lowband, resynth, ec, remaining_bits, LM, lowband_out, NULL, level, seed, gain, lowband_scratch);
quant_band(encode, m, i, x2, NULL, N, mbits, spread, B, intensity, tf_change, lowband, resynth, ec, remaining_bits, LM, lowband_out, NULL, level, seed, gain, lowband_scratch);
y2[0] = -sign*x2[1];
y2[1] = sign*x2[0];
if (resynth)
@ -790,10 +790,10 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
else
next_level = level+1;
quant_band(encode, m, i, X, NULL, N, mbits, spread, B, tf_change,
quant_band(encode, m, i, X, NULL, N, mbits, spread, B, intensity, tf_change,
lowband, resynth, ec, remaining_bits, LM, next_lowband_out1,
NULL, next_level, seed, MULT16_16_P15(gain,mid), lowband_scratch);
quant_band(encode, m, i, Y, NULL, N, sbits, spread, B, tf_change,
quant_band(encode, m, i, Y, NULL, N, sbits, spread, B, intensity, tf_change,
next_lowband2, resynth, ec, remaining_bits, LM, NULL,
NULL, next_level, seed, MULT16_16_P15(gain,side), NULL);
}
@ -900,7 +900,10 @@ static void quant_band(int encode, const CELTMode *m, int i, celt_norm *X, celt_
}
}
void quant_all_bands(int encode, const CELTMode *m, int start, int end, celt_norm *_X, celt_norm *_Y, const celt_ener *bandE, int *pulses, int shortBlocks, int fold, int *tf_res, int resynth, int total_bits, void *ec, int LM, int codedBands)
void quant_all_bands(int encode, const CELTMode *m, int start, int end,
celt_norm *_X, celt_norm *_Y, const celt_ener *bandE, int *pulses,
int shortBlocks, int fold, int intensity, int *tf_res, int resynth,
int total_bits, void *ec, int LM, int codedBands)
{
int i, balance;
celt_int32 remaining_bits;
@ -922,6 +925,31 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end, celt_nor
ALLOC(lowband_scratch, M*(eBands[m->nbEBands]-eBands[m->nbEBands-1]), celt_norm);
norm = _norm;
if (C==2)
{
int j;
int left = 0;
for (j=intensity;j<codedBands;j++)
{
int tmp = pulses[j]/2;
left += tmp;
pulses[j] -= tmp;
}
if (codedBands) {
int perband;
perband = left/(m->eBands[codedBands]-m->eBands[start]);
for (j=start;j<codedBands;j++)
pulses[j] += perband*(m->eBands[j+1]-m->eBands[j]);
left = left-(m->eBands[codedBands]-m->eBands[start])*perband;
for (j=start;j<codedBands;j++)
{
int tmp = IMIN(left, m->eBands[j+1]-m->eBands[j]);
pulses[j] += tmp;
left -= tmp;
}
}
}
if (encode)
seed = ((ec_enc*)ec)->rng;
else
@ -987,7 +1015,7 @@ void quant_all_bands(int encode, const CELTMode *m, int start, int end, celt_nor
if (effective_lowband < norm+M*eBands[start])
effective_lowband = norm+M*eBands[start];
}
quant_band(encode, m, i, X, Y, N, b, fold, B, tf_change,
quant_band(encode, m, i, X, Y, N, b, fold, B, intensity, tf_change,
effective_lowband, resynth, ec, &remaining_bits, LM,
norm+M*eBands[i], bandE, 0, &seed, Q15ONE, lowband_scratch);

5
libcelt/bands.h
View file

@ -78,7 +78,10 @@ void haar1(celt_norm *X, int N0, int stride);
* @param total_bits Total number of bits that can be used for the frame (including the ones already spent)
* @param enc Entropy encoder
*/
void quant_all_bands(int encode, const CELTMode *m, int start, int end, celt_norm * X, celt_norm * Y, const celt_ener *bandE, int *pulses, int time_domain, int fold, int *tf_res, int resynth, int total_bits, void *enc, int M, int codedBands);
void quant_all_bands(int encode, const CELTMode *m, int start, int end,
celt_norm * X, celt_norm * Y, const celt_ener *bandE, int *pulses,
int time_domain, int fold, int intensity, int *tf_res, int resynth,
int total_bits, void *enc, int M, int codedBands);
void stereo_decision(const CELTMode *m, celt_norm * restrict X, int *stereo_mode, int len, int M);

44
libcelt/celt.c
View file

@ -685,6 +685,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
int alloc_trim;
int pitch_index=0;
celt_word16 gain1 = 0;
int intensity=0;
SAVE_STACK;
if (nbCompressedBytes<0 || pcm==NULL)
@ -997,6 +998,37 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
ec_byte_shrink(&buf, nbCompressedBytes);
}
if (C==2)
{
int effectiveRate;
if (st->vbr_rate_norm>0)
effectiveRate = st->vbr_rate_norm>>BITRES<<LM;
else
effectiveRate = nbCompressedBytes*8;
/* Account for coarse energy */
effectiveRate -= 80;
effectiveRate >>= LM;
/* effectiveRate in kb/s */
effectiveRate = 2*effectiveRate/5;
if (effectiveRate<35)
intensity = 6;
else if (effectiveRate<50)
intensity = 12;
else if (effectiveRate<68)
intensity = 16;
else if (effectiveRate<84)
intensity = 18;
else if (effectiveRate<102)
intensity = 19;
else if (effectiveRate<130)
intensity = 20;
else
intensity = 100;
intensity = IMIN(st->end,IMAX(st->start, intensity));
ec_enc_uint(enc, intensity, 1+st->end-st->start);
}
/* Bit allocation */
ALLOC(fine_quant, st->mode->nbEBands, int);
ALLOC(pulses, st->mode->nbEBands, int);
@ -1019,7 +1051,9 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
#endif
/* Residual quantisation */
quant_all_bands(1, st->mode, st->start, st->end, X, C==2 ? X+N : NULL, bandE, pulses, shortBlocks, has_fold, tf_res, resynth, nbCompressedBytes*8, enc, LM, codedBands);
quant_all_bands(1, st->mode, st->start, st->end, X, C==2 ? X+N : NULL,
bandE, pulses, shortBlocks, has_fold, intensity, tf_res, resynth,
nbCompressedBytes*8, enc, LM, codedBands);
quant_energy_finalise(st->mode, st->start, st->end, bandE, oldBandE, error, fine_quant, fine_priority, nbCompressedBytes*8-ec_enc_tell(enc, 0), enc, C);
@ -1581,6 +1615,7 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da
int alloc_trim;
int postfilter_pitch;
celt_word16 postfilter_gain;
int intensity=0;
SAVE_STACK;
if (pcm==NULL)
@ -1708,13 +1743,18 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da
ec_dec_update(dec, trim_cdf[alloc_trim], trim_cdf[alloc_trim+1], 128);
}
if (C==2)
intensity = ec_dec_uint(dec, 1+st->end-st->start);
bits = len*8 - ec_dec_tell(dec, 0) - 1;
codedBands = compute_allocation(st->mode, st->start, st->end, offsets, alloc_trim, bits, pulses, fine_quant, fine_priority, C, LM);
unquant_fine_energy(st->mode, st->start, st->end, bandE, oldBandE, fine_quant, dec, C);
/* Decode fixed codebook */
quant_all_bands(0, st->mode, st->start, st->end, X, C==2 ? X+N : NULL, NULL, pulses, shortBlocks, has_fold, tf_res, 1, len*8, dec, LM, codedBands);
quant_all_bands(0, st->mode, st->start, st->end, X, C==2 ? X+N : NULL,
NULL, pulses, shortBlocks, has_fold, intensity, tf_res, 1,
len*8, dec, LM, codedBands);
unquant_energy_finalise(st->mode, st->start, st->end, bandE, oldBandE,
fine_quant, fine_priority, len*8-ec_dec_tell(dec, 0), dec, C);