diff --git a/libavcodec/libvorbis.c b/libavcodec/libvorbis.c index 4b875338a4..ab4b4253da 100644 --- a/libavcodec/libvorbis.c +++ b/libavcodec/libvorbis.c @@ -26,6 +26,7 @@ #include +#include "libavutil/opt.h" #include "avcodec.h" #include "bytestream.h" #include "vorbis.h" @@ -38,6 +39,7 @@ #define BUFFER_SIZE (1024*64) typedef struct OggVorbisContext { + AVClass *av_class; vorbis_info vi ; vorbis_dsp_state vd ; vorbis_block vb ; @@ -48,10 +50,18 @@ typedef struct OggVorbisContext { /* decoder */ vorbis_comment vc ; ogg_packet op; + + double iblock; } OggVorbisContext ; +static const AVOption options[]={ +{"iblock", "Sets the impulse block bias", offsetof(OggVorbisContext, iblock), FF_OPT_TYPE_DOUBLE, 0, -15, 0, AV_OPT_FLAG_ENCODING_PARAM}, +{NULL} +}; +static const AVClass class = { "libvorbis", NULL, options, LIBAVUTIL_VERSION_INT }; static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avccontext) { + OggVorbisContext *context = avccontext->priv_data ; double cfreq; if(avccontext->flags & CODEC_FLAG_QSCALE) { @@ -82,6 +92,10 @@ static av_cold int oggvorbis_init_encoder(vorbis_info *vi, AVCodecContext *avcco return -1; } + if(context->iblock){ + vorbis_encode_ctl(vi, OV_ECTL_IBLOCK_SET, &context->iblock); + } + return vorbis_encode_setup_init(vi); } @@ -240,4 +254,5 @@ AVCodec libvorbis_encoder = { .capabilities= CODEC_CAP_DELAY, .sample_fmts = (const enum SampleFormat[]){SAMPLE_FMT_S16,SAMPLE_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("libvorbis Vorbis"), + .priv_class= &class, } ;