comparison flacenc.c @ 12314:46b00f7710da libavcodec

Combine output_subframe() and output_subframes().

12313:c1918adb174b

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

            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)
{
    FlacSubframe *sub;
    int ch;

    for (ch = 0; ch < s->channels; ch++) {
        sub = &s->frame.subframes[ch];

        /* subframe header */
        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)

12314:46b00f7710da

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


static void output_subframes(FlacEncodeContext *s)
{
    int ch;

    for (ch = 0; ch < s->channels; ch++) {
        FlacSubframe *sub = &s->frame.subframes[ch];
    int i, p, porder, psize;
    int32_t *part_end;
    int32_t *res       =  sub->residual;
    int32_t *frame_end = &sub->residual[s->frame.blocksize];

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

        /* subframe */
    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++);

            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_frame_footer(FlacEncodeContext *s)