shithub: opus

Info  •  Files  •  Log  •  Branches

Forced intra now overrides intra avoidance at low rate. Also, using the number
of bands as criterion for auto-intra disabling.

--- a/libcelt/celt.c

+++ b/libcelt/celt.c

@@ -676,14 +676,12 @@

    for (i=0;i<st->mode->nbEBands*C;i++)

       bandLogE[i] = amp2Log(bandE[i]);

-   intra_ener = (st->force_intra || st->delayedIntra);

+   /* Don't use intra energy when we're operating at low bit-rate */

+   intra_ener = st->force_intra || (st->delayedIntra && nbCompressedBytes > st->mode->nbEBands);

    if (shortBlocks || intra_decision(bandLogE, st->oldBandE, st->mode->nbEBands))

       st->delayedIntra = 1;

    else

       st->delayedIntra = 0;

-   /* Don't use intra energy when we're operating at low bit-rate */

-   if (nbCompressedBytes < 20)

-      intra_ener = 0;

    /* Pitch analysis: we do it early to save on the peak stack space */

    /* Don't use pitch if there isn't enough data available yet,