From patchwork Thu Sep 19 01:53:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 15147 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 9266B44A242 for ; Thu, 19 Sep 2019 04:53:19 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6A01768A132; Thu, 19 Sep 2019 04:53:19 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 77EB268A128 for ; Thu, 19 Sep 2019 04:53:13 +0300 (EEST) Received: by mail-pf1-f195.google.com with SMTP id y22so1178626pfr.3 for ; Wed, 18 Sep 2019 18:53:13 -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; bh=Q0OdvN/fcnLT8QLHZ0pxPe+2zGtmxNo6hP935fmNZO0=; b=cVgl34KlvFBHXPqiO2yHEuxEpg5QcsBag4UIgqhQ7C/mfk0Wpb4ODgY6CI1LP/5UT9 hH3oI3NWilO+utwZofhm5iFf0q7yenfAE+6aAjemdihLVu1XA7d8YwpX+cEV2boXoLdO r8oesAUQxe9MymHMZ18fbOThEvc8HY78IU8fPrKRhd8EJr8AX9wQHFS9QVHE2XIFXrvV ckzXb1joF0pVESDvVr/IQmrJRW53MGzcgA0c1jywgnWo9bgKbHgXnYT2QEfgvb+1uYzg 7Ik0qA49in06rvwmP3wBGf4wVcW894PHpJY649HtDlCGSk7A2Kpt0yI8O8SLKI7dj5RD 93yA== 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; bh=Q0OdvN/fcnLT8QLHZ0pxPe+2zGtmxNo6hP935fmNZO0=; b=qL50QOLvO+G+ujauPsXxVwIziX/sTC+Py3QypIq3QiGzGgq2zM7I5yLs+NNXxVOjZV uBbU0HvTeBFibyd0SvTFLdkILx2bqrXkGDZSEcHXEGmkNJxptEHRtcdpfB+BHiOO5iBE 7mQ7lQQA7Gofy+rz5us32Iyh1ncagWObyBtvEGqXtZyI59JvwiYK65KCieghD2kI+0hg zGClFlPX+1omDwInGYkWc/WZc5ewW6GJ+ut2lKf/FwiXSF9x5zAE21pJjcqNyE0P5M8Y 8F87/89jjyGyTrtWi9YpMkIu/o0mBb+bOO8QWZj+rqmccArg7N8qwo//doKt+9n0t9Ro mn9w== X-Gm-Message-State: APjAAAW8l6vngY5v5EgOWm1VrDKGBNoxbSPAAGi+XJT8ti4TyzVoSQBz GHBdN6dh/9Co4F9GdDrRRoTA1rJg X-Google-Smtp-Source: APXvYqwCIFJojfZjYClZyN8c+YBQm+MDx4OJC9LD/nXLvyFaPQsAeWxemRaLiFqNEYMuNNjFpiyCMw== X-Received: by 2002:a65:6802:: with SMTP id l2mr6703841pgt.33.1568857991407; Wed, 18 Sep 2019 18:53:11 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id y4sm3283009pjn.19.2019.09.18.18.53.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Sep 2019 18:53:10 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 19 Sep 2019 09:53:04 +0800 Message-Id: <20190919015304.32321-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190824161800.15365-1-lance.lmwang@gmail.com> References: <20190824161800.15365-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avfilter/f_sidedata: try to fix warning: comparison of constant -1 with expression of type 'enum AVFrameSideDataType' 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/f_sidedata.c | 10 +++++----- libavutil/frame.h | 10 ++++++++++ libavutil/version.h | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/libavfilter/f_sidedata.c b/libavfilter/f_sidedata.c index 381da5a052..3082aa65ea 100644 --- a/libavfilter/f_sidedata.c +++ b/libavfilter/f_sidedata.c @@ -49,7 +49,7 @@ static const AVOption filt_name##_options[] = { \ { "mode", "set a mode of operation", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, SIDEDATA_NB-1, FLAGS, "mode" }, \ { "select", "select frame", 0, AV_OPT_TYPE_CONST, {.i64 = SIDEDATA_SELECT }, 0, 0, FLAGS, "mode" }, \ { "delete", "delete side data", 0, AV_OPT_TYPE_CONST, {.i64 = SIDEDATA_DELETE }, 0, 0, FLAGS, "mode" }, \ - { "type", "set side data type", OFFSET(type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, INT_MAX, FLAGS, "type" }, \ + { "type", "set side data type", OFFSET(type), AV_OPT_TYPE_INT, {.i64 = AV_FRAME_DATA_NB }, 0, AV_FRAME_DATA_NB, FLAGS, "type" }, \ { "PANSCAN", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_PANSCAN }, 0, 0, FLAGS, "type" }, \ { "A53_CC", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_A53_CC }, 0, 0, FLAGS, "type" }, \ { "STEREO3D", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_STEREO3D }, 0, 0, FLAGS, "type" }, \ @@ -79,7 +79,7 @@ static const AVOption filt_name##_options[] = { \ { "mode", "set a mode of operation", OFFSET(mode), AV_OPT_TYPE_INT, {.i64 = 0 }, 0, SIDEDATA_NB-1, FLAGS, "mode" }, \ { "select", "select frame", 0, AV_OPT_TYPE_CONST, {.i64 = SIDEDATA_SELECT }, 0, 0, FLAGS, "mode" }, \ { "delete", "delete side data", 0, AV_OPT_TYPE_CONST, {.i64 = SIDEDATA_DELETE }, 0, 0, FLAGS, "mode" }, \ - { "type", "set side data type", OFFSET(type), AV_OPT_TYPE_INT, {.i64 = -1 }, -1, INT_MAX, FLAGS, "type" }, \ + { "type", "set side data type", OFFSET(type), AV_OPT_TYPE_INT, {.i64 = AV_FRAME_DATA_NB }, 0, AV_FRAME_DATA_NB, FLAGS, "type" }, \ { "PANSCAN", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_PANSCAN }, 0, 0, FLAGS, "type" }, \ { "A53_CC", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_A53_CC }, 0, 0, FLAGS, "type" }, \ { "STEREO3D", "", 0, AV_OPT_TYPE_CONST, {.i64 = AV_FRAME_DATA_STEREO3D }, 0, 0, FLAGS, "type" }, \ @@ -107,7 +107,7 @@ static av_cold int init(AVFilterContext *ctx) { SideDataContext *s = ctx->priv; - if (s->type == -1 && s->mode != SIDEDATA_DELETE) { + if (s->type == AV_FRAME_DATA_NB && s->mode != SIDEDATA_DELETE) { av_log(ctx, AV_LOG_ERROR, "Side data type must be set\n"); return AVERROR(EINVAL); } @@ -122,7 +122,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) SideDataContext *s = ctx->priv; AVFrameSideData *sd = NULL; - if (s->type != -1) + if (s->type != AV_FRAME_DATA_NB) sd = av_frame_get_side_data(frame, s->type); switch (s->mode) { @@ -132,7 +132,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *frame) } break; case SIDEDATA_DELETE: - if (s->type == -1) { + if (s->type == AV_FRAME_DATA_NB) { while (frame->nb_side_data) av_frame_remove_side_data(frame, frame->side_data[0]->type); } else if (sd) { diff --git a/libavutil/frame.h b/libavutil/frame.h index 5d3231e7bb..4b83125be1 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -179,6 +179,16 @@ enum AVFrameSideDataType { * array element is implied by AVFrameSideData.size / AVRegionOfInterest.self_size. */ AV_FRAME_DATA_REGIONS_OF_INTEREST, + + /** + * The number of side data types. + * This is not part of the public API/ABI in the sense that it may + * change when new side data types are added. + * This must stay the last enum value. + * If its value becomes huge, some code using it + * needs to be updated as it assumes it to be smaller than other limits. + */ + AV_FRAME_DATA_NB }; enum AVActiveFormatDescription { diff --git a/libavutil/version.h b/libavutil/version.h index 3395769857..27d663baf1 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 56 #define LIBAVUTIL_VERSION_MINOR 35 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \