comparison flacenc.c @ 12307:a2de400ccd30 libavcodec

Combine and simplify output_subframe_constant() and output_subframe_verbatim().

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)

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

12307:a2de400ccd30

                 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_residual(FlacEncodeContext *s, FlacSubframe *sub)

        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:    output_subframe_fixed(   s, sub); break;
        case FLAC_SUBFRAME_LPC:      output_subframe_lpc(     s, sub); break;
        }
    }
}


static void output_frame_footer(FlacEncodeContext *s)