comparison flacenc.c @ 12308:7bb34d5cb22f libavcodec

Combine and simplify output_subframe_fixed() and output_subframe_lpc().

12307:a2de400ccd30

            set_sr_golomb_flac(&s->pb, res[j], k, INT32_MAX, 0);
    }
}


static void output_subframe_fixed(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i;

    /* warm-up samples */
    for (i = 0; i < sub->order; i++)
        put_sbits(&s->pb, sub->obits, sub->residual[i]);

    /* residual */
    output_residual(s, sub);
}


static void output_subframe_lpc(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i, cbits;
    FlacFrame *frame;

    frame = &s->frame;

    /* warm-up samples */
    for (i = 0; i < sub->order; i++)
        put_sbits(&s->pb, sub->obits, sub->residual[i]);

    /* LPC coefficients */
    cbits = s->options.lpc_coeff_precision;
    put_bits( &s->pb, 4, cbits-1);
    put_sbits(&s->pb, 5, sub->shift);
    for (i = 0; i < sub->order; i++)
        put_sbits(&s->pb, cbits, sub->coefs[i]);

    /* residual */
    output_residual(s, sub);
}

        /* subframe */
        switch (sub->type) {
        case FLAC_SUBFRAME_CONSTANT:
        case FLAC_SUBFRAME_VERBATIM: output_subframe_verbatim(s, sub); break;
        case FLAC_SUBFRAME_FIXED:    output_subframe_fixed(   s, sub); break;
        case FLAC_SUBFRAME_LPC:      output_subframe_lpc(     s, sub); break;
        }
    }
}

12308:7bb34d5cb22f

            set_sr_golomb_flac(&s->pb, res[j], k, INT32_MAX, 0);
    }
}


static void output_subframe_lpc(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i;

    /* warm-up samples */
    for (i = 0; i < sub->order; i++)
        put_sbits(&s->pb, sub->obits, sub->residual[i]);

    /* LPC coefficients */
    if (sub->type == FLAC_SUBFRAME_LPC) {
    int cbits = s->options.lpc_coeff_precision;
    put_bits( &s->pb, 4, cbits-1);
    put_sbits(&s->pb, 5, sub->shift);
    for (i = 0; i < sub->order; i++)
        put_sbits(&s->pb, cbits, sub->coefs[i]);
    }

    /* residual */
    output_residual(s, sub);
}

        /* subframe */
        switch (sub->type) {
        case FLAC_SUBFRAME_CONSTANT:
        case FLAC_SUBFRAME_VERBATIM: output_subframe_verbatim(s, sub); break;
        case FLAC_SUBFRAME_FIXED:
        case FLAC_SUBFRAME_LPC:      output_subframe_lpc(     s, sub); break;
        }
    }
}