From patchwork Mon Jan 21 17:39:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Dana X-Patchwork-Id: 11811 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 BB65E44C73D for ; Mon, 21 Jan 2019 19:46:49 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC16C68AB6F; Mon, 21 Jan 2019 19:46:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2D1468A9FB for ; Mon, 21 Jan 2019 19:46:31 +0200 (EET) Received: by mail-qk1-f194.google.com with SMTP id w204so12747044qka.2 for ; Mon, 21 Jan 2019 09:46:49 -0800 (PST) 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=7MGpIMfsWJQ0jtDfjz0A8VhX6wPp+F9HC2Kk4vGUvZ8=; b=aWQ910A3DsElBl9av/b+63/Z4Dk2OvJaLQOsKbXAHh0Tv6ODoTg8RI+guTc/rMmEBb oqps13V46tnSmFWjAB585zemp2Q7Abt6hIuqZbmvTFzfcfNOOuo/bR+DE9ikgtOC1AeY sHExDUXVM/C0tVMZUcrz/NwJZb63AMvbydVkjnaxRiymy+sHP1CmANqzqZ07E/s65bjp efW7eY8O9OggfilHX23cIJsIa0znxGeCj++oedQ0yid/UAM3PZBonI04q/zV3NOCHu9a LBa/43gwAhe65Rj2Tiz+rQCmXwM6s8akhx4Ycgi1TVtmX9dMf4BYk3Yu1Prs5ubkP/CM b5Sw== 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=7MGpIMfsWJQ0jtDfjz0A8VhX6wPp+F9HC2Kk4vGUvZ8=; b=LJESuB7Mb47f1rbdoSfI9Y39viqbeOu4Pv8rZy64UAN5Xayw3KP9F/SGgW3O+MpjzL CzoheYF97Rxrzn6+nHPTcvH9yQ541St2wkKS7CfD/5uHvMtDaB9S//6hc4eufkFEyCb1 JQzrGP7vOskIHJX3Crp+x/BXA1qCPPBw3IEGAmlEqXDWojPD7JiB11xEaDv/pH3Mw8iX l3srAeyGsu2qRCRj6AUT3qMkYfH+dvci8usZLQqKFYZuZcbD0xT10F8Jgn4ubdFR6mXe aw7fGFpxsN7bUPnXT5yKqB9RdFmXuLLYx2Mc8kyDKmN0V/WRsNHdYA+uACFKyKI6macl aNng== X-Gm-Message-State: AJcUukfLxX234IqFBgPgTVsvTIP73En89+lf/kWameV0P3U+TUTJe99+ bmSSc1Ob36j2uUyU7u/5vOWgEPBm X-Google-Smtp-Source: ALg8bN51I1EyjiFlsJQwKxDhgqmgeURdcMJ3lHEiMz4G2h158iCakHzVJxs54xOy6+rC14cnl5Cn2g== X-Received: by 2002:a37:5b47:: with SMTP id p68mr25023877qkb.299.1548092384662; Mon, 21 Jan 2019 09:39:44 -0800 (PST) Received: from teevey.local (ool-44c5019e.dyn.optonline.net. [68.197.1.158]) by smtp.gmail.com with ESMTPSA id e4sm66439604qka.31.2019.01.21.09.39.43 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 21 Jan 2019 09:39:44 -0800 (PST) From: "FeRD (Frank Dana)" To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Jan 2019 12:39:00 -0500 Message-Id: <3280d2063802b9b2940f79ee3cb2e951be62f02e.1548091116.git.ferdnyc@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <2d3e9fe16bfe6fc51a47582ea53deaaf20727f38.1548091116.git.ferdnyc@gmail.com> References: <2d3e9fe16bfe6fc51a47582ea53deaaf20727f38.1548091116.git.ferdnyc@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec: Change uses of RSHIFT to ROUNDED_RSHIFT 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: "FeRD \(Frank Dana\)" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Three files in libavcodec/ use the RSHIFT macro from libavutil: - mpeg4videodec.c - vp3.c - vp56.c All instances of RSHIFT are updated to follow the name-change in libavutil/common.h (previous commit). Signed-off-by: FeRD (Frank Dana) --- libavcodec/mpeg4videodec.c | 4 ++-- libavcodec/vp3.c | 16 ++++++++-------- libavcodec/vp56.c | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index f44ee76bd4..5d63ba12ba 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -601,7 +601,7 @@ static inline int get_amv(Mpeg4DecContext *ctx, int n) if (ctx->divx_version == 500 && ctx->divx_build == 413 && a >= s->quarter_sample) sum = s->sprite_offset[0][n] / (1 << (a - s->quarter_sample)); else - sum = RSHIFT(s->sprite_offset[0][n] * (1 << s->quarter_sample), a); + sum = ROUNDED_RSHIFT(s->sprite_offset[0][n] * (1 << s->quarter_sample), a); } else { dx = s->sprite_delta[n][0]; dy = s->sprite_delta[n][1]; @@ -623,7 +623,7 @@ static inline int get_amv(Mpeg4DecContext *ctx, int n) v += dx; } } - sum = RSHIFT(sum, a + 8 - s->quarter_sample); + sum = ROUNDED_RSHIFT(sum, a + 8 - s->quarter_sample); } if (sum < -len) diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c index a5d8c2ed0b..13b3d6e22a 100644 --- a/libavcodec/vp3.c +++ b/libavcodec/vp3.c @@ -861,10 +861,10 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) if (s->chroma_y_shift) { if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { - motion_x[0] = RSHIFT(motion_x[0] + motion_x[1] + - motion_x[2] + motion_x[3], 2); - motion_y[0] = RSHIFT(motion_y[0] + motion_y[1] + - motion_y[2] + motion_y[3], 2); + motion_x[0] = ROUNDED_RSHIFT(motion_x[0] + motion_x[1] + + motion_x[2] + motion_x[3], 2); + motion_y[0] = ROUNDED_RSHIFT(motion_y[0] + motion_y[1] + + motion_y[2] + motion_y[3], 2); } motion_x[0] = (motion_x[0] >> 1) | (motion_x[0] & 1); motion_y[0] = (motion_y[0] >> 1) | (motion_y[0] & 1); @@ -873,10 +873,10 @@ static int unpack_vectors(Vp3DecodeContext *s, GetBitContext *gb) s->motion_val[1][frag][1] = motion_y[0]; } else if (s->chroma_x_shift) { if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { - motion_x[0] = RSHIFT(motion_x[0] + motion_x[1], 1); - motion_y[0] = RSHIFT(motion_y[0] + motion_y[1], 1); - motion_x[1] = RSHIFT(motion_x[2] + motion_x[3], 1); - motion_y[1] = RSHIFT(motion_y[2] + motion_y[3], 1); + motion_x[0] = ROUNDED_RSHIFT(motion_x[0] + motion_x[1], 1); + motion_y[0] = ROUNDED_RSHIFT(motion_y[0] + motion_y[1], 1); + motion_x[1] = ROUNDED_RSHIFT(motion_x[2] + motion_x[3], 1); + motion_y[1] = ROUNDED_RSHIFT(motion_y[2] + motion_y[3], 1); } else { motion_x[1] = motion_x[0]; motion_y[1] = motion_y[0]; diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index b69fe6c176..9359b48bc6 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -197,8 +197,8 @@ static void vp56_decode_4mv(VP56Context *s, int row, int col) /* chroma vectors are average luma vectors */ if (s->avctx->codec->id == AV_CODEC_ID_VP5) { - s->mv[4].x = s->mv[5].x = RSHIFT(mv.x,2); - s->mv[4].y = s->mv[5].y = RSHIFT(mv.y,2); + s->mv[4].x = s->mv[5].x = ROUNDED_RSHIFT(mv.x,2); + s->mv[4].y = s->mv[5].y = ROUNDED_RSHIFT(mv.y,2); } else { s->mv[4] = s->mv[5] = (VP56mv) {mv.x/4, mv.y/4}; }