From patchwork Thu Dec 8 19:55:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Converse X-Patchwork-Id: 1724 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1083286vsa; Thu, 8 Dec 2016 12:44:23 -0800 (PST) X-Received: by 10.28.208.203 with SMTP id h194mr3667225wmg.45.1481229863551; Thu, 08 Dec 2016 12:44:23 -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 19si30741088wjf.198.2016.12.08.12.44.22; Thu, 08 Dec 2016 12:44:23 -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 4E89868A195; Thu, 8 Dec 2016 22:44:17 +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 44AE568A16D for ; Thu, 8 Dec 2016 22:44:11 +0200 (EET) Received: by mail-pg0-f65.google.com with SMTP id e9so27775937pgc.1 for ; Thu, 08 Dec 2016 12:44:14 -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:in-reply-to:references; bh=RrjDCBY0jqLJ3bQmfMhoOqV3HRZai/rll/OswA8QC5U=; b=n5On2Xooxd4w/6H/7qkA3jRVDTchVFTohiNru40q7VKBtsIBEpsVBdw3f9allqMAAm 5HINL0RpBbu4YqQbzp2mU7A3BuYQCLQ0lJIY2YsqkTRcvH6GliU/YcY/yjcwq1VscQwT vYxDfQlDWJrZmBMGEBjEia0i8OudCXOcXFFQyg19/pGXxbRYHYVBdj7nvBXU4sP5UHk7 4Q3NoEWs7cxHR7AsY8N5UCNSrCQKZIxPXDfWh83qbuDoJkU8+7nY/0csS3ExZUXdvnNF GFKdQcTlN83IeLVZeE69bCO9cBjlfl+t5hEVDeZJ7m1VhrG6dSpIj0QBIIKG7TlHBLqP 9PYw== 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:in-reply-to :references; bh=RrjDCBY0jqLJ3bQmfMhoOqV3HRZai/rll/OswA8QC5U=; b=ZmvlZVp3ogpAnWQp+0u4ttcANG1W07YXxgTexHxbkX1vrRl6zidGkBpwL+rUcZP/TE 65adn2CeKw5gZYy8FZbp1SuUnixN+y+F3vDUX7ekF1POicuHLo6opYyZEnkOPMxLroSV XSWlJ4U7yptBUL9GQHddEvFdBaCoZUhnFp7+2YjzAAEpIxYLf8xhZrfwrj1aBxERlcvZ Wi4sfs1JByQQJjH9CA/+67320BajCSjiLidsX+op8epL+NgnYD84jIj9AQeQhpnpon2e fBIHnWm1tCmhYXCTorCBsO+OyO1xX/7KIcy/SPpaUxKqgelGoiCLxty22C1oqaZmSUOp zU4A== X-Gm-Message-State: AKaTC017YuLs9D3Y7ELTvYAAWus0dMBn5H5tE0B86WD9LoubpenWDwe6AN9gcK9vTfJtJg== X-Received: by 10.99.2.142 with SMTP id 136mr135049172pgc.25.1481226914865; Thu, 08 Dec 2016 11:55:14 -0800 (PST) Received: from terok.mtv.corp.google.com ([172.22.116.121]) by smtp.gmail.com with ESMTPSA id z9sm52233783pge.44.2016.12.08.11.55.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 08 Dec 2016 11:55:14 -0800 (PST) From: Alex Converse To: ffmpeg-devel@ffmpeg.org Date: Thu, 8 Dec 2016 11:55:04 -0800 Message-Id: <1481226904-27465-1-git-send-email-alex.converse@gmail.com> X-Mailer: git-send-email 2.8.0.rc3.226.g39d4020 In-Reply-To: References: Subject: [FFmpeg-devel] [PATCH] aacdec: Rename elem_type_prev to che_prev_type. 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" It describes the type of the previous che element (SCE, CPE, CCE, or LFE) and does not reflect non-che elements. --- libavcodec/aacdec_template.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c index 64d46e3..83e9fb5 100644 --- a/libavcodec/aacdec_template.c +++ b/libavcodec/aacdec_template.c @@ -2923,7 +2923,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, { AACContext *ac = avctx->priv_data; ChannelElement *che = NULL, *che_prev = NULL; - enum RawDataBlockType elem_type, elem_type_prev = TYPE_END; + enum RawDataBlockType elem_type, che_prev_type = TYPE_END; int err, elem_id; int samples = 0, multiplier, audio_found = 0, pce_found = 0; int is_dmono, sce_count = 0; @@ -3029,7 +3029,7 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, goto fail; } while (elem_id > 0) - elem_id -= decode_extension_payload(ac, gb, elem_id, che_prev, elem_type_prev); + elem_id -= decode_extension_payload(ac, gb, elem_id, che_prev, che_prev_type); err = 0; /* FIXME */ break; @@ -3039,8 +3039,8 @@ static int aac_decode_frame_int(AVCodecContext *avctx, void *data, } if (elem_type < TYPE_DSE) { - che_prev = che; - elem_type_prev = elem_type; + che_prev = che; + che_prev_type = elem_type; } if (err)