From patchwork Tue Sep 24 22:03:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15277 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A329B44A745 for ; Wed, 25 Sep 2019 01:05:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 745C668A581; Wed, 25 Sep 2019 01:03:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BC21E68A423 for ; Wed, 25 Sep 2019 01:03:49 +0300 (EEST) Received: by mail-wr1-f46.google.com with SMTP id y19so3799360wrd.3 for ; Tue, 24 Sep 2019 15:03:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/u1lV3MWYkqmhK/nIfmu8185qqR4cX8lLWPP27HIMxE=; b=KuaP1UAyG6WZ7QdstUCoeO3Zyc7fkNE7aTR5OcU3tgNaBlWzo384VXnvH9xlcSsolZ JWfudJ4USkLajPo4AyxFDfOTRRa1IkvS0kOzI+cpk+jyiovi0NSuIDc6/HbycwWMgmWY A0V0kxPvdSJO98l206rBNCY2zVRuoGCyDHQsr3MfFZKPtqViLCbWFp17CwZKW4tINYUa EiR9aih7L6yQiODLpEZ+XGIWfxuwIfHM77otTi6y+7mzMgpxNX4l98ApVL1xKwpCR28t FlUhdqUAH03XC2cCl44LXUOy9mD4jaKoRKsj5bMuomipLJMMmFKdPFf1aRsEiKXfh+cg +iBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=/u1lV3MWYkqmhK/nIfmu8185qqR4cX8lLWPP27HIMxE=; b=mszjwBsFPWhnhdryQeCDHngX087WcYTSuyGL3/MOekSnifh+GBH2v+/dKP8c3hiqjb j/8rJj7Wmh5GNq53fx2Td7K/BZFKwgLlyFC6nTTKnok0rZ975myjQOhNFhhjh789fV1m Ui1nVucNgPDvyRQppOu5XnO2DkFqwYC0NN3hGwLSZOq24TdM1j09yw4GfnWum/agyt5/ vHIi8PimCr4Q7dOoOSU5qprth7lxh3XnaqhfAC32ly9Zi9VAu3yjuwQPhcPNc3tNS/Ma V9aXBaqTZvhbGk4trG4qfzn04Ug4tOdE0eVNKlLqpyY9orUL8z9Clpcp9XwIcEGu3rFV cMWg== X-Gm-Message-State: APjAAAWoaAYk3Al6oBdigEndU/+3M4nZyARxdLg3HJ6r7bDNbnmq1ZzL XX9/I3z9qXPD5cELjRPgu9tHRHVe X-Google-Smtp-Source: APXvYqwa8VGWiW1hG3Fq+v6jTqv8ZBtV59dTGCwgxmfMZdqymxY5Lbd7+nq9sL9nMM4oaZO6bYtKDw== X-Received: by 2002:a5d:4f11:: with SMTP id c17mr5208639wru.227.1569362628777; Tue, 24 Sep 2019 15:03:48 -0700 (PDT) Received: from sblaptop.fritz.box ([188.192.248.87]) by smtp.gmail.com with ESMTPSA id l1sm3023808wrb.1.2019.09.24.15.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 15:03:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 25 Sep 2019 00:03:10 +0200 Message-Id: <20190924220310.31157-16-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> References: <20190924220310.31157-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 15/15] avcodec/dnxhdenc: Fix undefined left shifts of negative numbers 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Affected 61 FATE-tests: 60 vsynth tests and lavf-mxf_opatom. Signed-off-by: Andreas Rheinhardt --- 239 failing tests left to go! libavcodec/dnxhdenc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 41b8079a09..034bcfc542 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -220,7 +220,7 @@ static av_cold int dnxhd_init_vlc(DNXHDEncContext *ctx) ctx->vlc_bits = ctx->orig_vlc_bits + max_level * 2; for (level = -max_level; level < max_level; level++) { for (run = 0; run < 2; run++) { - int index = (level << 1) | run; + int index = FFLSHIFT(level, 1) | run; int sign, offset = 0, alevel = level; MASK_ABS(sign, alevel); @@ -616,7 +616,7 @@ void dnxhd_encode_block(DNXHDEncContext *ctx, int16_t *block, slevel = block[j]; if (slevel) { int run_level = i - last_non_zero - 1; - int rlevel = (slevel << 1) | !!run_level; + int rlevel = FFLSHIFT(slevel, 1) | !!run_level; put_bits(&ctx->m.pb, ctx->vlc_bits[rlevel], ctx->vlc_codes[rlevel]); if (run_level) put_bits(&ctx->m.pb, ctx->run_bits[run_level], @@ -696,7 +696,7 @@ int dnxhd_calc_ac_bits(DNXHDEncContext *ctx, int16_t *block, int last_index) level = block[j]; if (level) { int run_level = i - last_non_zero - 1; - bits += ctx->vlc_bits[(level << 1) | + bits += ctx->vlc_bits[FFLSHIFT(level, 1) | !!run_level] + ctx->run_bits[run_level]; last_non_zero = i; }