comparison flacenc.c @ 12325:6da1651834cb libavcodec

Simplify fallback to verbatim mode encoding.

12324:549a40628c70

    put_bits(&s->pb, 16, crc);
    flush_put_bits(&s->pb);
}


static void update_md5_sum(FlacEncodeContext *s, const int16_t *samples)
{
#if HAVE_BIGENDIAN
    int i;
    for (i = 0; i < s->frame.blocksize * s->channels; i++) {

                             int buf_size, void *data)
{
    FlacEncodeContext *s;
    const int16_t *samples = data;
    int out_bytes;
    int reencoded=0;

    s = avctx->priv_data;

    if (buf_size < s->max_framesize * 2) {
        av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");

    channel_decorrelation(s);

    encode_frame(s);

write_frame:
    init_put_bits(&s->pb, frame, buf_size);
    output_frame_header(s);
    output_subframes(s);
    output_frame_footer(s);
    out_bytes = put_bits_count(&s->pb) >> 3;

    if (out_bytes > s->max_framesize) {
        if (reencoded) {
            /* still too large. must be an error. */
            av_log(avctx, AV_LOG_ERROR, "error encoding frame\n");
            return -1;
        }

        /* frame too large. use verbatim mode */
        s->frame.verbatim_only = 1;
        encode_frame(s);
        reencoded = 1;
        goto write_frame;
    }

    s->frame_count++;
    avctx->coded_frame->pts = s->sample_count;
    s->sample_count += avctx->frame_size;

12325:6da1651834cb

    put_bits(&s->pb, 16, crc);
    flush_put_bits(&s->pb);
}


static int write_frame(FlacEncodeContext *s, uint8_t *frame, int buf_size)
{
    init_put_bits(&s->pb, frame, buf_size);
    output_frame_header(s);
    output_subframes(s);
    output_frame_footer(s);
    return put_bits_count(&s->pb) >> 3;
}


static void update_md5_sum(FlacEncodeContext *s, const int16_t *samples)
{
#if HAVE_BIGENDIAN
    int i;
    for (i = 0; i < s->frame.blocksize * s->channels; i++) {

                             int buf_size, void *data)
{
    FlacEncodeContext *s;
    const int16_t *samples = data;
    int out_bytes;

    s = avctx->priv_data;

    if (buf_size < s->max_framesize * 2) {
        av_log(avctx, AV_LOG_ERROR, "output buffer too small\n");

    channel_decorrelation(s);

    encode_frame(s);

    out_bytes = write_frame(s, frame, buf_size);

    /* fallback to verbatim mode if the compressed frame is larger than it
       would be if encoded uncompressed. */
    if (out_bytes > s->max_framesize) {
        s->frame.verbatim_only = 1;
        encode_frame(s);
        out_bytes = write_frame(s, frame, buf_size);
    }

    s->frame_count++;
    avctx->coded_frame->pts = s->sample_count;
    s->sample_count += avctx->frame_size;