From patchwork Sun Jun 25 15:38:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 4110 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp537828vsb; Sun, 25 Jun 2017 08:39:16 -0700 (PDT) X-Received: by 10.223.142.143 with SMTP id q15mr11991564wrb.180.1498405156028; Sun, 25 Jun 2017 08:39:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498405155; cv=none; d=google.com; s=arc-20160816; b=W+DyfcLZmd2TaE+FHYzhcO1YuIQVrSxFQTby/pYC7erS9Ym6JUznPkQeLoJnZCgjTs aCt9kzFVwLdSdun5XuFRltnIVoxBJR0m1DQyCvGugGJlKnA+3FfVv0W/5IcuMCFmHntO SwDdz75AevhK0Tv530vTL42CJodpDxKW1fp90jHrvu3jT4/LLBbLHP5jgeDPs7RePYwJ hEw1ASCBAbdnimVD+4boY5LDp5dlm3mQOM6tvMyfEojlPueH9FRzL5sohDLWdKp5RBvH oUwGuhElot94hzBk8UQJCxXXD7F0pKRHbGv2OXINS3fGMJpFcbklXCm3+u/Ha+Ikw+UL aLxg== 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=9lnaX7GgnxwRB2LZ7HLxSU45Cy1oUAhyx7kt+DeUZSk=; b=SpGFYBlU+L6kGz/VWuYF8e/sBrrEqQkJbHVhUfLNb9Jif6fbYRKKN+EljmskA/e6Au 0lMNSJtvratUYLbYNC6CnQNNocFzj/vgFUEFgphtX6Y+FGMgYdOjyTlAAj2mqGPnnvpI onmboB2FOR14Vg3EpzUtyVsJG8isWKwxeGDeKlN47ofO1vSxj2wFcpky1kvITJgc1MFB vur5wJ75apQFhvB6+J6gTUplxlNfQ/ywKxPJvzIQ6iI4mL7X7eGxK8DQhnvwfnk7hBqj jwROy7lzJACasP26u0y7iYz0xqQTWRR8HkvZvkvFDH9ZhrXvoO9Tw5PJedqqSzZXtosN Vzjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=EY7Dp9ii; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g5si7148196wmf.31.2017.06.25.08.39.14; Sun, 25 Jun 2017 08:39:15 -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 header.b=EY7Dp9ii; 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 E070C689DE1; Sun, 25 Jun 2017 18:39:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8521C689D52 for ; Sun, 25 Jun 2017 18:39:04 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id 77so24943749wrb.3 for ; Sun, 25 Jun 2017 08:39:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=8moDcCTesIFocgK76YVDmfP8OUt2gAenmaydxDBwSqo=; b=EY7Dp9iipoOKb8DCwbEU7EhcMAn8xdMLghykmkGYElxdqq+esewpfoadLu0pQ71cCI PwQKsDl9V4rDYq8Lee6eRdzAlYIMYpOo8NUxQ1PtDLvNLOl/C7LW+mv/X0pPi9mljJT1 eBB7LWnqZ7GLQ0vmgnQ/TRwv93HBa58wco1tF9SaLOdT9In66AtEN6xsaFrnhYHBOofj 0aMXjjwNxxJrkuqtiKpAzzUWY+SmwDPuFI1OV5cxzd6r4feHWQrhcvOX76amX0DwFyG1 nbP+HO00lwOIOGRmAtpISljKh8Kw/OwXLssx44r95v6oKhLNgJPqdaz1BGoRJKjbXo6y 0XgA== 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=8moDcCTesIFocgK76YVDmfP8OUt2gAenmaydxDBwSqo=; b=eBe6+WBLQoGs1GF74FRABmNwvq21d0ftNGNEqB0gfXamibrf/MGNam2qFpp2MPsEV+ 1Bi7/OHYMjfUVneE4wktRAtHqzgJkfOe30X2Co4EPoYpCPoARKEUCmEA2dD/btZRGjjh DYyEdl0cmnJu5uvsV+JGY/zYzhFAL0Gf2CR/QwfygkZ3V2U1hzxcxS7hV+elgsr+lnj3 bNqG/XY35pBJx7lJ4YUgtxvqqyKm5B+eD+IDt3XsMaotUNoAdVK10q2SiUtjRKNJkNuy Oi8UYD2FYCkNJi//UVvH5Iabw7tRqNI3nGlXlQqn3By/47bUc1ByPRPA8dJ7Q6XyO0Zw Auig== X-Gm-Message-State: AKS2vOw6l2g8D65yIhl5F8ecbcWWNCnXBRlrathhQsxX035iGrm84K6x i1tIWceioH1YXa4B X-Received: by 10.223.144.39 with SMTP id h36mr12084966wrh.114.1498405144991; Sun, 25 Jun 2017 08:39:04 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id v2sm11131006wrb.68.2017.06.25.08.39.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 25 Jun 2017 08:39:04 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 25 Jun 2017 17:38:48 +0200 Message-Id: <20170625153848.18265-1-onemda@gmail.com> X-Mailer: git-send-email 2.9.3 Subject: [FFmpeg-devel] [PATCH] avcodec/prores_kostya: increase bits usage when alpha is used 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" Also fix undefined left shift of negative variable. Signed-off-by: Paul B Mahol --- libavcodec/proresenc_kostya.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/proresenc_kostya.c b/libavcodec/proresenc_kostya.c index 090dfa5..25f7fcb 100644 --- a/libavcodec/proresenc_kostya.c +++ b/libavcodec/proresenc_kostya.c @@ -358,7 +358,7 @@ static inline void encode_vlc_codeword(PutBitContext *pb, unsigned codebook, int } #define GET_SIGN(x) ((x) >> 31) -#define MAKE_CODE(x) (((x) << 1) ^ GET_SIGN(x)) +#define MAKE_CODE(x) ((((x)) * 2) ^ GET_SIGN(x)) static void encode_dcs(PutBitContext *pb, int16_t *blocks, int blocks_per_slice, int scale) @@ -1206,6 +1206,8 @@ FF_ENABLE_DEPRECATION_WARNINGS ctx->pictures_per_frame) break; ctx->bits_per_mb = ctx->profile_info->br_tab[i]; + if (ctx->alpha_bits) + ctx->bits_per_mb *= 20; } else if (ctx->bits_per_mb < 128) { av_log(avctx, AV_LOG_ERROR, "too few bits per MB, please set at least 128\n"); return AVERROR_INVALIDDATA;