From patchwork Wed Jan 1 05:34:39 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 17112 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 40A3044A070 for ; Wed, 1 Jan 2020 07:34:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1406C68AD24; Wed, 1 Jan 2020 07:34:51 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B62B368AD11 for ; Wed, 1 Jan 2020 07:34:44 +0200 (EET) Received: by mail-pj1-f68.google.com with SMTP id kx11so1838766pjb.4 for ; Tue, 31 Dec 2019 21:34:44 -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=ktdX/StdFR9TPBgaCrRNYXn5DyLkuSk80Q5/QQm497E=; b=QBNOOQfU0mocJmOp/WXuAFy51LO/XLfH2PCefKuXlZAPU/neYNFjyrtLyhNwGV+JNl 0B+HxvQsM2p2wl3SS5bzkdSD3nAUCShCWVgbX2clKRGWfPsPAQtZTf20ql5ssRE67J7K JzkUN9dFgW4n8/9EnnC4dPVJ7vE82PsXvfBcT711mmmsac5bguqi/fGHYV5aTVigqSrO tKOYOVkTrTt5t7ue3mwEguURPQbrTtQVqG/EPW0bBbY7MM+92a6ON4Ojz8noaFbxEgo2 jSD6kcSh7y4QK4Wqy7/SRTIn95WFrfTgU2n551c9dAcd8+rZ/z5Pidsg1hVWVVpyhRZ0 MyOg== 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=ktdX/StdFR9TPBgaCrRNYXn5DyLkuSk80Q5/QQm497E=; b=uVWzTiawiAU/hlF+aryrxn4TQWHw4GgX8wIPeVyLvIxNIsio8rYsv5Pp7M+dN9S5h0 nju2wtS/r27E8qbtd1fecrY2sY4dBVyqsrwQ/oeawbMNIcPV5IeJHzjH7Ig1CmOBBC5v TxqkLMK6gg15mM+9DFLzQ5j86uFmEJnIJ1JTAEe50RLAkS1qIBOVC1wjI8vD+p9RN07C g1D1C/81nzi+4843rjrxBpg2zPppDP9zW1ka3rqpOWIiDBgwniE/S2iDt1lIXcR8NtzH EqlHP3Lo7pHuZJCmfLh/tVrS5ubhqZfEn3d42EAOmfoZXY7UwlPYbLLtcdfWrQf+QXR3 f4Yg== X-Gm-Message-State: APjAAAVSCjYQ01/9PeacyctbtXz04plqp/GDfV94YnQfwFpJnzySB9sq 5vY24hTyskxUrxJD75a9BZ10/DoY X-Google-Smtp-Source: APXvYqxMhMGadOCnxD9nCZsNS3SYHzif2YtbNWF2lVeUNUHU97Qn0vkVDhWptRjwbj1io2jJWjEzVA== X-Received: by 2002:a17:902:b901:: with SMTP id bf1mr78107686plb.283.1577856883065; Tue, 31 Dec 2019 21:34:43 -0800 (PST) Received: from localhost.localdomain ([47.90.47.25]) by smtp.gmail.com with ESMTPSA id u2sm53706919pgc.19.2019.12.31.21.34.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Dec 2019 21:34:42 -0800 (PST) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Jan 2020 13:34:39 +0800 Message-Id: <1577856879-17708-1-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 1.7.1 Subject: [FFmpeg-devel] [PATCH V1] libavcodec/aacdec: fix HE-AAC decoder dirty date (for sbr) when flush 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: qoroliang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: qoroliang aac decoder only do the window overlapping data buffer flush but without sbr related buffer flush, that will cause dirty data in the first output frame after flush. Signed-off-by: qoroliang --- libavcodec/aacdec_template.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index bb11de3..8f8dc24 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -507,7 +507,13 @@ static void flush(AVCodecContext *avctx) ChannelElement *che = ac->che[type][i]; if (che) { for (j = 0; j <= 1; j++) { + // LTP buffer related data buffer + // or windowing overlapping memset(che->ch[j].saved, 0, sizeof(che->ch[j].saved)); + memset(che->ch[j].coeffs, 0, sizeof(che->ch[j].coeffs)); + // sbr context should be reseted and function pointers should be applied too + memset(&che->sbr, 0, sizeof(che->sbr)); + AAC_RENAME(ff_aac_sbr_ctx_init)(ac, &che->sbr, type); } } }