From patchwork Wed Dec 7 01:08:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 1704 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp47487vsa; Tue, 6 Dec 2016 17:25:42 -0800 (PST) X-Received: by 10.194.85.77 with SMTP id f13mr57199773wjz.187.1481073942181; Tue, 06 Dec 2016 17:25:42 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id rb6si22217873wjb.250.2016.12.06.17.25.41; Tue, 06 Dec 2016 17:25:42 -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; 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 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 09DE9689E65; Wed, 7 Dec 2016 03:25:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8BC2B689AD2 for ; Wed, 7 Dec 2016 03:25:22 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id x23so21542363pgx.3 for ; Tue, 06 Dec 2016 17:25:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=HacRjHCDZAmVufS0HPCCF0HuDxJDyqgTaQlRQYDvQFA=; b=owEiKhGFVDI8cOOSZSr9u6RKE1xQyliH2jHvQ9W+qg/wsSlCs0mvYYCWJaPXPs3m36 4B9rtoJvKGbL16j9+CC5ftUEw5/A1STwEl4+hMRsmSVutQMGZMLvlmua12GoD167SDuX eP9Z+SYwhbiWyOshdXq8v62W0iHPUMOCgVFGcS/JYjiqKASNOo5wXArFlcnPEC30szcP aoN9WBRnbluOwQbGGC7ynP2yLhn3VLwPra9GD+7QiWjDXJK1P9U+kokQc+g6amsYXfek orHXED9LrtPZp3mSzG2LyPdzGtno+xwvvOYfmvNfdqdedVEoSkA7/hHjZbeNfUnY+jfY G4HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=HacRjHCDZAmVufS0HPCCF0HuDxJDyqgTaQlRQYDvQFA=; b=Xo9maJ28/mHHXHeKZI9fefuslCo9OkT4KihzWvY+wT2i32GwQjuVIEUAISBf4xyF6u CRsGdwEivRdLjy+sqgwtkgLVI4kLF0t+rtmN1BLOy5BfE2sa2qtqUSX38Ru283K3UWcW iKOatItA6sy2wGd75lOczGbCCpeyVdnM73ErH6/EVSN627na+7opHXZluN0sXRi5yxY2 O0hfMHtrHj4+55sDqdUjq4PNIogoipgpNvkuKsA1E8pE8PsVQA1mf+f4FSNpEW9YvGLb whgju995M58fXs3x6SXCcKSiSFGbsFRdjYsf7ywd9ZVo9ZXgJDO5pLafRqb+NDXXNVYC jgeg== X-Gm-Message-State: AKaTC023GOoUoYp01HwnFv9Ju4/+pAb+w7y4K7NXtBijUnMBTSOHlF4Wv9tNTzH/uezaZA== X-Received: by 10.84.216.92 with SMTP id f28mr86816054plj.31.1481072922527; Tue, 06 Dec 2016 17:08:42 -0800 (PST) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id 2sm37632947pgy.27.2016.12.06.17.08.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 06 Dec 2016 17:08:42 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Dec 2016 17:08:03 -0800 Message-Id: <1481072883-23152-1-git-send-email-alex.converse@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 Subject: [FFmpeg-devel] [PATCH] aacdec: Allow SBR after DRC. 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: Alex Converse MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Fixes https://www2.iis.fraunhofer.de/AAC/7.1auditionOutLeader_v2_rtb.mp4 Reported-by: rcombs on IRC --- libavcodec/aacdec_template.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 8cfa34b..64d46e3 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3038,8 +3038,10 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, break; } - che_prev = che; - elem_type_prev = elem_type; + if (elem_type < TYPE_DSE) { + che_prev = che; + elem_type_prev = elem_type; + } if (err) goto fail;