PR #22868 opened by padenot URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22868 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22868.patch
This has been running for years in Firefox now as a patch. Modelled after the similar code path in `libspeexenc.c`. >From 48ee18ce8dfee15e58ddb1cfa8d9253f608c5a65 Mon Sep 17 00:00:00 2001 From: Paul Adenot <[email protected]> Date: Tue, 26 Mar 2024 14:24:17 +0100 Subject: [PATCH] avcodec: Allow enabling DTX in libopusenc --- doc/encoders.texi | 4 ++++ libavcodec/libopusenc.c | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 610ec9a04c..605638e040 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1045,6 +1045,10 @@ Other values include 0 for mono and stereo, 1 for surround sound with masking and LFE bandwidth optimizations, and 255 for independent streams with an unspecified channel layout. +@item dtx (N.A.) +Allow discontinuous transmission when set to 1. The default value is 0 +(disabled). + @item apply_phase_inv (N.A.) (requires libopus >= 1.2) If set to 0, disables the use of phase inversion for intensity stereo, improving the quality of mono downmixes, but slightly reducing normal stereo diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 927776bbca..fb4a05a99e 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -43,6 +43,7 @@ typedef struct LibopusEncOpts { int packet_size; int max_bandwidth; int mapping_family; + int dtx; #ifdef OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST int apply_phase_inv; #endif @@ -160,6 +161,13 @@ static int libopus_configure_encoder(AVCodecContext *avctx, OpusMSEncoder *enc, "Unable to set inband FEC: %s\n", opus_strerror(ret)); + ret = opus_multistream_encoder_ctl(enc, + OPUS_SET_DTX(opts->dtx)); + if (ret != OPUS_OK) + av_log(avctx, AV_LOG_WARNING, + "Unable to set DTX: %s\n", + opus_strerror(ret)); + if (avctx->cutoff) { ret = opus_multistream_encoder_ctl(enc, OPUS_SET_MAX_BANDWIDTH(opts->max_bandwidth)); @@ -557,6 +565,7 @@ static const AVOption libopus_options[] = { { "on", "Use variable bit rate", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, .unit = "vbr" }, { "constrained", "Use constrained VBR", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, FLAGS, .unit = "vbr" }, { "mapping_family", "Channel Mapping Family", OFFSET(mapping_family), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, FLAGS, .unit = "mapping_family" }, + { "dtx", "Enable DTX (Discontinuous transmission)", OFFSET(dtx), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, FLAGS }, #ifdef OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST { "apply_phase_inv", "Apply intensity stereo phase inversion", OFFSET(apply_phase_inv), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, FLAGS }, #endif -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
