From patchwork Mon Jan 15 23:37:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 7294 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.78.2 with SMTP id r2csp3497738jaa; Mon, 15 Jan 2018 15:37:39 -0800 (PST) X-Google-Smtp-Source: ACJfBouvKqon9CrPUDta5bdzWBPOpznYACuPeS1DzofyAVyeDddHZBRvxk6wByAimXS9MWnE86hZ X-Received: by 10.28.230.151 with SMTP id e23mr10778574wmi.11.1516059459691; Mon, 15 Jan 2018 15:37:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1516059459; cv=none; d=google.com; s=arc-20160816; b=sKhS74AzO96/GZYD9ApBSw8j+PoMi2Mn+EfreLQxn0PZ0M4HU/iOUPL7VKzvL79CZn 3B1f6Lrcs0w5tfXoGMbOZC9pPKL3XG++YIqNrZe30mtvlTDG1M7ryID+OM64aVy+SzoG 0Wo/9PWbAoVRplhh1snli4HBmEotmTRNm+p1xc54p913jgZpi+7J8AVWOq2GMOJmyZHT QdYGLMpBF75nVMnVeTI2jNCnc9kBCpIlYd51m7wTqOfy5gYUKW5Ga03du96GvjRk9cWq uCTdi8hABL65YvzrYLhP7AGV2srWE09WuDveOBBmYOXa8aDo/PEw4jhGPO+l6003AWpW rIGA== 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:delivered-to :arc-authentication-results; bh=z72e+7mN6aL17QCQL9+oK7F3YvgpIjvE96ld0NHLpog=; b=deiZu86bT2dzHsTXBSsd+Cvb4BJ3be0uPn/EQ1Ay8LfrJ10LKDgr8BT/qcFfwBQux/ YU87BPlF2DI4P5MWSDLsHOhn5Bhxuf1Pd4HnSHmxtjQAJ1HTNpHLVqMGzZ76OmZjgzux McV8T3sk9vIrZaA7IOB75GGvQzmQFkw1sgQhW09bsXYQiKRY9N731cSJ2BIv5USFOxaM jVbzF6GhuDofLwDVwm7iG1urzo5XGelN9wMSdX/1byUv5z4tyfdNQqelVHeK+tmzlT65 z0enGY5bDw99wSXyjYlG/7RutJu3HC41BpNuDshYMJLyf3oSZwdbOk8guhQqDRNrcZP6 llZw== 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 b189si807930wmf.115.2018.01.15.15.37.38; Mon, 15 Jan 2018 15:37:39 -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; 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 99819689FC6; Tue, 16 Jan 2018 01:37:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe05-2.mx.upcmail.net (vie01a-dmta-pe05-2.mx.upcmail.net [84.116.36.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 789F068998B for ; Tue, 16 Jan 2018 01:37:29 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe05.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1ebEJm-0007HA-SU for ffmpeg-devel@ffmpeg.org; Tue, 16 Jan 2018 00:37:30 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id yndV1w0100S5wYM01ndWhQ; Tue, 16 Jan 2018 00:37:30 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 16 Jan 2018 00:37:27 +0100 Message-Id: <20180115233728.15279-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.15.1 Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/hevc_cabac: Move prefix check in coeff_abs_level_remaining_decode() down 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" Signed-off-by: Michael Niedermayer --- libavcodec/hevc_cabac.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/libavcodec/hevc_cabac.c b/libavcodec/hevc_cabac.c index 5b5da1165a..743168500c 100644 --- a/libavcodec/hevc_cabac.c +++ b/libavcodec/hevc_cabac.c @@ -990,16 +990,19 @@ static av_always_inline int coeff_abs_level_remaining_decode(HEVCContext *s, int while (prefix < CABAC_MAX_BIN && get_cabac_bypass(&s->HEVClc->cc)) prefix++; - if (prefix == CABAC_MAX_BIN) { - av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", prefix); - return 0; - } + if (prefix < 3) { for (i = 0; i < rc_rice_param; i++) suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc->cc); last_coeff_abs_level_remaining = (prefix << rc_rice_param) + suffix; } else { int prefix_minus3 = prefix - 3; + + if (prefix == CABAC_MAX_BIN) { + av_log(s->avctx, AV_LOG_ERROR, "CABAC_MAX_BIN : %d\n", prefix); + return 0; + } + for (i = 0; i < prefix_minus3 + rc_rice_param; i++) suffix = (suffix << 1) | get_cabac_bypass(&s->HEVClc->cc); last_coeff_abs_level_remaining = (((1 << prefix_minus3) + 3 - 1)