comparison mp3lameaudio.c @ 4119:85438e10d72d libavcodec

reindentation, patch by From: Steve Lhomme, slhomme divxcorp com

4118:a1786732cd62

#include "mpegaudio.h"
#include <lame/lame.h>

#define BUFFER_SIZE (2*MPA_FRAME_SIZE)
typedef struct Mp3AudioContext {
        lame_global_flags *gfp;
        int stereo;
        uint8_t buffer[BUFFER_SIZE];
        int buffer_index;
} Mp3AudioContext;

static int MP3lame_encode_init(AVCodecContext *avctx)
{
        Mp3AudioContext *s = avctx->priv_data;

        if (avctx->channels > 2)
                return -1;

        s->stereo = avctx->channels > 1 ? 1 : 0;

        if ((s->gfp = lame_init()) == NULL)
                goto err;
        lame_set_in_samplerate(s->gfp, avctx->sample_rate);
        lame_set_out_samplerate(s->gfp, avctx->sample_rate);
        lame_set_num_channels(s->gfp, avctx->channels);
        /* lame 3.91 dies on quality != 5 */
        lame_set_quality(s->gfp, 5);
        /* lame 3.91 doesn't work in mono */
        lame_set_mode(s->gfp, JOINT_STEREO);
        lame_set_brate(s->gfp, avctx->bit_rate/1000);
    if(avctx->flags & CODEC_FLAG_QSCALE) {
        lame_set_brate(s->gfp, 0);
        lame_set_VBR(s->gfp, vbr_default);
        lame_set_VBR_q(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA);
    }
        lame_set_bWriteVbrTag(s->gfp,0);
        if (lame_init_params(s->gfp) < 0)
                goto err_close;

        avctx->frame_size = lame_get_framesize(s->gfp);

        avctx->coded_frame= avcodec_alloc_frame();
        avctx->coded_frame->key_frame= 1;

        return 0;

err_close:
        lame_close(s->gfp);
err:
        return -1;
}

static const int sSampleRates[3] = {
    44100, 48000,  32000
};

}

int MP3lame_encode_frame(AVCodecContext *avctx,
                     unsigned char *frame, int buf_size, void *data)
{
        Mp3AudioContext *s = avctx->priv_data;
        int len;
        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,

            return 0;
}

int MP3lame_encode_close(AVCodecContext *avctx)
{
        Mp3AudioContext *s = avctx->priv_data;

        av_freep(&avctx->coded_frame);

        lame_close(s->gfp);
        return 0;
}


AVCodec mp3lame_encoder = {
    "mp3",

4119:85438e10d72d

#include "mpegaudio.h"
#include <lame/lame.h>

#define BUFFER_SIZE (2*MPA_FRAME_SIZE)
typedef struct Mp3AudioContext {
    lame_global_flags *gfp;
    int stereo;
    uint8_t buffer[BUFFER_SIZE];
    int buffer_index;
} Mp3AudioContext;

static int MP3lame_encode_init(AVCodecContext *avctx)
{
    Mp3AudioContext *s = avctx->priv_data;

    if (avctx->channels > 2)
        return -1;

    s->stereo = avctx->channels > 1 ? 1 : 0;

    if ((s->gfp = lame_init()) == NULL)
        goto err;
    lame_set_in_samplerate(s->gfp, avctx->sample_rate);
    lame_set_out_samplerate(s->gfp, avctx->sample_rate);
    lame_set_num_channels(s->gfp, avctx->channels);
    /* lame 3.91 dies on quality != 5 */
    lame_set_quality(s->gfp, 5);
    /* lame 3.91 doesn't work in mono */
    lame_set_mode(s->gfp, JOINT_STEREO);
    lame_set_brate(s->gfp, avctx->bit_rate/1000);
    if(avctx->flags & CODEC_FLAG_QSCALE) {
        lame_set_brate(s->gfp, 0);
        lame_set_VBR(s->gfp, vbr_default);
        lame_set_VBR_q(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA);
    }
    lame_set_bWriteVbrTag(s->gfp,0);
    if (lame_init_params(s->gfp) < 0)
        goto err_close;

    avctx->frame_size = lame_get_framesize(s->gfp);

    avctx->coded_frame= avcodec_alloc_frame();
    avctx->coded_frame->key_frame= 1;

    return 0;

err_close:
    lame_close(s->gfp);
err:
    return -1;
}

static const int sSampleRates[3] = {
    44100, 48000,  32000
};

}

int MP3lame_encode_frame(AVCodecContext *avctx,
                     unsigned char *frame, int buf_size, void *data)
{
    Mp3AudioContext *s = avctx->priv_data;
    int len;
    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,

            return 0;
}

int MP3lame_encode_close(AVCodecContext *avctx)
{
    Mp3AudioContext *s = avctx->priv_data;

    av_freep(&avctx->coded_frame);

    lame_close(s->gfp);
    return 0;
}


AVCodec mp3lame_encoder = {
    "mp3",