diff options
author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-13 02:58:57 +0000 |
---|---|---|
committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-05-13 02:58:57 +0000 |
commit | 6e9cbdc10448203e7c8b2de41447442fcc9f7bae (patch) | |
tree | 0ed465592509105fdbeab27fc12ddbb2e3590aa5 /libmpcodecs/ae_twolame.c | |
parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
download | mpv-6e9cbdc10448203e7c8b2de41447442fcc9f7bae.tar.bz2 mpv-6e9cbdc10448203e7c8b2de41447442fcc9f7bae.tar.xz |
whitespace cosmetics: Remove all trailing whitespace.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/ae_twolame.c')
-rw-r--r-- | libmpcodecs/ae_twolame.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/libmpcodecs/ae_twolame.c b/libmpcodecs/ae_twolame.c index cb0330e18c..d557f9398b 100644 --- a/libmpcodecs/ae_twolame.c +++ b/libmpcodecs/ae_twolame.c @@ -15,16 +15,16 @@ #include "libmpdemux/mp3_hdr.h" -static int +static int param_bitrate = 192, param_psy = 3, param_maxvbr = 0, param_errprot = 0, param_debug = 0; - + static float param_vbr = 0; static char *param_mode = "stereo"; - + m_option_t twolameopts_conf[] = { {"br", ¶m_bitrate, CONF_TYPE_INT, 0, 0, 0, NULL}, {"mode", ¶m_mode, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -40,13 +40,13 @@ m_option_t twolameopts_conf[] = { static int bind_twolame(audio_encoder_t *encoder, muxer_stream_t *mux_a) { mpae_twolame_ctx *ctx = encoder->priv; - + 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 = encoder->params.bitrate / 8; - + if(ctx->vbr || ((mux_a->wf->nAvgBytesPerSec * encoder->params.samples_per_frame) % mux_a->wf->nSamplesPerSec)) { mux_a->h.dwScale = encoder->params.samples_per_frame; @@ -62,7 +62,7 @@ static int bind_twolame(audio_encoder_t *encoder, muxer_stream_t *mux_a) 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 = 0; //12; mux_a->wf->wBitsPerSample = 0; /* does not apply */ ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->wID = 1; @@ -70,10 +70,10 @@ static int bind_twolame(audio_encoder_t *encoder, muxer_stream_t *mux_a) ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nBlockSize = mux_a->wf->nBlockAlign; ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nFramesPerBlock = 1; ((MPEGLAYER3WAVEFORMAT *) (mux_a->wf))->nCodecDelay = 0; - - // Fix allocation + + // 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; @@ -85,10 +85,10 @@ static int encode_twolame(audio_encoder_t *encoder, uint8_t *dest, void *src, in { mpae_twolame_ctx *ctx = encoder->priv; int ret_size = 0, r2; - + len /= (2*encoder->params.channels); ret_size = twolame_encode_buffer_interleaved(ctx->twolame_ctx, src, len, dest, max_size); - r2 = mp_decode_mp3_header(dest); + r2 = mp_decode_mp3_header(dest); mp_msg(MSGT_MENCODER, MSGL_DBG2, "\nSIZE: %d, max: %d, r2: %d\n", ret_size, max_size, r2); if(r2 > 0) ret_size = r2; @@ -117,7 +117,7 @@ int mpae_init_twolame(audio_encoder_t *encoder) { int mode; mpae_twolame_ctx *ctx = NULL; - + if(encoder->params.channels == 1) { mp_msg(MSGT_MENCODER, MSGL_INFO, "ae_twolame, 1 audio channel, forcing mono mode\n"); @@ -138,14 +138,14 @@ int mpae_init_twolame(audio_encoder_t *encoder) } else mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, Twolame can't encode > 2 channels, exiting\n"); - + ctx = calloc(1, sizeof(mpae_twolame_ctx)); if(ctx == NULL) { mp_msg(MSGT_MENCODER, MSGL_ERR, "ae_twolame, couldn't alloc a %d bytes context, exiting\n", sizeof(mpae_twolame_ctx)); return 0; } - + ctx->twolame_ctx = twolame_init(); if(ctx->twolame_ctx == NULL) { @@ -159,28 +159,28 @@ int mpae_init_twolame(audio_encoder_t *encoder) return 0; if(twolame_set_mode(ctx->twolame_ctx, mode) != 0) return 0; - + if(twolame_set_in_samplerate(ctx->twolame_ctx, encoder->params.sample_rate) != 0) return 0; - + if(twolame_set_out_samplerate(ctx->twolame_ctx, encoder->params.sample_rate) != 0) return 0; - + if(encoder->params.sample_rate < 32000) twolame_set_version(ctx->twolame_ctx, TWOLAME_MPEG2); else twolame_set_version(ctx->twolame_ctx, TWOLAME_MPEG1); - + if(twolame_set_psymodel(ctx->twolame_ctx, param_psy) != 0) return 0; - + if(twolame_set_bitrate(ctx->twolame_ctx, param_bitrate) != 0) return 0; - + if(param_errprot) if(twolame_set_error_protection(ctx->twolame_ctx, TRUE) != 0) return 0; - + if(param_vbr != 0) { if(twolame_set_VBR(ctx->twolame_ctx, TRUE) != 0) @@ -196,23 +196,23 @@ int mpae_init_twolame(audio_encoder_t *encoder) } ctx->vbr = 1; } - + if(twolame_set_verbosity(ctx->twolame_ctx, param_debug) != 0) return 0; - + if(twolame_init_params(ctx->twolame_ctx) != 0) return 0; - + encoder->params.bitrate = param_bitrate * 1000; encoder->params.samples_per_frame = 1152; encoder->priv = ctx; encoder->decode_buffer_size = 1152 * 2 * encoder->params.channels; - + encoder->bind = bind_twolame; encoder->get_frame_size = get_frame_size; encoder->encode = encode_twolame; encoder->close = close_twolame; - + return 1; } |