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

Disabling the postfilter when complexity<5 or when CELT_SET_PREDICTION<=1

Browse source
This commit is contained in:
Jean-Marc Valin 2011-02-03 13:36:03 -05:00
parent ec6588ae14
commit d539c6b9c5
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libcelt/celt.c
View file

@ -104,6 +104,7 @@ struct CELTEncoder {
int stream_channels; int stream_channels;
int force_intra; int force_intra;
int disable_pf;
int complexity; int complexity;
int upsample; int upsample;
int start, end; int start, end;
@ -1065,7 +1066,7 @@ int celt_encode_with_ec_float(CELTEncoder * restrict st, const celt_sig * pcm, i
enc->nbits_total+=tell-ec_enc_tell(enc,0); enc->nbits_total+=tell-ec_enc_tell(enc,0);
} }
#ifdef ENABLE_POSTFILTER #ifdef ENABLE_POSTFILTER
if (nbAvailableBytes>12*C && st->start==0 && !silence) if (nbAvailableBytes>12*C && st->start==0 && !silence && !st->disable_pf && st->complexity >= 5)
{ {
VARDECL(celt_word16, pitch_buf); VARDECL(celt_word16, pitch_buf);
ALLOC(pitch_buf, (COMBFILTER_MAXPERIOD+N)>>1, celt_word16); ALLOC(pitch_buf, (COMBFILTER_MAXPERIOD+N)>>1, celt_word16);
@ -1710,14 +1711,8 @@ int celt_encoder_ctl(CELTEncoder * restrict st, int request, ...)
int value = va_arg(ap, celt_int32); int value = va_arg(ap, celt_int32);
if (value<0 || value>2) if (value<0 || value>2)
goto bad_arg; goto bad_arg;
if (value==0) st->disable_pf = value<=1;
{ st->force_intra = value==0;
st->force_intra = 1;
} else if (value==1) {
st->force_intra = 0;
} else {
st->force_intra = 0;
}
} }
break; break;
case CELT_SET_VBR_CONSTRAINT_REQUEST: case CELT_SET_VBR_CONSTRAINT_REQUEST: