From patchwork Fri Mar 22 14:50:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: velocityra@gmail.com X-Patchwork-Id: 12391 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 4D134448002 for ; Fri, 22 Mar 2019 17:00:57 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 375E268A9A1; Fri, 22 Mar 2019 17:00:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 02437689A12 for ; Fri, 22 Mar 2019 17:00:51 +0200 (EET) Received: by mail-wm1-f68.google.com with SMTP id z11so2517333wmi.0 for ; Fri, 22 Mar 2019 08:00:50 -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:mime-version :content-transfer-encoding; bh=7Q03Z9A+VOBggQKmKBYvdc2V/PbsooCn2flX6fkX5vs=; b=NvoXfNG7e7uCInzyA2X7lRz9PP7QTgweaZxZINPbjutOfASROcu4iFKEYMYerFQZV0 UBTBRZaAlzputXycUp40axWxQSgEu7S90qnT2UTXxLfhcrpLWwPVUZBhUEhd4suDz266 woYHE2IWen4UZfdXEz1ofuOFXnIPKZNKGhTYZ1evL89P4c0XDNgL4MrhKfZyEbmjcNkW f/u2hPZsYlQ8G/4wcKbe4EvFCU/phTJVguY2XDnUACZVFTZcI4QqdEiD27zVDAiTlP7d vU+7X5VR7BDKcewBvsK1zP6UWX2HBioCWf+qbV+Ymq0KbsiHhM/tszTiMm9Pp/NI+jZR I2uA== 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:mime-version :content-transfer-encoding; bh=7Q03Z9A+VOBggQKmKBYvdc2V/PbsooCn2flX6fkX5vs=; b=iGJxBMbeQ7WJa2yhgSZ1bQhvIE/ZIjthn6zslxkHwjb/sBrHFKYqPpF8YfENlhbOAz VuWZdIONlXzKDaCqK5pwWdpzsdqQVnMlM++o/1lzPMPAbeZxQTk1VdbDKJb2hvO4FupC aGPiD2umy5yv2KWET7wU5ZNJho71wBEYGCwtQcFrQgPfKaTtF1f9IDmy6lbCru1tBP6X 64Ih+ukjAKS0ygPVdGS8hgxbc17dici6Qw2vrTNwkVJYRRlrFvo/jR8Tf4q9GjCOJtAb 2s58hwJBGNPobKJAm/lzlvq5ebKZDE8HDpR3kQYDZfara6w2WkBBiC3xLPN3bAv1sMUO eNkQ== X-Gm-Message-State: APjAAAUFnqG/JHhwDcffb8QImIY1zOag/d7ZHeIkL5HqCaKjRfIQvxUT 6lRMb5T7LIcAfiBZISMqpSLuZ7m/ X-Google-Smtp-Source: APXvYqy2zazfRhkHMGIphcXT921FV0gGa9tiOTY8s7XojI0vl0xjEpBNlq66Ezf54iFrC92e90BxJg== X-Received: by 2002:a1c:3944:: with SMTP id g65mr3250224wma.34.1553266399718; Fri, 22 Mar 2019 07:53:19 -0700 (PDT) Received: from localhost.localdomain ([2a02:587:240c:1200:fdc2:c133:edbe:3d2c]) by smtp.gmail.com with ESMTPSA id k14sm6280389wmj.26.2019.03.22.07.53.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 07:53:18 -0700 (PDT) From: velocityra@gmail.com X-Google-Original-From: velocityra@gmail To: ffmpeg-devel@ffmpeg.org Date: Fri, 22 Mar 2019 16:50:48 +0200 Message-Id: <20190322145049.25432-1-velocityra@gmail.com> X-Mailer: git-send-email 2.21.0.windows.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/2] avutil/opt: Add AV_OPT_TYPE_UINT16 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: Nick Renieris Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Nick Renieris Signed-off-by: Nick Renieris --- libavutil/opt.c | 29 +++++++++++++++++++++++++++-- libavutil/opt.h | 1 + 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/libavutil/opt.c b/libavutil/opt.c index 93d6c26c11..d409f3521a 100644 --- a/libavutil/opt.c +++ b/libavutil/opt.c @@ -71,6 +71,9 @@ static int read_number(const AVOption *o, const void *dst, double *num, int *den case AV_OPT_TYPE_INT: *intnum = *(int *)dst; return 0; + case AV_OPT_TYPE_UINT16: + *intnum = *(uint16_t*)dst; + return 0; case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_INT64: @@ -125,6 +128,13 @@ static int write_number(void *obj, const AVOption *o, void *dst, double num, int case AV_OPT_TYPE_INT: *(int *)dst = llrint(num / den) * intnum; break; + case AV_OPT_TYPE_UINT16:{ + float d = num / den; + if (intnum == 1 && d == (float)UINT16_MAX) { + *(int16_t *)dst = INT16_MAX; + } else + *(int16_t *)dst = llrint(d) * intnum; + break;} case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_INT64:{ @@ -218,8 +228,9 @@ static int set_string(void *obj, const AVOption *o, const char *val, uint8_t **d return *dst ? 0 : AVERROR(ENOMEM); } -#define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_INT64 || \ - opt->type == AV_OPT_TYPE_UINT64 || \ +#define DEFAULT_NUMVAL(opt) ((opt->type == AV_OPT_TYPE_UINT16 ||\ + opt->type == AV_OPT_TYPE_UINT64 ||\ + opt->type == AV_OPT_TYPE_INT64 || \ opt->type == AV_OPT_TYPE_CONST || \ opt->type == AV_OPT_TYPE_FLAGS || \ opt->type == AV_OPT_TYPE_INT) \ @@ -476,6 +487,7 @@ int av_opt_set(void *obj, const char *name, const char *val, int search_flags) return set_string_binary(obj, o, val, dst); case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT16: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_FLOAT: @@ -785,6 +797,9 @@ int av_opt_get(void *obj, const char *name, int search_flags, uint8_t **out_val) case AV_OPT_TYPE_INT: ret = snprintf(buf, sizeof(buf), "%d", *(int *)dst); break; + case AV_OPT_TYPE_UINT16: + ret = snprintf(buf, sizeof(buf), "%"PRIu16, *(uint16_t *)dst); + break; case AV_OPT_TYPE_INT64: ret = snprintf(buf, sizeof(buf), "%"PRId64, *(int64_t *)dst); break; @@ -1136,6 +1151,9 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, case AV_OPT_TYPE_INT: av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); break; + case AV_OPT_TYPE_UINT16: + av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); + break; case AV_OPT_TYPE_INT64: av_log(av_log_obj, AV_LOG_INFO, "%-12s ", ""); break; @@ -1202,6 +1220,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, if (av_opt_query_ranges(&r, obj, opt->name, AV_OPT_SEARCH_FAKE_OBJ) >= 0) { switch (opt->type) { case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT16: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_DOUBLE: @@ -1248,6 +1267,7 @@ static void opt_list(void *obj, void *av_log_obj, const char *unit, break; } case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT16: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_INT64: { const char *def_const = get_opt_const_name(obj, opt->unit, opt->default_val.i64); @@ -1326,6 +1346,7 @@ void av_opt_set_defaults2(void *s, int mask, int flags) case AV_OPT_TYPE_BOOL: case AV_OPT_TYPE_FLAGS: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT16: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_DURATION: @@ -1685,6 +1706,8 @@ static int opt_size(enum AVOptionType type) case AV_OPT_TYPE_INT: case AV_OPT_TYPE_FLAGS: return sizeof(int); + case AV_OPT_TYPE_UINT16: + return sizeof(uint16_t); case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_INT64: @@ -1817,6 +1840,7 @@ int av_opt_query_ranges_default(AVOptionRanges **ranges_arg, void *obj, const ch switch (field->type) { case AV_OPT_TYPE_BOOL: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT16: case AV_OPT_TYPE_INT64: case AV_OPT_TYPE_UINT64: case AV_OPT_TYPE_PIXEL_FMT: @@ -1905,6 +1929,7 @@ int av_opt_is_set_to_default(void *obj, const AVOption *o) case AV_OPT_TYPE_PIXEL_FMT: case AV_OPT_TYPE_SAMPLE_FMT: case AV_OPT_TYPE_INT: + case AV_OPT_TYPE_UINT16: case AV_OPT_TYPE_CHANNEL_LAYOUT: case AV_OPT_TYPE_DURATION: case AV_OPT_TYPE_INT64: diff --git a/libavutil/opt.h b/libavutil/opt.h index 39f4a8dda0..82685d3309 100644 --- a/libavutil/opt.h +++ b/libavutil/opt.h @@ -238,6 +238,7 @@ enum AVOptionType{ AV_OPT_TYPE_COLOR, AV_OPT_TYPE_CHANNEL_LAYOUT, AV_OPT_TYPE_BOOL, + AV_OPT_TYPE_UINT16, }; /**