diff options
| author | Timothy Gu <timothygu99@gmail.com> | 2013-11-01 19:43:24 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-02 18:44:20 +0100 |
| commit | d3211cfaedcc0abf30e3a40c246237090ad95b6d (patch) | |
| tree | aec0b8bb45e66c009dc484523f00284c95751041 /libavcodec/libmp3lame.c | |
| parent | 67d1d06225e91ec80506f5c568c13899531bb873 (diff) | |
| download | ffmpeg-d3211cfaedcc0abf30e3a40c246237090ad95b6d.tar.gz | |
avcodec/libmp3lame: add ABR support
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libmp3lame.c')
| -rw-r--r-- | libavcodec/libmp3lame.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c index 0fb9c6a3b1..14fbb9ec56 100644 --- a/libavcodec/libmp3lame.c +++ b/libavcodec/libmp3lame.c @@ -49,6 +49,7 @@ typedef struct LAMEContext { int buffer_size; int reservoir; int joint_stereo; + int abr; float *samples_flt[2]; AudioFrameQueue afq; AVFloatDSPContext fdsp; @@ -119,8 +120,13 @@ static av_cold int mp3lame_encode_init(AVCodecContext *avctx) lame_set_VBR(s->gfp, vbr_default); lame_set_VBR_quality(s->gfp, avctx->global_quality / (float)FF_QP2LAMBDA); } else { - if (avctx->bit_rate) // CBR - lame_set_brate(s->gfp, avctx->bit_rate / 1000); + if (avctx->bit_rate) { + if (s->abr) { // ABR + lame_set_VBR(s->gfp, vbr_abr); + lame_set_VBR_mean_bitrate_kbps(s->gfp, avctx->bit_rate / 1000); + } else // CBR + lame_set_brate(s->gfp, avctx->bit_rate / 1000); + } } /* do not get a Xing VBR header frame from LAME */ @@ -265,6 +271,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, static const AVOption options[] = { { "reservoir", "use bit reservoir", OFFSET(reservoir), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AE }, { "joint_stereo", "use joint stereo", OFFSET(joint_stereo), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, AE }, + { "abr", "use ABR", OFFSET(abr), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AE }, { NULL }, }; |