From patchwork Thu Jul 20 17:31:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wan-Teh Chang X-Patchwork-Id: 4394 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp2417600vsb; Thu, 20 Jul 2017 10:32:18 -0700 (PDT) X-Received: by 10.223.138.182 with SMTP id y51mr7721653wry.83.1500571938161; Thu, 20 Jul 2017 10:32:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500571938; cv=none; d=google.com; s=arc-20160816; b=ZUuRHRuKXgBjkTgJBdOn4EjK4qzbElculwLhCiOb1vDC85GIZ+IG2cqxs2jFHfMKbA gU8xbSXUnOWnqdLaA8vasO+GwYNNdWKzzTSxfcBfAPMRwL9slWvWKHYfy+sceTg0Z+S+ lVayjAbSXi6jDiiUN+WubkLBlK1jmAsKRT6IRCiLMtF/eRz1D8WfogK/WOEa4hs0Rw5e rLt1mCk7iOCznOazQhiIEkExdCweiLtllRPEP4YXP2o75AOmBwQu1UraFZSTesac/WPF t75JH2eePUYDOAnHA8BgTVEiU56HZK7eTr9WunELwtFG5mS0Rd16PwdBJgaNEMIMQ2wk 45kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=AlqwK+UgbPmT0zAcgYk/WwFcYaflue2sPKvPOqfeyk4=; b=ss75DKF37IoP23X52dhEHQ3vT598Or18UXScqi4Mbydd3hdw3+/wD7GqsKvW89LRv4 eUCGgLYoP/2PLaRw20KJLSkDfT17bpMMs+QE79k77UdaUklMxeHMt6uv17Ye6C/dYkzW nRfQ7eraDqFJ+9sZBg3fstDoiHmOddi2ayjcf1+OXYQVW8skBPSPFQk85WXM94xdOuTf RkN2Fh2eZyAY/65ubMjmCEKbLvfdIC+hm9LJbZbHkXbnxtz/GPhuZQrBaTbOgE7MUqzy MwZt18Zr+Q3/M88sMXjoEJNk6uFT72baf9tOlMZeSMnjVoXl9wE99L6Al4OyzSxCnUvl 2yzg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.b=FD/TBYDF; 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 n140si2029322wmg.239.2017.07.20.10.32.16; Thu, 20 Jul 2017 10:32:18 -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=@google.com header.b=FD/TBYDF; 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 8B91E689A62; Thu, 20 Jul 2017 20:32:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f52.google.com (mail-pg0-f52.google.com [74.125.83.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71C1D680118 for ; Thu, 20 Jul 2017 20:32:00 +0300 (EEST) Received: by mail-pg0-f52.google.com with SMTP id v190so17635445pgv.2 for ; Thu, 20 Jul 2017 10:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:subject:date:message-id; bh=dGpCUdxmSH8b4Nx864SYsIcUz5sE1gYD5RD4ewifrv0=; b=FD/TBYDFsDxys2FwU0wXV6iq102weQTf/xdPzV5NQDVW+Uo+EkfKtwYvi+3lIBh/R9 a15wMzBtBj2Mj4FPtepoJPJrHpuuehcJ36Fu4PdKI3dRYnIkFMvYfSLXN+KED2fZiY6f gL3eYc7nFvkqS3PXqTVoz0dhGOk+QwLruE+8KTj27msHigRLhI1hkdkOuOIDZQ0yVJSH gvCP6LHmne8xF+ka9ZT8sqTWWdpdfwFa50P3muItJwV9RuIaWIVckxZTVPq5KxYyDjzp U1bD4WSKX4MS9oms7vEMi9mVd4hRVHeJEYWkzHhvln3lgB7EdtKC5/sers/9jgCg51LK Nkgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=dGpCUdxmSH8b4Nx864SYsIcUz5sE1gYD5RD4ewifrv0=; b=i228Sxt8HOiv5hhXjQS17S0wTkAY29wL4DzI4aQz0Bs+1Tx1FhIIi+fyWAQtZlFWpV fitUJ7C6sKKdLDsFP+tVVxb4mrefJ8mKqswJkZMfGCTpV9QHKBt0XFPmvb6n/Nxft+c1 NMRGv320dSr3g0Mf0tHC7EM95ww8j9tfJO0WJ1UmH0+DKiWlKFxUQhbmDGu5QUnIdtqA WEM+hZwK6m2X93TOQeyrI8v+JPFQQByVhmFdWYaL2j9BDmQ+0Wk/VHmVPxkiWgnAgsHn YYS/cQ9gg6QZ0KCz/PLMNA49fCnN8yGzP88m+vzffAB/JK25H+HusTvWjCCk6kuiaVuJ 76sw== X-Gm-Message-State: AIVw111TKvy/wCGrdD9jbnpqtZbhSXl3ZK46tOVLfgzXxQ9doCMTCso1 7dnPMea+Ogxj8hPBtAlUaw== X-Received: by 10.84.167.2 with SMTP id c2mr5102151plb.370.1500571926726; Thu, 20 Jul 2017 10:32:06 -0700 (PDT) Received: from wtc-desktop.mtv.corp.google.com ([100.98.5.29]) by smtp.googlemail.com with ESMTPSA id s64sm5828140pfd.77.2017.07.20.10.32.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 20 Jul 2017 10:32:05 -0700 (PDT) From: Wan-Teh Chang To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jul 2017 10:31:19 -0700 Message-Id: <20170720173119.13779-1-wtc@google.com> X-Mailer: git-send-email 2.14.0.rc0.284.gd933b75aa4-goog Subject: [FFmpeg-devel] [PATCH] avcodec/h264: Declare the local variable decode_chroma as const. 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ff_h264_decode_mb_cabac() and ff_h264_decode_mb_cavlc() are very long functions. Declaring decode_chroma as const makes it clear the variable doesn't change after initialization. Signed-off-by: Wan-Teh Chang --- libavcodec/h264_cabac.c | 4 ++-- libavcodec/h264_cavlc.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c index 0973e30be9..345834645c 100644 --- a/libavcodec/h264_cabac.c +++ b/libavcodec/h264_cabac.c @@ -1916,8 +1916,8 @@ int ff_h264_decode_mb_cabac(const H264Context *h, H264SliceContext *sl) const SPS *sps = h->ps.sps; int mb_xy; int mb_type, partition_count, cbp = 0; - int dct8x8_allowed= h->ps.pps->transform_8x8_mode; - int decode_chroma = sps->chroma_format_idc == 1 || sps->chroma_format_idc == 2; + int dct8x8_allowed = h->ps.pps->transform_8x8_mode; + const int decode_chroma = sps->chroma_format_idc == 1 || sps->chroma_format_idc == 2; const int pixel_shift = h->pixel_shift; mb_xy = sl->mb_xy = sl->mb_x + sl->mb_y*h->mb_stride; diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c index f01e76070c..187b1c64e2 100644 --- a/libavcodec/h264_cavlc.c +++ b/libavcodec/h264_cavlc.c @@ -704,8 +704,8 @@ int ff_h264_decode_mb_cavlc(const H264Context *h, H264SliceContext *sl) int mb_xy; int partition_count; unsigned int mb_type, cbp; - int dct8x8_allowed= h->ps.pps->transform_8x8_mode; - int decode_chroma = h->ps.sps->chroma_format_idc == 1 || h->ps.sps->chroma_format_idc == 2; + int dct8x8_allowed = h->ps.pps->transform_8x8_mode; + const int decode_chroma = h->ps.sps->chroma_format_idc == 1 || h->ps.sps->chroma_format_idc == 2; const int pixel_shift = h->pixel_shift; mb_xy = sl->mb_xy = sl->mb_x + sl->mb_y*h->mb_stride;