comparison mp3lameaudio.c @ 2091:02a4fd7c606c libavcodec

flush audio encoder buffers at the end fix vorbis in nut again

2090:869805505b30

	Mp3AudioContext *s = avctx->priv_data;
	int len, i;
	int lame_result;

	/* lame 3.91 dies on '1-channel interleaved' data */
	if (s->stereo) {
            lame_result = lame_encode_buffer_interleaved(
                s->gfp, 
                data,
                avctx->frame_size, 
                s->buffer + s->buffer_index, 
                BUFFER_SIZE - s->buffer_index
                );
	} else {
            lame_result = lame_encode_buffer(
                s->gfp, 
                data, 
                data, 
                avctx->frame_size,
                s->buffer + s->buffer_index, 
                BUFFER_SIZE - s->buffer_index
                );
    }

    if(lame_result==-1) {
        /* output buffer too small */
        av_log(avctx, AV_LOG_ERROR, "lame: output buffer too small (buffer index: %d, free bytes: %d)\n", s->buffer_index, BUFFER_SIZE - s->buffer_index);

            memcpy(frame, s->buffer, len);
            s->buffer_index -= len;

            memmove(s->buffer, s->buffer+len, s->buffer_index);
            //FIXME fix the audio codec API, so we dont need the memcpy()
            //FIXME fix the audio codec API, so we can output multiple packets if we have them
/*for(i=0; i<len; i++){
    av_log(avctx, AV_LOG_DEBUG, "%2X ", frame[i]);
}*/
            return len;
        }else

    CODEC_TYPE_AUDIO,
    CODEC_ID_MP3,
    sizeof(Mp3AudioContext),
    MP3lame_encode_init,
    MP3lame_encode_frame,
    MP3lame_encode_close
};

2091:02a4fd7c606c

	Mp3AudioContext *s = avctx->priv_data;
	int len, i;
	int lame_result;

	/* lame 3.91 dies on '1-channel interleaved' data */

    if(data){
        if (s->stereo) {
            lame_result = lame_encode_buffer_interleaved(
                s->gfp, 
                data,
                avctx->frame_size, 
                s->buffer + s->buffer_index, 
                BUFFER_SIZE - s->buffer_index
                );
        } else {
            lame_result = lame_encode_buffer(
                s->gfp, 
                data, 
                data, 
                avctx->frame_size,
                s->buffer + s->buffer_index, 
                BUFFER_SIZE - s->buffer_index
                );
        }
    }else{
        lame_result= lame_encode_flush(
                s->gfp, 
                s->buffer + s->buffer_index, 
                BUFFER_SIZE - s->buffer_index
                );
    }

    if(lame_result==-1) {
        /* output buffer too small */
        av_log(avctx, AV_LOG_ERROR, "lame: output buffer too small (buffer index: %d, free bytes: %d)\n", s->buffer_index, BUFFER_SIZE - s->buffer_index);

            memcpy(frame, s->buffer, len);
            s->buffer_index -= len;

            memmove(s->buffer, s->buffer+len, s->buffer_index);
            //FIXME fix the audio codec API, so we dont need the memcpy()
/*for(i=0; i<len; i++){
    av_log(avctx, AV_LOG_DEBUG, "%2X ", frame[i]);
}*/
            return len;
        }else

    CODEC_TYPE_AUDIO,
    CODEC_ID_MP3,
    sizeof(Mp3AudioContext),
    MP3lame_encode_init,
    MP3lame_encode_frame,
    MP3lame_encode_close,
    .capabilities= CODEC_CAP_DELAY,
};