From patchwork Sun Jun 16 08:54:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lynne X-Patchwork-Id: 49940 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9196:0:b0:460:55fa:d5ed with SMTP id s22csp1304349vqg; Sun, 16 Jun 2024 01:55:10 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPW25xLmO+3YMKTLAH1S4gYhw7A/3SaMr4MKwPsksIEi257Bq7WA7v/0EspETRfksGZIO5hO3q51L3iLoUEQ0N614gX6bGascGEw== X-Google-Smtp-Source: AGHT+IH+mZtkY19NtkSqefcUGgPpfJW3lP64RXtw8E0BNEmlp5Ukd7E/Ly59/i0IayW2eNg8kGfx X-Received: by 2002:a50:d596:0:b0:57c:6bd6:d8e2 with SMTP id 4fb4d7f45d1cf-57cbd4f6b9bmr4835686a12.0.1718528109937; Sun, 16 Jun 2024 01:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718528109; cv=none; d=google.com; s=arc-20160816; b=EvcNeC7me5ILnle/9/xbcCYOAiItV4siBK8l6WI7j4Fw5+/aDKuTh1CPnUkoVmTs7K 9QgkGI50luCnlsWfPicKd4uJAC/bjkg7yFbtY2I5TIip188xrFm+OPlHtmzvEZF3VjpA x1X/iMRBKR8prEypn8JUWp4JRtJ/wws39BkWKuXDH/GuUaH6WXhWhbOFdeNa5JT4dVqG F8nGHRSd6ldBJ9apJd1w2UG2z1rmByxOfyeO+Zgndp+H/hQeMPTwiWrNijnx8leoGmiq 3olX+Q2lgLB48yu/4sm6Zq05PlReQu6azZHQaSx+Ag9TA0EEJm6Lu/ULmPXC+FdoKyrH 9CVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to:from :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to :delivered-to; bh=AkQdBQ0prdDFY9UdPVmUi06wfm0KsSFsk/0hp0POKRs=; fh=nenT92/WZoU6unXd3J6UhGUdod4piddKfVtctNBOh6k=; b=irhtAAlXQe6xfSHaMKg0s7d30yIueM279O+8AUS43nXcSl7XbjO/40pjrwkZWpzjO5 CKo9Oh1hEtcBKUl44fjw8segX7q7UaDQj+t4qU1TvayQjFvRHWPLtmanPls2kaN6elHv jje7uq4g+aAajdaweRlAnsUBlG0cZrGaxTpvjb+QMjpy9N7MxPFESMph9RC+FB/dB8AT 33dKkryE1vBI0zh5/ntVPFwJpFEq9fzy/F6U9Nmeg19xz8t28e3ldV1Njj0uXB9g2XIi wZnHVzusW081LFE8hoGmtbNUs9HYckf/pJBIMElc3qZeBQat7XwOqkJULjvn5QacztFv WSMQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57cd1dd6cbasi1071882a12.185.2024.06.16.01.55.09; Sun, 16 Jun 2024 01:55:09 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12C8468D6A1; Sun, 16 Jun 2024 11:55:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E9F3D68D1BB for ; Sun, 16 Jun 2024 11:54:58 +0300 (EEST) To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Jun 2024 10:54:43 +0200 Message-ID: <20240616085454.2560973-1-dev@lynne.ee> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/6] aacdec_usac: apply specification fix M55715 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Lynne via ffmpeg-devel From: Lynne Reply-To: FFmpeg development discussions and patches Cc: Lynne Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 2KM/9qjGwJXk --- libavcodec/aac/aacdec_usac.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 98e8c1c0bc..065bc869d9 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -835,6 +835,11 @@ static int decode_usac_stereo_info(AACDecContext *ac, AACUSACConfig *usac, tns_active = get_bits1(gb); us->common_window = get_bits1(gb); + if (!us->common_window || indep_flag) { + memset(us->prev_alpha_q_re, 0, sizeof(us->prev_alpha_q_re)); + memset(us->prev_alpha_q_im, 0, sizeof(us->prev_alpha_q_im)); + } + if (us->common_window) { /* ics_info() */ ics1->window_sequence[1] = ics1->window_sequence[0]; @@ -845,6 +850,20 @@ static int decode_usac_stereo_info(AACDecContext *ac, AACUSACConfig *usac, ics2->use_kb_window[1] = ics2->use_kb_window[0]; ics1->use_kb_window[0] = ics2->use_kb_window[0] = get_bits1(gb); + /* If there's a change in the transform sequence, zero out last frame's + * stereo prediction coefficients */ + if ((ics1->window_sequence[0] == EIGHT_SHORT_SEQUENCE && + ics1->window_sequence[1] != EIGHT_SHORT_SEQUENCE) || + (ics1->window_sequence[1] == EIGHT_SHORT_SEQUENCE && + ics1->window_sequence[0] != EIGHT_SHORT_SEQUENCE) || + (ics2->window_sequence[0] == EIGHT_SHORT_SEQUENCE && + ics2->window_sequence[1] != EIGHT_SHORT_SEQUENCE) || + (ics2->window_sequence[1] == EIGHT_SHORT_SEQUENCE && + ics2->window_sequence[0] != EIGHT_SHORT_SEQUENCE)) { + memset(us->prev_alpha_q_re, 0, sizeof(us->prev_alpha_q_re)); + memset(us->prev_alpha_q_im, 0, sizeof(us->prev_alpha_q_im)); + } + if (ics1->window_sequence[0] == EIGHT_SHORT_SEQUENCE) { ics1->max_sfb = ics2->max_sfb = get_bits(gb, 4); ue1->scale_factor_grouping = ue2->scale_factor_grouping = get_bits(gb, 7);