diff options
| author | Dmitry Samonenko <shreddingwork@gmail.com> | 2012-10-05 00:36:16 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-05 00:18:01 +0200 |
| commit | 038325ac05ff4a7fc2e91d6f831cad50c0e50dc2 (patch) | |
| tree | aa7d2b146671757184f6a5b376ab64618e1e054e /libavcodec/libspeexenc.c | |
| parent | d56834201bf7511ed497e956fb7ff78d49454b10 (diff) | |
| download | ffmpeg-038325ac05ff4a7fc2e91d6f831cad50c0e50dc2.tar.gz | |
libspeexenc: Add an option for enabling DTX
Discontinuous transmission is an addition to VAD/VBR operation, that
allows to greatly reduce bitrate for silent chunks or stationary
noises.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/libspeexenc.c')
| -rw-r--r-- | libavcodec/libspeexenc.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c index 7c93a32a2b..97a2ea5285 100644 --- a/libavcodec/libspeexenc.c +++ b/libavcodec/libspeexenc.c @@ -75,7 +75,7 @@ #include "internal.h" #include "audio_frame_queue.h" -/* TODO: Think about converting abr, vad, dtx (still to come) and such flags to a bit field */ +/* TODO: Think about converting abr, vad, dtx and such flags to a bit field */ typedef struct { AVClass *class; ///< AVClass for private options SpeexBits bits; ///< libspeex bitwriter context @@ -86,6 +86,7 @@ typedef struct { int cbr_quality; ///< CBR quality 0 to 10 int abr; ///< flag to enable ABR int vad; ///< flag to enable VAD + int dtx; ///< flag to enable DTX int pkt_frame_count; ///< frame count for the current packet AudioFrameQueue afq; ///< frame queue } LibSpeexEncContext; @@ -121,6 +122,7 @@ static av_cold void print_enc_params(AVCodecContext *avctx, av_log(avctx, AV_LOG_DEBUG, "packet size: %d\n", avctx->frame_size * s->frames_per_packet); av_log(avctx, AV_LOG_DEBUG, "voice activity detection: %d\n", s->vad); + av_log(avctx, AV_LOG_DEBUG, "discontinuous transmission: %d\n", s->dtx); } static av_cold int encode_init(AVCodecContext *avctx) @@ -197,6 +199,13 @@ static av_cold int encode_init(AVCodecContext *avctx) if (s->vad) speex_encoder_ctl(s->enc_state, SPEEX_SET_VAD, &s->vad); + /* Activiting Discontinuous Transmission */ + if (s->dtx) { + speex_encoder_ctl(s->enc_state, SPEEX_SET_DTX, &s->dtx); + if ( !(s->abr || s->vad || s->header.vbr)) + av_log(avctx, AV_LOG_WARNING, "DTX is not much of use without ABR, VAD or VBR\n"); + } + /* set encoding complexity */ if (avctx->compression_level > FF_COMPRESSION_DEFAULT) { complexity = av_clip(avctx->compression_level, 0, 10); @@ -317,6 +326,7 @@ static const AVOption options[] = { { "cbr_quality", "Set quality value (0 to 10) for CBR", OFFSET(cbr_quality), AV_OPT_TYPE_INT, { .i64 = 8 }, 0, 10, AE }, { "frames_per_packet", "Number of frames to encode in each packet", OFFSET(frames_per_packet), AV_OPT_TYPE_INT, { .i64 = 1 }, 1, 8, AE }, { "vad", "Voice Activity Detection", OFFSET(vad), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AE }, + { "dtx", "Discontinuous Transmission", OFFSET(dtx), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, AE }, { NULL }, }; |