From patchwork Tue Jan 2 07:52:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: zhangjiejun1992@gmail.com X-Patchwork-Id: 7070 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.79.195 with SMTP id r64csp14409705jad; Mon, 1 Jan 2018 23:52:46 -0800 (PST) X-Google-Smtp-Source: ACJfBosM4QgGCCVdCtNPmFT+vjfxxUQjTndry5Y6+2bMQBrdN0XJkViepydT+RlHGczq82NVCMrr X-Received: by 10.28.63.16 with SMTP id m16mr36131823wma.19.1514879566803; Mon, 01 Jan 2018 23:52:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1514879566; cv=none; d=google.com; s=arc-20160816; b=PpfQz0cwfPHOvuzlq3DCGOL1PwsfyfrHfGKPT9jOsBL7dLGQhmtxCfz/k9E8wjXq2H x63OKzsfOXsrR9TQLIZQ5JOMBPkgljXRHNSunD8Y3avCcwEdeejTwaWZ+xW7E+Pawxta JdN3ZQZwxe/Sr+ttFedfd7O4nbF8hTWbgPTTui0h71tfMsZ/5/qVw3L1ZzCsFG3yb5dx 3H77bxvYCUJ94Xf2wFki9QGe4gMyJOAEXbsvVKLMDQd/feqX9rq9gHFxhpNDhWxR0koL TPHBCEbaVcapWOUVmtsm13XGTNexe14Vak1nZKpGpOaaX68X5a3G72vk24xe6H3DfeWZ FPJg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=57jhuhi32S8lesPMxwVfFajN+FM4DZPm0v2EOiTXDoU=; b=WpU/hBrlxW9gMFXfD3mKyES/UGnRiVDSASN/yDU3uxHecAFDAuZta+G8u945Jv5CRu JSpV86X5V26bRPf6bxYZCxlsq/y3JknYjjvVresGXwHPIYMmCE6x8DN5YQxOFgTFVevb m+8RyJWntE4upJs9cnzqL3y1gXTgjaqvHqQbyXDI/2KwIuk9axUR9IuQwoB3PGNHk3ga qGnKE7TxIetf+xwRTShAY6JzUw71Vp86/iH0DWx8hSzklzS62NtsHcMXPERbxXiI9vP1 Of96wGNVrtly7GffhkDYzAQ6yPSMGkuyPqi+gy2qyX5cRrda1x/gAXilbmH3QPN/LKdQ pbLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=LcKtZbJD; 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 i74si15074856wri.506.2018.01.01.23.52.45; Mon, 01 Jan 2018 23:52:46 -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=LcKtZbJD; 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 841B7680D46; Tue, 2 Jan 2018 09:52:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f47.google.com (mail-pg0-f47.google.com [74.125.83.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2E266805F5 for ; Tue, 2 Jan 2018 09:52:22 +0200 (EET) Received: by mail-pg0-f47.google.com with SMTP id 81so4533007pgf.6 for ; Mon, 01 Jan 2018 23:52:38 -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; bh=ERJ9p5vzmMcYnz9P3HZAFlasYijPURQCoD/xIqiDuG0=; b=LcKtZbJDVZYtIXHya3/KYgN8Mm9tsZcZasUeSgSldZTSI3LDmIuKsK3IwCKBMymRoj vN8eZeRy/ZWyNoNW7dEim6ceQ9PMcF/PuauLQ+W4YDNtfTg3sCU5yYjZw+wYvSuiITOe h/Pt1RJoSOOAu+7i/VOLkHofeoH6//hspxH9z9zEuWssAwiLynbXzBKQV4BaL4YA+je+ ZldxfIe66sbQFJzOmWT2cs9F+11Rb8ZJzb7Di5DKGVT3QZ7iceEMH3el+fxL+wC79+4Z Iqy+dR1TbF1dB4yQfBRxcfSiRWibxzBRZXgJDJUHYxHSXrfGuiVZQtdgfyKAJ0956VT1 OUJQ== 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; bh=ERJ9p5vzmMcYnz9P3HZAFlasYijPURQCoD/xIqiDuG0=; b=dGye7u717FlGP5LGlUOZt3cvrqojgNSq+Q3kNRv6WRNSNaRHTdhg+CuQzE5iS5XWBo wMDXy8zyLcUxvm8mlwIOCPy9gol5yYIqidwtZ59qtASMuRmwzsLc0o5KzuankdrbtCYL d0IY65fmKthiCENZGKjXSjadsTMpNiCvxJ0voSBx/ayq9KEuGYPzMTckSw1KGDCVYcRx PFt8OwFxQQE7kg3jMUVfi63gLmfOwdss708f5zdyU/3np9HfUM6v7uQMXNyOLr06EhRK 0MExaOARALdc8nTUks0zFtokcUUMrPVDVfJLi7wTOQxe4C9AbuHyOMt/EGCDGbS0+dIU rPTg== X-Gm-Message-State: AKGB3mKafkZ/FEC2FSHyZMIiIqWykZuZgmai/7n1DN9BOBXSFMV7fkJ/ uNnuagFnzuGgq7H/qASeLPPezw== X-Received: by 10.98.189.17 with SMTP id a17mr44043430pff.97.1514879556604; Mon, 01 Jan 2018 23:52:36 -0800 (PST) Received: from localhost.localdomain (ec2-52-220-245-83.ap-southeast-1.compute.amazonaws.com. [52.220.245.83]) by smtp.gmail.com with ESMTPSA id r71sm93059618pfd.144.2018.01.01.23.52.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 01 Jan 2018 23:52:36 -0800 (PST) From: zhangjiejun1992@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 Jan 2018 15:52:23 +0800 Message-Id: <20180102075223.65278-1-zhangjiejun1992@gmail.com> X-Mailer: git-send-email 2.14.3 (Apple Git-98) Subject: [FFmpeg-devel] [PATCH] lavc/audiotoolboxenc: fix noise in encoded audio 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: Jiejun Zhang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Jiejun Zhang This fixes #6940 --- libavcodec/audiotoolboxenc.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/libavcodec/audiotoolboxenc.c b/libavcodec/audiotoolboxenc.c index 71885d1530..b70375a692 100644 --- a/libavcodec/audiotoolboxenc.c +++ b/libavcodec/audiotoolboxenc.c @@ -48,6 +48,9 @@ typedef struct ATDecodeContext { AudioFrameQueue afq; int eof; int frame_size; + + uint8_t* audio_data_buf; + uint32_t audio_data_buf_size; } ATDecodeContext; static UInt32 ffat_get_format_id(enum AVCodecID codec, int profile) @@ -442,6 +445,9 @@ static av_cold int ffat_init_encoder(AVCodecContext *avctx) ff_af_queue_init(avctx, &at->afq); + at->audio_data_buf_size = 0; + at->audio_data_buf = NULL; + return 0; } @@ -471,7 +477,15 @@ static OSStatus ffat_encode_callback(AudioConverterRef converter, UInt32 *nb_pac data->mBuffers[0].mDataByteSize = frame->nb_samples * av_get_bytes_per_sample(avctx->sample_fmt) * avctx->channels; - data->mBuffers[0].mData = frame->data[0]; + if (at->audio_data_buf_size < data->mBuffers[0].mDataByteSize) { + av_log(avctx, AV_LOG_INFO, "Increasing audio data buffer size to %u", + data->mBuffers[0].mDataByteSize); + av_free(at->audio_data_buf); + at->audio_data_buf_size = data->mBuffers[0].mDataByteSize; + at->audio_data_buf = av_malloc(at->audio_data_buf_size); + } + memcpy(at->audio_data_buf, frame->data[0], data->mBuffers[0].mDataByteSize); + data->mBuffers[0].mData = at->audio_data_buf; if (*nb_packets > frame->nb_samples) *nb_packets = frame->nb_samples; @@ -565,6 +579,10 @@ static av_cold int ffat_close_encoder(AVCodecContext *avctx) ff_bufqueue_discard_all(&at->frame_queue); ff_bufqueue_discard_all(&at->used_frame_queue); ff_af_queue_close(&at->afq); + if (at->audio_data_buf_size > 0) { + at->audio_data_buf_size = 0; + av_free(at->audio_data_buf); + } return 0; }