diff options
author | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-22 06:59:59 +0000 |
---|---|---|
committer | nicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2005-04-22 06:59:59 +0000 |
commit | 3faa5ea6fdf5033150b3235f20b18cd5815ff260 (patch) | |
tree | 031e2f33866350d46186edb9d59f800f075f2417 /libmpcodecs/ae_toolame.c | |
parent | aa33945a1991f66b1cc453319ba314800f71406f (diff) | |
download | mpv-3faa5ea6fdf5033150b3235f20b18cd5815ff260.tar.bz2 mpv-3faa5ea6fdf5033150b3235f20b18cd5815ff260.tar.xz |
audio encoding reworked
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15235 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ae_toolame.c')
-rw-r--r-- | libmpcodecs/ae_toolame.c | 156 |
1 files changed, 116 insertions, 40 deletions
diff --git a/libmpcodecs/ae_toolame.c b/libmpcodecs/ae_toolame.c index d717f6943f..396258f620 100644 --- a/libmpcodecs/ae_toolame.c +++ b/libmpcodecs/ae_toolame.c @@ -1,13 +1,19 @@ -#include "m_option.h" -#include "../mp_msg.h" +#include <stdio.h> #include <stdlib.h> #include <inttypes.h> +#include <string.h> +#include "m_option.h" +#include "../mp_msg.h" +#include "aviheader.h" +#include "../libaf/af_format.h" +#include "ms_hdr.h" +#include "muxer.h" #include "ae_toolame.h" +#include "../libmpdemux/mp3_hdr.h" static int param_bitrate = 192, - param_srate = 48000, param_psy = 3, param_maxvbr = 192, param_errprot = 0, @@ -28,17 +34,95 @@ m_option_t toolameopts_conf[] = { }; -mpae_toolame_ctx *mpae_init_toolame(int channels, int srate) +static int bind_toolame(audio_encoder_t *encoder, muxer_stream_t *mux_a) +{ + mux_a->wf = malloc(sizeof(WAVEFORMATEX)+256); + mux_a->wf->wFormatTag = 0x50; + mux_a->wf->nChannels = encoder->params.channels; + mux_a->wf->nSamplesPerSec = encoder->params.sample_rate; + mux_a->wf->nAvgBytesPerSec = 125 * encoder->params.bitrate; + mux_a->h.dwRate = mux_a->wf->nAvgBytesPerSec; + mux_a->h.dwScale = (mux_a->wf->nAvgBytesPerSec * encoder->params.samples_per_frame)/ mux_a->wf->nSamplesPerSec; /* for cbr */ + + if((mux_a->wf->nAvgBytesPerSec * encoder->params.samples_per_frame) % mux_a->wf->nSamplesPerSec) + { + mux_a->h.dwScale = encoder->params.samples_per_frame; + mux_a->h.dwRate = encoder->params.sample_rate; + mux_a->h.dwSampleSize = 0; // Blocksize not constant + } + else + { + mux_a->h.dwSampleSize = mux_a->h.dwScale; + } + mux_a->wf->nBlockAlign = mux_a->h.dwScale; + mux_a->h.dwSuggestedBufferSize = (encoder->params.audio_preload*mux_a->wf->nAvgBytesPerSec)/1000; + mux_a->h.dwSuggestedBufferSize -= mux_a->h.dwSuggestedBufferSize % mux_a->wf->nBlockAlign; + + mux_a->wf->cbSize = 12; + mux_a->wf->wBitsPerSample = 0; /* does not apply */ + ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->wID = 1; + ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->fdwFlags = 2; + ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nBlockSize = mux_a->wf->nBlockAlign; + ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nFramesPerBlock = 1; + ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0; + + // Fix allocation + mux_a->wf = realloc(mux_a->wf, sizeof(WAVEFORMATEX)+mux_a->wf->cbSize); + + encoder->input_format = AF_FORMAT_S16_NE; + encoder->min_buffer_size = mux_a->h.dwSuggestedBufferSize; + encoder->max_buffer_size = mux_a->h.dwSuggestedBufferSize*2; + + return 1; +} + +static int encode_toolame(audio_encoder_t *encoder, uint8_t *dest, void *src, int len, int max_size) +{ + mpae_toolame_ctx *ctx = (mpae_toolame_ctx *)encoder->priv; + int ret_size = 0, i, nsamples; + int16_t *buffer; + + nsamples = len / (2*encoder->params.channels); + buffer = (uint16_t *) src; + for(i = 0; i < nsamples; i++) + { + ctx->left_pcm[i] = buffer[ctx->channels * i]; + ctx->right_pcm[i] = buffer[(ctx->channels * i) + (ctx->channels - 1)]; + } + + toolame_encode_buffer(ctx->toolame_ctx, ctx->left_pcm, ctx->right_pcm, nsamples, dest, max_size, &ret_size); + return ret_size; +} + +int close_toolame(audio_encoder_t *encoder) +{ + free(encoder->priv); + return 1; +} + +static int get_frame_size(audio_encoder_t *encoder) +{ + int sz; + if(encoder->stream->buffer_len < 4) + return 0; + sz = mp_decode_mp3_header(encoder->stream->buffer); + if(sz <= 0) + return 0; + return sz; +} + + +int mpae_init_toolame(audio_encoder_t *encoder) { int mode; mpae_toolame_ctx *ctx = NULL; - if(channels == 1) + if(encoder->params.channels == 1) { mp_msg(MSGT_MENCODER, MSGL_INFO, "ae_toolame, 1 audio channel, forcing mono mode\n"); mode = MPG_MD_MONO; } - else if(channels == 2) + else if(encoder->params.channels == 2) { if(! strcasecmp(param_mode, "dual")) mode = MPG_MD_DUAL_CHANNEL; @@ -58,7 +142,7 @@ mpae_toolame_ctx *mpae_init_toolame(int channels, int srate) if(ctx == NULL) { mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_toolame, couldn't alloc a %d bytes context, exiting\n", sizeof(mpae_toolame_ctx)); - return NULL; + return 0; } ctx->toolame_ctx = toolame_init(); @@ -66,64 +150,56 @@ mpae_toolame_ctx *mpae_init_toolame(int channels, int srate) { mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_toolame, couldn't initial parameters from libtoolame, exiting\n"); free(ctx); - return NULL; + return 0; } - ctx->channels = channels; - ctx->srate = srate; + ctx->channels = encoder->params.channels; + ctx->srate = encoder->params.sample_rate; if(toolame_setMode(ctx->toolame_ctx, mode) != 0) - return NULL; + return 0; if(toolame_setPsymodel(ctx->toolame_ctx, param_psy) != 0) - return NULL; + return 0; - if(toolame_setSampleFreq(ctx->toolame_ctx, srate) != 0) - return NULL; + if(toolame_setSampleFreq(ctx->toolame_ctx, encoder->params.sample_rate) != 0) + return 0; if(toolame_setBitrate(ctx->toolame_ctx, param_bitrate) != 0) - return NULL; + return 0; if(param_errprot) if(toolame_setErrorProtection(ctx->toolame_ctx, TRUE) != 0) - return NULL; + return 0; if(param_vbr > 0) { if(toolame_setVBR(ctx->toolame_ctx, TRUE) != 0) - return NULL; + return 0; if(toolame_setVBRLevel(ctx->toolame_ctx, param_maxvbr) != 0) - return NULL; + return 0; if(toolame_setPadding(ctx->toolame_ctx, FALSE) != 0) - return NULL; + return 0; if(toolame_setVBRUpperBitrate(ctx->toolame_ctx, param_maxvbr) != 0) - return NULL; + return 0; } if(toolame_setVerbosity(ctx->toolame_ctx, param_debug) != 0) - return NULL; + return 0; if(toolame_init_params(ctx->toolame_ctx) != 0) - return NULL; + return 0; ctx->bitrate = param_bitrate; + encoder->params.bitrate = ctx->bitrate; + encoder->params.samples_per_frame = 1152; + encoder->priv = ctx; + encoder->decode_buffer_size = 1152 * 2 * encoder->params.channels; - return ctx; -} - - -int mpae_encode_toolame(mpae_toolame_ctx *ctx, uint8_t *dest, int nsamples, void *src, int max_size) -{ - int ret_size = 0, i; - int16_t *buffer; - - buffer = (uint16_t *) src; - for(i = 0; i < nsamples; i++) - { - ctx->left_pcm[i] = buffer[ctx->channels * i]; - ctx->right_pcm[i] = buffer[(ctx->channels * i) + (ctx->channels - 1)]; - } - - toolame_encode_buffer(ctx->toolame_ctx, ctx->left_pcm, ctx->right_pcm, nsamples, dest, max_size, &ret_size); + encoder->bind = bind_toolame; + encoder->get_frame_size = get_frame_size; + encoder->encode = encode_toolame; + encoder->close = close_toolame; - return ret_size; + return 1; } + |