comparison flacenc.c @ 12306:94e9dcf99f21 libavcodec

Pass FlacSubframe to output_subframe_* instead of channel number.

12305:000218dd70aa

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


static void output_subframe_constant(FlacEncodeContext *s, int ch)
{
    FlacSubframe *sub;
    int32_t res;

    sub = &s->frame.subframes[ch];
    res = sub->residual[0];
    put_sbits(&s->pb, sub->obits, res);
}


static void output_subframe_verbatim(FlacEncodeContext *s, int ch)
{
    int i;
    FlacFrame *frame;
    FlacSubframe *sub;
    int32_t res;

    frame = &s->frame;
    sub   = &frame->subframes[ch];

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


static void output_residual(FlacEncodeContext *s, int ch)
{
    int i, j, p, n, parts;
    int k, porder, psize, res_cnt;
    FlacFrame *frame;
    FlacSubframe *sub;
    int32_t *res;

    frame = &s->frame;
    sub   = &frame->subframes[ch];
    res   = sub->residual;
    n     = frame->blocksize;

    /* rice-encoded block */
    put_bits(&s->pb, 2, 0);

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


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

    frame = &s->frame;
    sub   = &frame->subframes[ch];

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

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


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

    frame = &s->frame;
    sub = &frame->subframes[ch];

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

    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, ch);
}


static void output_subframes(FlacEncodeContext *s)
{

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

        /* subframe */
        if(sub->type == FLAC_SUBFRAME_CONSTANT)
            output_subframe_constant(s, ch);
        else if(sub->type == FLAC_SUBFRAME_VERBATIM)
            output_subframe_verbatim(s, ch);
        else if(sub->type == FLAC_SUBFRAME_FIXED)
            output_subframe_fixed(s, ch);
        else if(sub->type == FLAC_SUBFRAME_LPC)
            output_subframe_lpc(s, ch);
    }
}


static void output_frame_footer(FlacEncodeContext *s)

12306:94e9dcf99f21

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


static void output_subframe_constant(FlacEncodeContext *s, FlacSubframe *sub)
{
    int32_t res;

    res = sub->residual[0];
    put_sbits(&s->pb, sub->obits, res);
}


static void output_subframe_verbatim(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i;
    FlacFrame *frame;
    int32_t res;

    frame = &s->frame;

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


static void output_residual(FlacEncodeContext *s, FlacSubframe *sub)
{
    int i, j, p, n, parts;
    int k, porder, psize, res_cnt;
    FlacFrame *frame;
    int32_t *res;

    frame = &s->frame;
    res   = sub->residual;
    n     = frame->blocksize;

    /* rice-encoded block */
    put_bits(&s->pb, 2, 0);

            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]);

    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);
}


static void output_subframes(FlacEncodeContext *s)
{

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

        /* subframe */
        if(sub->type == FLAC_SUBFRAME_CONSTANT)
            output_subframe_constant(s, sub);
        else if(sub->type == FLAC_SUBFRAME_VERBATIM)
            output_subframe_verbatim(s, sub);
        else if(sub->type == FLAC_SUBFRAME_FIXED)
            output_subframe_fixed(s, sub);
        else if(sub->type == FLAC_SUBFRAME_LPC)
            output_subframe_lpc(s, sub);
    }
}


static void output_frame_footer(FlacEncodeContext *s)