From patchwork Thu Feb 1 21:47:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mrdegier@gmail.com X-Patchwork-Id: 7475 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp68104jak; Thu, 1 Feb 2018 13:54:54 -0800 (PST) X-Google-Smtp-Source: AH8x224YUt6Xq0eL50A2nAUcM80JeHwbPBeREWhI3Iun8NW1Q5kzkjB/2YUl7EkRewb4vpSqi9lw X-Received: by 10.223.193.65 with SMTP id w1mr462453wre.88.1517522094770; Thu, 01 Feb 2018 13:54:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517522094; cv=none; d=google.com; s=arc-20160816; b=A12n3DopTT3/2GE1oqIHLmlHZVyvSWhCtmiZy8M4CfVmhwbtzk3SkgZPmCHfBowHnR w3CP+iwCTr4Q6d3xFcTbkbvM4t0ihYYYfwraja2uktKujZE7Ulgp9Cp4B0BUYY7fPk7i P8BO5TybxqLZX4U8SGZVZocC8sqyLaR+lhtOqe3Wafz0UW4e83/ixgZGA/cwzDFKS8Qj uPTYuWnHTSsrEjW1m8m3jD9idIhk81fyndIUBgFcC4QsQuOh3li4JXJhHEuOYvhh1ER7 jd7vEPkSgjW0dtFZ8Ywz6LKQXcxTxf7gPl3ZMKYC05VuMRp23T3d3eTXRQNc0bf33cjd lCVQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=snYmZqCZRLa5Zh2Qp0+K56loK1tTd1rZwjaoOuSpev4=; b=sGxqiutrr/IE0NRTE8Uh4rbAxXpojU20aJ7xp7yrR7y/qZt/yYHIhL/1BwBFAH+Nl2 MrjcSW+iba1w0JZ0OgBXgj17AOY8DuIioqZJad4oP+b0wbgOnRUiN5vt1ogpFoLwb42L G3xtfSkquCI0YTn3HaLWvmJF+U5m1UEiFenKQlAx+eYU54VzQG2/LrGZYkWZVHonytAG fc5CfLkX4j/e5hRssbPBl0Fxv/mGWW7PITxTebI9odJrhF9+V1G+l/0h0sCuTpQXcJaO XkgJvvRzKEtwk0YSVoJX/jxwM73RjGYeDLQ6lYeMZbgIdn8JcWF4sWZjWCxTr+ns6Ruc 2X1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G6zNjWoS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id s3si84411wmf.264.2018.02.01.13.54.54; Thu, 01 Feb 2018 13:54:54 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=G6zNjWoS; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5E22E689A98; Thu, 1 Feb 2018 23:54:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 83E3C680A9B for ; Thu, 1 Feb 2018 23:54:40 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id 141so8544028wme.3 for ; Thu, 01 Feb 2018 13:54:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=68u8Gtu3j94+WtFbmAWOdxc5gXCcAtLo4PiBRMgn3aA=; b=G6zNjWoSiOQYGUuTdLPeWsADIyTV4O+uPO+BkLMVYFshG6W5KBei/2AEYXDp8amr7n gxquKzrG3uq8rtz9UVYRElNH1RGXzK/hPl2NYbjk5C1wB6BKMz5m9DYWe/vDoHgwCV5W NvixaZJxAmcwDcF3Zm4HJ/7rTgS+P9xJF0TmSSjd5cnTgO+57Xwrjcs5uUg5oAxTkt/q +3B32fjZdxU4/P19LBqcnCoYEpFtw1EJc+HslME0Uk2FWM8D9ZADF1vUUOPjDmRZDPCv /ymyY8Hpuaa4ajnoTZjBVJMTBNwnsWWdqQLH2sa7ReO5w0XG31Spn5Ecx1io/RHeM4sW bN9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=68u8Gtu3j94+WtFbmAWOdxc5gXCcAtLo4PiBRMgn3aA=; b=d+VTS2msqoO8ZXCGoULD5kjQPN9aH6L4FdVRytdRm2ytnD6acgOayM7FXuxOzjzDfI 2NFR7AOAE7VLx9KnK01m7buf1FEgV4gCea1ro5C71Dmey8itYytXpg3YMnXD6L8hYVZ2 Kiq3ZT+ZiSWCLPgsQo9oUSm3qrxfow+IASjNi7OdbMhjjIcGAhKXrg6eDYNPn8BjeU6k 19Yq072jAsQtEDTCieiTY1OOcxQNM3B4XgGe9Kn7m5mZ9zMY7kgXyIcLBL8rD+xe1JHW n380gdEHWMwXCS14DJqvrN6yV1bhsgka0W+o5kUwvKkqtxD1+devRQ/wss3lad0dP9KA derg== X-Gm-Message-State: AKwxyte9SPm2EsSUvR1jvu57449mQrrcnJqqarMF2o5WkPbwXVU4z3L8 Vg9BtjVRy60Px8jMBVVwSINkrkJg X-Received: by 10.80.181.9 with SMTP id y9mr62177129edd.131.1517521680287; Thu, 01 Feb 2018 13:48:00 -0800 (PST) Received: from yoyodyne.local.net (ip5f5bd7d8.dynamic.kabel-deutschland.de. [95.91.215.216]) by smtp.gmail.com with ESMTPSA id u17sm583916edm.6.2018.02.01.13.47.59 (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 01 Feb 2018 13:47:59 -0800 (PST) From: Menno de Gier To: ffmpeg-devel@ffmpeg.org Date: Thu, 1 Feb 2018 22:47:55 +0100 Message-Id: <20180201214755.67582-1-mrdegier@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180126103057.13172-1-mrdegier@gmail.com> References: <20180126103057.13172-1-mrdegier@gmail.com> Subject: [FFmpeg-devel] [PATCH v4] avcodec/libopus: support disabling phase inversion. X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Menno MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Menno Fix crash on decoder options. Signed-off-by: Menno --- doc/encoders.texi | 5 +++++ libavcodec/libopusdec.c | 33 +++++++++++++++++++++++++++++++++ libavcodec/libopusenc.c | 14 ++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/doc/encoders.texi b/doc/encoders.texi index 6a410a8cb6..c5dfc646d9 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -981,6 +981,11 @@ 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 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 +quality. The default is 1 (phase inversion enabled). + @end table @anchor{libshine} diff --git a/libavcodec/libopusdec.c b/libavcodec/libopusdec.c index 4f7f4755c2..3d2ee5b61b 100644 --- a/libavcodec/libopusdec.c +++ b/libavcodec/libopusdec.c @@ -25,6 +25,7 @@ #include "libavutil/internal.h" #include "libavutil/intreadwrite.h" #include "libavutil/ffmath.h" +#include "libavutil/opt.h" #include "avcodec.h" #include "internal.h" @@ -33,11 +34,15 @@ #include "libopus.h" struct libopus_context { + AVClass *class; OpusMSDecoder *dec; int pre_skip; #ifndef OPUS_SET_GAIN union { int i; double d; } gain; #endif +#ifdef OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST + int apply_phase_inv; +#endif }; #define OPUS_HEAD_SIZE 19 @@ -136,6 +141,15 @@ static av_cold int libopus_decode_init(AVCodecContext *avc) } #endif +#ifdef OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST + ret = opus_multistream_decoder_ctl(opus->dec, + OPUS_SET_PHASE_INVERSION_DISABLED(!opus->apply_phase_inv)); + if (ret != OPUS_OK) + av_log(avc, AV_LOG_WARNING, + "Unable to set phase inversion: %s\n", + opus_strerror(ret)); +#endif + /* Decoder delay (in samples) at 48kHz */ avc->delay = avc->internal->skip_samples = opus->pre_skip; @@ -209,6 +223,24 @@ static void libopus_flush(AVCodecContext *avc) avc->internal->skip_samples = opus->pre_skip; } + +#define OFFSET(x) offsetof(struct libopus_context, x) +#define FLAGS AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM +static const AVOption libopusdec_options[] = { +#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 + { NULL }, +}; + +static const AVClass libopusdec_class = { + .class_name = "libopusdec", + .item_name = av_default_item_name, + .option = libopusdec_options, + .version = LIBAVUTIL_VERSION_INT, +}; + + AVCodec ff_libopus_decoder = { .name = "libopus", .long_name = NULL_IF_CONFIG_SMALL("libopus Opus"), @@ -223,5 +255,6 @@ AVCodec ff_libopus_decoder = { .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLT, AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE }, + .priv_class = &libopusdec_class, .wrapper_name = "libopus", }; diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index b449497d15..4ae81b0bb2 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -39,6 +39,9 @@ typedef struct LibopusEncOpts { int packet_size; int max_bandwidth; int mapping_family; +#ifdef OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST + int apply_phase_inv; +#endif } LibopusEncOpts; typedef struct LibopusEncContext { @@ -154,6 +157,14 @@ static int libopus_configure_encoder(AVCodecContext *avctx, OpusMSEncoder *enc, "Unable to set maximum bandwidth: %s\n", opus_strerror(ret)); } +#ifdef OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST + ret = opus_multistream_encoder_ctl(enc, + OPUS_SET_PHASE_INVERSION_DISABLED(!opts->apply_phase_inv)); + if (ret != OPUS_OK) + av_log(avctx, AV_LOG_WARNING, + "Unable to set phase inversion: %s\n", + opus_strerror(ret)); +#endif return OPUS_OK; } @@ -530,6 +541,9 @@ static const AVOption libopus_options[] = { { "on", "Use variable bit rate", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "vbr" }, { "constrained", "Use constrained VBR", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, FLAGS, "vbr" }, { "mapping_family", "Channel Mapping Family", OFFSET(mapping_family), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 255, FLAGS, "mapping_family" }, +#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 { NULL }, };