comparison flacenc.c @ 12311:1a4351501522 libavcodec

Combine output_subframe_verbatim() and output_subframe_lpc().

12310:eba0e28f6dbc

                 put_bits_count(&s->pb) >> 3);
    put_bits(&s->pb, 8, crc);
}


static void output_subframe_verbatim(FlacEncodeContext *s, FlacSubframe *sub)
{
    put_sbits(&s->pb, sub->obits, sub->residual[0]);

    if (sub->type == FLAC_SUBFRAME_VERBATIM) {
        int i;
        for (i = 0; i < s->frame.blocksize; i++)
            put_sbits(&s->pb, sub->obits, sub->residual[i]);
    }
}


static void output_subframe_lpc(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i, p, porder, psize;
    int32_t *res, *part_end, *frame_end;

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

    /* LPC coefficients */
    if (sub->type == FLAC_SUBFRAME_LPC) {

    psize   = s->frame.blocksize >> porder;
    put_bits(&s->pb, 4, porder);

    /* residual */
    part_end  = &sub->residual[psize             ];
    frame_end = &sub->residual[s->frame.blocksize];
    for (p = 0; p < 1 << porder; p++) {
        int k = sub->rc.params[p];
        put_bits(&s->pb, 4, k);
        while (res < part_end)
            set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0);
        part_end = FFMIN(frame_end, part_end + psize);
    }
}


static void output_subframes(FlacEncodeContext *s)
{

        put_bits(&s->pb, 1, 0);
        put_bits(&s->pb, 6, sub->type_code);
        put_bits(&s->pb, 1, 0); /* no wasted bits */

        /* 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;
        }
    }
}


static void output_frame_footer(FlacEncodeContext *s)

12311:1a4351501522

                 put_bits_count(&s->pb) >> 3);
    put_bits(&s->pb, 8, crc);
}


static void output_subframe(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i, p, porder, psize;
    int32_t *part_end;
    int32_t *res       =  sub->residual;
    int32_t *frame_end = &sub->residual[s->frame.blocksize];

    if (sub->type == FLAC_SUBFRAME_CONSTANT) {
        put_sbits(&s->pb, sub->obits, res[0]);
    } else if (sub->type == FLAC_SUBFRAME_VERBATIM) {
        while (res < frame_end)
            put_sbits(&s->pb, sub->obits, *res++);
    } else {
    /* warm-up samples */
    for (i = 0; i < sub->order; i++)
        put_sbits(&s->pb, sub->obits, *res++);

    /* LPC coefficients */
    if (sub->type == FLAC_SUBFRAME_LPC) {

    psize   = s->frame.blocksize >> porder;
    put_bits(&s->pb, 4, porder);

    /* residual */
    part_end  = &sub->residual[psize             ];
    for (p = 0; p < 1 << porder; p++) {
        int k = sub->rc.params[p];
        put_bits(&s->pb, 4, k);
        while (res < part_end)
            set_sr_golomb_flac(&s->pb, *res++, k, INT32_MAX, 0);
        part_end = FFMIN(frame_end, part_end + psize);
    }
    }
}


static void output_subframes(FlacEncodeContext *s)
{

        put_bits(&s->pb, 1, 0);
        put_bits(&s->pb, 6, sub->type_code);
        put_bits(&s->pb, 1, 0); /* no wasted bits */

        /* subframe */
        output_subframe(s, sub);
    }
}


static void output_frame_footer(FlacEncodeContext *s)