From patchwork Thu Sep 5 08:52:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 14925 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 AF6C1448846 for ; Thu, 5 Sep 2019 12:01:31 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 97746687FD4; Thu, 5 Sep 2019 12:01:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3FC3687FDC for ; Thu, 5 Sep 2019 12:01:30 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id t16so1757934wra.6 for ; Thu, 05 Sep 2019 02:01:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=LrD3QrMKJglwZxOGxXYzNLRDfYEkB1aNQuIHUQmuVMo=; b=eGvT9NwcwVUYIZPDJ+5YqPtka1mWBSttIxG9vZvGTscdEeMJhkWThAc0W4KO8RzGjk TdJ7CZRxcxPXyRpobcGkHBcQM0mCOzvWLuDWAbqniWfh84Vu4vCqRU2n5gSbyKwH7DHA 3CigCA9SKd1DXIOcA9DN4D3BgWF1sL1CFkoH1hhEiLkfQpTw1NMDqkgN36e0yP/bKjsD leu1/1mvtZbyB3GbDYWVL+jKDdPqLIbJPrddPOaMm/+NQhyrupjvHG4WWEJy1lyjJtE4 JuCeGJ/l4xSRSy3rR8odEQy891uYKMtz4Z/Zbp8NVie7QjbWN1sBdtbRr1JEKFbHwD/5 1Nvw== 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:in-reply-to :references; bh=LrD3QrMKJglwZxOGxXYzNLRDfYEkB1aNQuIHUQmuVMo=; b=FDsU2w1x3B+dlmfB/JQRxNhoyCyldZJuki9QWCmnAjmiEuZ41XK9CDdKzNhWOMp9sn hvyyvzvDrm9/GaAQ/TfHvytc/XQBkQnwQHm+szXMKRxDuxcOhF4gpHTPRJ6FBX+Z6rUg pe/VAjJ+MrsjVPrjq2ASn0Ip2YjBNnWecPmTAAkOitmVqU6pXyTRCbiLgNbSeG028kX1 N47DHeSBRceqhvR2Le2QpcY6IIkDvDg1U5CDEFS6PTqqqk+2d+zy+It3cyN0rSeUR7Se 8ZdZy3wfArf171QWvE4TjFNupNnLfstgDBokHpxBzv8ErgNQzE4qhz355oek+NG5ylWm tXFQ== X-Gm-Message-State: APjAAAWjqBOsMlNKUPCgxdI+6U6Qz4egjjvyoVa7dm5N4T2aJ2U0FKaL Fx2K4ihhu+1Yym7DJZQPSxwYZtmL9wo= X-Google-Smtp-Source: APXvYqw99vr73UHtlk3w/v8OfZ43zxaG8wR3d/Lp6A04vAALSX5LpLjDhADcsG2sC4fZkcCJ8Wu92w== X-Received: by 2002:a5d:544b:: with SMTP id w11mr1523235wrv.316.1567673587832; Thu, 05 Sep 2019 01:53:07 -0700 (PDT) Received: from localhost.localdomain ([77.237.106.98]) by smtp.gmail.com with ESMTPSA id u6sm1187440wrr.26.2019.09.05.01.53.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Sep 2019 01:53:07 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Thu, 5 Sep 2019 10:52:53 +0200 Message-Id: <20190905085255.24699-3-onemda@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190905085255.24699-1-onemda@gmail.com> References: <20190905085255.24699-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 3/5] avfilter/vf_v360: add asserts to guard against invalid conditions 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: Paul B Mahol --- libavfilter/vf_v360.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/libavfilter/vf_v360.c b/libavfilter/vf_v360.c index dd41bb293c..fc120097d9 100644 --- a/libavfilter/vf_v360.c +++ b/libavfilter/vf_v360.c @@ -33,6 +33,7 @@ * 5) Remap input frame to output frame using precalculated data */ +#include "libavutil/avassert.h" #include "libavutil/imgutils.h" #include "libavutil/pixdesc.h" #include "libavutil/opt.h" @@ -696,6 +697,8 @@ static inline void rotate_cube_face(float *uf, float *vf, int rotation) *uf = *vf; *vf = tmp; break; + default: + av_assert0(0); } } @@ -720,6 +723,8 @@ static inline void rotate_cube_face_inverse(float *uf, float *vf, int rotation) *uf = -*vf; *vf = tmp; break; + default: + av_assert0(0); } } @@ -850,6 +855,8 @@ static void xyz_to_cube(const V360Context *s, *uf = -vec[0] / vec[2]; *vf = -vec[1] / vec[2]; break; + default: + av_assert0(0); } face = s->in_cubemap_face_order[*direction]; @@ -929,6 +936,8 @@ static void process_cube_coordinates(const V360Context *s, *new_uf = uf; *new_vf = vf; break; + default: + av_assert0(0); } } else if (uf >= 1.f) { uf -= 2.f; @@ -963,6 +972,8 @@ static void process_cube_coordinates(const V360Context *s, *new_uf = uf; *new_vf = vf; break; + default: + av_assert0(0); } } else if (vf < -1.f) { vf += 2.f; @@ -997,6 +1008,8 @@ static void process_cube_coordinates(const V360Context *s, *new_uf = -uf; *new_vf = -vf; break; + default: + av_assert0(0); } } else if (vf >= 1.f) { vf -= 2.f; @@ -1031,6 +1044,8 @@ static void process_cube_coordinates(const V360Context *s, *new_uf = -uf; *new_vf = -vf; break; + default: + av_assert0(0); } } else { // Inside cube face @@ -1587,6 +1602,8 @@ static void eac_to_xyz(const V360Context *s, l_y = 1.f; l_z = -uf; break; + default: + av_assert0(0); } norm = sqrtf(l_x * l_x + l_y * l_y + l_z * l_z); @@ -2017,6 +2034,8 @@ static int config_output(AVFilterLink *outlink) sizeof_uv = sizeof(uint16_t) * elements; sizeof_ker = sizeof(uint16_t) * elements; break; + default: + av_assert0(0); } switch (s->in) {