From patchwork Sun Oct 7 11:44:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 10585 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:ab0:73d2:0:0:0:0:0 with SMTP id m18csp2456709uaq; Sun, 7 Oct 2018 04:47:45 -0700 (PDT) X-Google-Smtp-Source: ACcGV60cQW0S4iCXr4M4GPaL+aRXymgF8IpoiLT+finB3F86r7SBJ0u+ZrGjPSXVoRKgBjK1qTAx X-Received: by 2002:a1c:930c:: with SMTP id v12-v6mr13218754wmd.9.1538912864930; Sun, 07 Oct 2018 04:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538912864; cv=none; d=google.com; s=arc-20160816; b=yY3oeI40Wb33ahpWe8sJ++okXDNVnP+qxXXB9r89XAWkxnnEljoTdeR8otBjCinsrx l43RH2Xh2sQbmjoAhFKZb3nigZb6/TGTfSvrQwoloSzQnlgPX5fv+i0lCSWF239Xn/3p aOqHyrhXd9dIWzeSwBSN1F9XA0kXgIy/K8NMewPzn6ZoQupl+9OfTniKWOseFaL9En5v FL5m80WJ/boRYiOCBzAJfFty00ucHJBAz97i35hBEbN34myTDLJHD90Y+JqEZqwRSuvK UWdja8VLJwqwFD9agYlFA41l/C2bcK5Ljr7ZoZ9iVaG3k25O0H2E9ustrIJ7alLPxSUv sJOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :delivered-to; bh=DXAFELAUh/RPzWJwFeT35wAfo1erwkZI4l0o++q1480=; b=MvfS9RCR7CZ6AdHKVRWT13CEM3ebmDKEz22Plh6jYmqhUH3tP6aQAYl7nlt4MOdKGn X3GRJrOpAJsSPcZHKwtFX+s44BEk/dNkcakIrrXFWp8YqzYy53izDNAIHOpb5LVaHwCQ v2UsEATwHE//lcJn3enBQQPwe+Oc3ADR7XvYugFy1Rwq3/BXnZ0McF66R19RIZwtTb+P Nh354ine/h8MgIoTTZ8j88+FJzUt0ProEftppD2pPzMs0jSsVC00QO3AHL6kCGZ/A13J cd5df88qKK5Dt/R7nP5VaqDArzFwovKGqLa42E+Jukr+SMcYafJckzuyowMRW+uzoEBn yl8Q== 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 g15-v6si10733945wri.393.2018.10.07.04.47.44; Sun, 07 Oct 2018 04:47:44 -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 C26BC68A0DF; Sun, 7 Oct 2018 14:47:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe04-1.mx.upcmail.net (vie01a-dmta-pe04-1.mx.upcmail.net [62.179.121.163]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 63091689F35 for ; Sun, 7 Oct 2018 14:47:14 +0300 (EEST) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1g97X4-0000Ow-RK for ffmpeg-devel@ffmpeg.org; Sun, 07 Oct 2018 13:47:34 +0200 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id kbnS1y00f0S5wYM01bnTxE; Sun, 07 Oct 2018 13:47:27 +0200 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Sun, 7 Oct 2018 13:44:18 +0200 Message-Id: <20181007114418.19705-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.19.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/aacdec_template: Allow duplicated elements 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Such streams are invalid according to 4.5.2.1 Top level payloads for the audio object types AAC main, AAC SSR, AAC LC and AAC LTP 4.5.2.1.1 Definitions ...cIn the raw_data_block(), several instances of the same syntactic element may occur, but must have a different 4 bit element_instance_tag, except for data_stream_element()'s and fill_element()'s. Fixes: Ticket7477 Signed-off-by: Michael Niedermayer --- libavcodec/aacdec_template.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index b60b31a92c..dce6035d67 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -3161,12 +3161,15 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, if (elem_type < TYPE_DSE) { if (che_presence[elem_type][elem_id]) { - av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d duplicate\n", + int error = che_presence[elem_type][elem_id] > 1; + av_log(ac->avctx, error ? AV_LOG_ERROR : AV_LOG_DEBUG, "channel element %d.%d duplicate\n", elem_type, elem_id); - err = AVERROR_INVALIDDATA; - goto fail; + if (error) { + err = AVERROR_INVALIDDATA; + goto fail; + } } - che_presence[elem_type][elem_id] = 1; + che_presence[elem_type][elem_id]++; if (!(che=get_che(ac, elem_type, elem_id))) { av_log(ac->avctx, AV_LOG_ERROR, "channel element %d.%d is not allocated\n",