From patchwork Mon Mar 20 19:52:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 3030 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.50.79 with SMTP id y76csp1546143vsy; Mon, 20 Mar 2017 12:59:47 -0700 (PDT) X-Received: by 10.223.164.85 with SMTP id e21mr27514998wra.58.1490039987500; Mon, 20 Mar 2017 12:59:47 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n133si16582398wmf.140.2017.03.20.12.59.47; Mon, 20 Mar 2017 12:59:47 -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; 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 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 AA20E68839D; Mon, 20 Mar 2017 21:59:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9D536882BD for ; Mon, 20 Mar 2017 21:59:20 +0200 (EET) Received: by mail-pg0-f66.google.com with SMTP id b5so21773616pgg.1 for ; Mon, 20 Mar 2017 12:59:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=WMkug24q1w+ZPwKqmvsQv6336yg3MfqSqAv2CzaWsnk=; b=d1tzO8Xyn30Azl+kCKB6qQaojaYUok2HuOl8DQGzL88WIUssuPtrmUjv4DGJhU4OI2 NcgnTsbu+q/nbSK6z1asyCqN4sv9wcIomavvzs9DazcI+FIwEeTG5GUkuwH+uxgwyqBF OfpveAz/cA085G885Uj0lmIzJNxv0Vfg46LTH3sBBOzrJFV/oXICp90+IF7f9Kd1CIaM Ih6DbVJR7zCDolyyPHPz2u7QYTmaG/jW+cOTtBFPvz0PXXh/AROHTIdcMfSBXy6Q1b48 QpNQUozWd+EA0y/ojZ+FtZ9ziOrh0celBeggfZDnotB5UPctiB97WZS7LXzMDdsva24U WQdQ== 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=WMkug24q1w+ZPwKqmvsQv6336yg3MfqSqAv2CzaWsnk=; b=a6dUXc86rE0eoOW4I5eVmGTNo3t9Tq+5G4aGZtgdOPUQsSgelV4auemsROhjXRyetc GimqsC6QIVgJP2hfKv2pMpRhIo3m5Jmv1j+j1bftV09KC/A359Zrh7eJGT/F9E5blPoW Q72VNIr9iVr6+1olu2x1mosbNYzNBw2RKxfFH7VG2dg/UlPVn61gngNzBfXXXwF7DB/Q sOaOqMF/41xo3rwBad2yA1tfI6ZVjme0JUsLos5AZJ2oLM2L3NUvrquB/3tdmxWNVh0K 819fImJTL4Fo/J+23QiKX6lm3TxbTwLNDxADh7JFWBB2nz6KDo8/HOHe4slTHT9wqKPw 2COw== X-Gm-Message-State: AFeK/H1X7qPOBs1fKUyzI7wghJ7v9pFHWHo6FoFJFCMA0snWGOeXsbMctlDfoEW8ati97w== X-Received: by 10.99.145.194 with SMTP id l185mr27593461pge.187.1490039529619; Mon, 20 Mar 2017 12:52:09 -0700 (PDT) Received: from aconverse-macbookpro.roam.corp.google.com.com ([172.19.25.109]) by smtp.gmail.com with ESMTPSA id y9sm34809199pfi.39.2017.03.20.12.52.08 (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 20 Mar 2017 12:52:09 -0700 (PDT) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Mar 2017 12:52:00 -0700 Message-Id: <20170320195200.10259-1-alex.converse@gmail.com> X-Mailer: git-send-email 2.11.0.390.gc69c2f50cf-goog Subject: [FFmpeg-devel] [PATCH] aacsbr: Turnoff in the event of over read. 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" Aliased compressed AAC bytes are almost certainly not meaningful SBR data. In the wild this causes harsh artifacts switching HE-AAC streams that don't have SBR headers aligned with segment boundaries. Turning off SBR falls back to a default set of upsampling parameters that can function as a sort of error concealment. This is consistent with how the decoder handles other sorts of errors. --- libavcodec/aacsbr_template.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavcodec/aacsbr_template.c b/libavcodec/aacsbr_template.c index cf8621eee0..750131c64c 100644 --- a/libavcodec/aacsbr_template.c +++ b/libavcodec/aacsbr_template.c @@ -1137,6 +1137,7 @@ int AAC_RENAME(ff_decode_sbr_extension)(AACContext *ac, SpectralBandReplication if (bytes_read > cnt) { av_log(ac->avctx, AV_LOG_ERROR, "Expected to read %d SBR bytes actually read %d.\n", cnt, bytes_read); + sbr_turnoff(sbr); } return cnt; }