From patchwork Wed Feb 5 11:07:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17690 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 22ADA44A738 for ; Wed, 5 Feb 2020 13:12:40 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id F246968A831; Wed, 5 Feb 2020 13:12:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f68.google.com (mail-ed1-f68.google.com [209.85.208.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1254568A831 for ; Wed, 5 Feb 2020 13:12:34 +0200 (EET) Received: by mail-ed1-f68.google.com with SMTP id f8so1840200edv.2 for ; Wed, 05 Feb 2020 03:12:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HNkYDY2naanSrcpEk9FVAzhXvH5maRZU/PPRKxsJUkU=; b=GE1qihMd3UpQSznKD8C+XzZMqSWnbvdBHHrfvn0X2anYE9fN0OjYoXLi3AlB7YxT8+ vRKIDXE2VoG7taKTAI5bPBsWIadDU5AVLqLPhzJHax5voVZ32h0jibl4aN5JCf9QW3A0 Ip6mGOGMBcBmB+pIr61CNG9D7JbnljJiEf+w6f0pRJqOBwVw8GKsVXoyKpye6Ip1mRR0 XaXa64grWjGo6d997H1WIVBtA/cyBFP6PFv4sXbFx5Hqd6UgElt5OVMU1p0GjSAx5t++ V6T4GDUi2E1gUzjnzOPWf1VUA6OnBlJ9FsoPjbWVyftbhoOM8hkHej3j5P1Fskap8+N/ Q/Fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=HNkYDY2naanSrcpEk9FVAzhXvH5maRZU/PPRKxsJUkU=; b=ZbrmhPJsILFQnYrd/QFp44rHjMHHpaad2LiKQl6HXOguPL8O4ibI8KXN3t0Ny61QRN xeBjgbFYGiwTk9kXpOhaeVuZB2zxuHHRREFR2pm2Fn9ZPsHbSo76gq7o9ZrngwVehz3n BrGNPLGE3igP7bdf7EW8Gr7dCGJPfebdEd70rD27oDKl6RVM4OLoDhhG8IxFSpPv9aWg JjTtP3xHaU3F7KEMinQqiNzDD6fX82G2DmjHPGVQkWGLKTdgmiD/N7On4Rd/x8ddkFJz 0jmKYYzh8q8nGcfi6gvMN/SIwoY5YBL/cuN03XLZYOuozzdCq0FWoc4bMlpG09HkK65Y 6rtw== X-Gm-Message-State: APjAAAUl4VAR2Wr2JsvWryBuBCN/WG9gEs9sLq0/X9Ocz6lGxykGsByA Cvvcusuf2FwwdLPLwhKmAuetpvg0avg= X-Google-Smtp-Source: APXvYqyUkcOsf625v1q+9zu8vYO0uMoRlpANg+41zllYmVHnvxWcBsPVEVHXeaEy37BJQi61KTQbGg== X-Received: by 2002:a2e:7407:: with SMTP id p7mr19750658ljc.106.1580900830317; Wed, 05 Feb 2020 03:07:10 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id e5sm6693372lfn.66.2020.02.05.03.07.09 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Feb 2020 03:07:09 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Feb 2020 13:07:06 +0200 Message-Id: <20200205110708.64282-1-martin@martin.st> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] libfdk-aacdec: Apply the decoder's output delay on timestamps 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The delay is normally zero when the level limiter is disabled, but if enabled, there's a small delay. --- libavcodec/libfdk-aacdec.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 1abe1d8438..d9b080cf3e 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -57,6 +57,7 @@ typedef struct FDKAACDecContext { int drc_effect; int drc_cut; int level_limit; + int output_delay; } FDKAACDecContext; @@ -115,6 +116,9 @@ static int get_stream_info(AVCodecContext *avctx) } avctx->sample_rate = info->sampleRate; avctx->frame_size = info->frameSize; +#if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 + s->output_delay = info->outputDelay; +#endif for (i = 0; i < info->numChannels; i++) { AUDIO_CHANNEL_TYPE ctype = info->pChannelType[i]; @@ -367,6 +371,11 @@ static int fdk_aac_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) goto end; + if (frame->pts != AV_NOPTS_VALUE) + frame->pts -= av_rescale_q(s->output_delay, + (AVRational){1, avctx->sample_rate}, + avctx->time_base); + memcpy(frame->extended_data[0], s->decoder_buffer, avctx->channels * avctx->frame_size * av_get_bytes_per_sample(avctx->sample_fmt)); From patchwork Wed Feb 5 11:07:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17692 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 379F544A85F for ; Wed, 5 Feb 2020 13:14:28 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0DF4A68AB42; Wed, 5 Feb 2020 13:14:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 66B48688105 for ; Wed, 5 Feb 2020 13:14:21 +0200 (EET) Received: by mail-lj1-f178.google.com with SMTP id d10so1869187ljl.9 for ; Wed, 05 Feb 2020 03:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=40vJvV/HD1qy2Ce/+sKk7ySdzSVvE4njQmbpKCOeI/M=; b=uM4y9YrDrC3g8iXY2zixAssHZHOTcCfw0k9QoR9MArij/oNu4hJyWqWH7g/KDjq6Rf wnyunBXzqT5vFUR83EnV0lIaZRMElOzLHu+k0FYhO54JPa2FFy+AY205oc8eMEnPgloH glYQn/MsElo1m+vSuJQXHAN1v/Q8k/+YAMNVU8Axaza2mfD2/eJs/0e0zbOmoB6GXONd NFT3BQV3sAUmv2RbfVWD4zY6XOQbep6/Jd8DXi9UAUjQrbkynKvY9YlALmiOGU1DBSND AlWAyoDCcpsH7JBW6cY+yurobNYSE6Xc0AWMMcWrfkXu94erfs0lwsPFJ2/Kz7j6awPP QKAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=40vJvV/HD1qy2Ce/+sKk7ySdzSVvE4njQmbpKCOeI/M=; b=e6xrsLodWeAFegpa6jdhesb5Jsj3DBZWa90QtSoWu2atRcAg1Htvp7HyC7AJbNaoWB cKKtR40yo/olDSkJf8a1HhRCs8dlUZT1yAYykurz5JB3Zt+RU78aWuk956JP+pyHKCZC MWq6JAq96/6I+H31yOTeyr8VCiqBlMtv9i5/5QLMVQzzuw21txBWkpiELmrKPNDt+qZ1 8ibfy5/sksNh3kkmQrvQkGMax82K3PnxNLlfHtDVo4NYwdefHFdkzRwTlyqAvMmUTdr9 qC0HOKCPhKubLjpl4ATecBBAWX48Ic1SGfAeKeJQtYDHNYNxr98Bv27IuzsrPYyG842n opuQ== X-Gm-Message-State: APjAAAV3ui4P5wH2nhVlGptJp0KxXBjgpo5NNIdRyxsEJG1Iec9qntos BFiJIgkRynp9KOhK7hEMaALH4ls2YjA= X-Google-Smtp-Source: APXvYqxFuo9c53QN+QCWrbRJq8OnbVCcvilXMDlcMWzTustWHIJfJryFx1XUDOmlRHfjzmMDqoJ2wg== X-Received: by 2002:ac2:5628:: with SMTP id b8mr17197164lff.112.1580900832066; Wed, 05 Feb 2020 03:07:12 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id a11sm11989865lfb.34.2020.02.05.03.07.11 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Feb 2020 03:07:11 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Feb 2020 13:07:07 +0200 Message-Id: <20200205110708.64282-2-martin@martin.st> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200205110708.64282-1-martin@martin.st> References: <20200205110708.64282-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] libfdk-aacdec: Use the decoder's default level limiter settings 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" It was disabled by default in 2dbd35b00c6433e587d5f44d5dbc8972ebbaa88e as it added delay, but now we compensate for the delay properly by offsetting timestamps. --- libavcodec/libfdk-aacdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index d9b080cf3e..32a97958c4 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -81,7 +81,7 @@ static const AVOption fdk_aac_dec_options[] = { { "drc_heavy", "Dynamic Range Control: heavy compression, where [1] is on (RF mode) and [0] is off", OFFSET(drc_heavy), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL }, #if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 - { "level_limit", "Signal level limiting", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, 1, AD }, + { "level_limit", "Signal level limiting (-1 auto, 0 off, 1 enabled)", OFFSET(level_limit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, AD }, #endif #if FDKDEC_VER_AT_LEAST(3, 0) // 3.0.0 { "drc_effect","Dynamic Range Control: effect type, where e.g. [0] is none and [6] is general", From patchwork Wed Feb 5 11:07:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 17691 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3002444A738 for ; Wed, 5 Feb 2020 13:12:47 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1509868AB42; Wed, 5 Feb 2020 13:12:47 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf1-f66.google.com (mail-lf1-f66.google.com [209.85.167.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0841768ACA6 for ; Wed, 5 Feb 2020 13:12:41 +0200 (EET) Received: by mail-lf1-f66.google.com with SMTP id y19so1180608lfl.9 for ; Wed, 05 Feb 2020 03:12:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=WElh77QHQJZx9zE+SblO/mtKHSQ7dBb/08pNzml1Km4=; b=gPb1V/3+wBqC+IEX72xQxQwx553CehFXlhT1r5OZk7hQhZkuc8Aizl2wRJQOr8YZo7 aOS1Mrn1XFXTzl4gRe8t9N0JyYcIpe9PlUppuNCN+wJUrPudP5Nz1QG0rwnkVeAkoJ2m rIcNW0euyBOGxWJuzgIwpWIcp9Bbl3nNGJvXnK0iUG21QsuxZjGCSCJp8mhtuSgjWCg0 aIIDE2oK4D734VO5IzLXZuSomPQ2vYb/KQqTr3kKLok6KO/yo+8xrrlzyEuMVCacTVng H5PLYz5JRdhYbfhREce6RGUDUeMZxow589gM9c227aNuC8lBH6ebdCH8y0kfpYqIhoPW ULKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=WElh77QHQJZx9zE+SblO/mtKHSQ7dBb/08pNzml1Km4=; b=S/OBRbGI6lPzGjjNqjThE76EfNymjY2p0UvdxTWYiewcbf12ntoKU5kYaBXk4ZLCk4 0UBm4CsJwotuLWq/LyKZgjigRk3ghElyuOA0GMKTTAMtmSsRCschzn+2YDee8Lp4keQS gwx+dLZcyY6YA6Qvj+qG5IctmsAKIiW6zgZcRMUJVBRX3Rs35naEd153H58wbVh3WAhE H0vIanRjNCsUE4JkrKChwrQbkFQduknZgJgGxG0HN8csXTfd5ROQMkvDiquS7c0Pigka jahXC7e5DJxwVpa+EOVylSR1eR3k5IsmnjcrnEaeD2n25ZXSnG3tConwCr3TXl+GXyVa jeIA== X-Gm-Message-State: APjAAAWF/M7KuTlpYzUClXGSu85bqFyO/8mPPq2ruV5vnset6CbKKv6Q WgtXDxvLZjm/Yhwa8n51uumlCCOc270= X-Google-Smtp-Source: APXvYqwxYJACdhp3flErqflRTuq/JAgZ65HcYTCeShnEG0yYrQQzDb6I7XXEcIibHB6EJx5uWsh6cQ== X-Received: by 2002:a19:4849:: with SMTP id v70mr17903433lfa.30.1580900833248; Wed, 05 Feb 2020 03:07:13 -0800 (PST) Received: from localhost (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id d20sm12881309ljg.95.2020.02.05.03.07.12 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 05 Feb 2020 03:07:12 -0800 (PST) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Wed, 5 Feb 2020 13:07:08 +0200 Message-Id: <20200205110708.64282-3-martin@martin.st> X-Mailer: git-send-email 2.21.1 (Apple Git-122.3) In-Reply-To: <20200205110708.64282-1-martin@martin.st> References: <20200205110708.64282-1-martin@martin.st> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] libfdk-aacdec: Allow explicitly disabling the DRC reference level option 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Previously, it was always left in the automatic mode, if the option was set to the only special (negative) value. Now there's two separate special values for this option, -1 for automatic (metadata based) and -2 for explicitly disabled. --- libavcodec/libfdk-aacdec.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libavcodec/libfdk-aacdec.c b/libavcodec/libfdk-aacdec.c index 32a97958c4..cc50fdce2f 100644 --- a/libavcodec/libfdk-aacdec.c +++ b/libavcodec/libfdk-aacdec.c @@ -76,8 +76,8 @@ static const AVOption fdk_aac_dec_options[] = { OFFSET(drc_boost), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 127, AD, NULL }, { "drc_cut", "Dynamic Range Control: attenuation factor, where [0] is none and [127] is max compression", OFFSET(drc_cut), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 127, AD, NULL }, - { "drc_level", "Dynamic Range Control: reference level, quantized to 0.25dB steps where [0] is 0dB and [127] is -31.75dB", - OFFSET(drc_level), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 127, AD, NULL }, + { "drc_level", "Dynamic Range Control: reference level, quantized to 0.25dB steps where [0] is 0dB and [127] is -31.75dB, -1 for auto, and -2 for disabled", + OFFSET(drc_level), AV_OPT_TYPE_INT, { .i64 = -1}, -2, 127, AD, NULL }, { "drc_heavy", "Dynamic Range Control: heavy compression, where [1] is on (RF mode) and [0] is off", OFFSET(drc_heavy), AV_OPT_TYPE_INT, { .i64 = -1}, -1, 1, AD, NULL }, #if FDKDEC_VER_AT_LEAST(2, 5) // 2.5.10 @@ -298,6 +298,12 @@ static av_cold int fdk_aac_decode_init(AVCodecContext *avctx) } if (s->drc_level != -1) { + // This option defaults to -1, i.e. not calling + // aacDecoder_SetParam(AAC_DRC_REFERENCE_LEVEL) at all, which defaults + // to the level from DRC metadata, if available. The user can set + // -drc_level -2, which calls aacDecoder_SetParam( + // AAC_DRC_REFERENCE_LEVEL) with a negative value, which then + // explicitly disables the feature. if (aacDecoder_SetParam(s->handle, AAC_DRC_REFERENCE_LEVEL, s->drc_level) != AAC_DEC_OK) { av_log(avctx, AV_LOG_ERROR, "Unable to set DRC reference level in the decoder\n"); return AVERROR_UNKNOWN;