From patchwork Tue Sep 14 10:50:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 30239 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp4866163iov; Tue, 14 Sep 2021 03:51:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPiv6n8ItW3R4MmvyocnQ0/yJ1mEhgBKC+geoaIp2cksWdF03MwnCt/WfhOtOVh11gzBcm X-Received: by 2002:a17:906:8608:: with SMTP id o8mr18170126ejx.470.1631616665909; Tue, 14 Sep 2021 03:51:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631616665; cv=none; d=google.com; s=arc-20160816; b=v2KUVjfgsRpPWt6ZxZglRXEQIHhahQtVPDr1XC9PryJhwIzc6Pv9slpktnXgzoozMY rMgOdZCpEEq0Wokbn3CIxo8N0gyhetNlan2h4saaSJqRW6FbqvyETUT26AsH4pMSkhzA eBqjcyFEtLRRb/u7etsglbIgGSNgRHEqqc9jkLBctRnkwkP7HlFjZwOGalnbzth/IBJC js5KJX/J0GQCh9yql5twLgZWDg0459iH23uZ5o8k9djmwaE4cwILV2PZ41j/k02FV8xP kGfmeiqpl52TG5XQU1lpTCs+uKl0jW65cgCvOduL8cVRSVhgCsAIC+WRmPAS1Ijm7JIT UkXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=HnTQNdTN6VctHNQdt34r/pCYioeueLeN7TjC3Fas/NE=; b=q+EgUsXhGthj7ElmdfmX+hOPnwPCT/InucViXbvbegcbflxxkF5nDZJw+7/IZ1vi0h qb1EqmJd9KLsx8FoPNEoIeyU/2ifpX/B4rpmyczZFZhRRpgU2CoQrEDHiux5NUoJgObR WzFzUK5+xzMDUCGS6hvQvD9WOQs5leUetaA8iGN7gZXUHdB/mEtJw6Z5+jyIYFM87Q/f qQUJIBL0tOl10zyI0Xw4UjVVWrG3Ht5U6bNK2JoCpZks9UBB6BurknJpwW7MErgjBtUI c6CVLKb0+QpUc7VwP0/TICXo0SPs0U5lEKslGVEP9ZcGgcEDqNHCw4oDQhsMYBWHLflK QoSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="ST/fv/an"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ak17si12250920ejc.44.2021.09.14.03.51.05; Tue, 14 Sep 2021 03:51:05 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="ST/fv/an"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2B1CD68AF2D; Tue, 14 Sep 2021 13:50:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A94E68AF1A for ; Tue, 14 Sep 2021 13:50:46 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id y17so11784568pfl.13 for ; Tue, 14 Sep 2021 03:50:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k9RGqg+ZkOcf+IdD1/hMZpMZeWvUzGA91xFEElZEWIU=; b=ST/fv/angrquA3yxvz1zdmLwtD7R6rRKYvnvhyeJw4k9xC2+JRXWs8j+kGNkKefidn MOgNyqvAKD8TiMujCw/DVKXvF/diFz63Y03isREFR1dHGEPtu+iBsk9iwR2y/R7kiC8h /VQftAW0zPWHTHHP/vxMuxhyJEnPJiCA/ta8xdnXurhA5rEo8FilnzVwKhKe67QcXM/y hy3BmprZJZfHVSUjeLC6gyOj/pZmmn6jqtFQOinrjsJgrnuMl+s+mZpy2IP22GmNk/9c Go5yg1BXRp+pF53xnbOnjPEh/d/Xa7Elu8dSRPjPu10SvhFNc/g8iRYoAvm/u+M8wehg N3eQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k9RGqg+ZkOcf+IdD1/hMZpMZeWvUzGA91xFEElZEWIU=; b=EYTPC8AQo8h3PGZBZV7ouMtyJbBsU01dlfiW6a+NXqij8URf1/OTKhuXXp7fP6WofO ljbwdYgKBZWtT0nojGIsI+lSlQR51/mVukGaPLzj7JxtGHzJ5sLOnZJsvf8DKRWSbd4E 2L6OYXOqOr3xoVe4ELqv3uMrn2fZI0/OWAiu72+n67kGORARiB+bqy8CeIwLv+M78kHM UmM9p14ajtvZnqMdBVzGXas6hhPwvb7racWo/bezpbC4QE5WuCz5K65J0q7ytNguKFbO t0eQPfl0jtktVi3UQwD3Q5YFDxrzEdFPMvqly4cRx2GSoWIyE7t2CcD3RrH3WU9p6qzO h5Cg== X-Gm-Message-State: AOAM531V7GGcGki1BGHooicYMaKDqPrEmGV6PeMc23PRcU5wxwxPv3Ag R7b9MtQx+e8gKpFV9szPWwNzPKQ2dPo= X-Received: by 2002:aa7:8426:0:b0:438:3550:f190 with SMTP id q6-20020aa78426000000b004383550f190mr4106225pfn.19.1631616644414; Tue, 14 Sep 2021 03:50:44 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id p24sm9905732pfh.136.2021.09.14.03.50.43 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Sep 2021 03:50:44 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 14 Sep 2021 18:50:37 +0800 Message-Id: <1631616638-20151-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1631616638-20151-1-git-send-email-lance.lmwang@gmail.com> References: <1631616638-20151-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/dynamic_hdr10_plus: use AVERROR_INVALIDDATA instead of AVERROR(EINVAL) X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 4ZZv6llKF+rT From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/dynamic_hdr10_plus.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/libavcodec/dynamic_hdr10_plus.c b/libavcodec/dynamic_hdr10_plus.c index a602e60..854e70d 100644 --- a/libavcodec/dynamic_hdr10_plus.c +++ b/libavcodec/dynamic_hdr10_plus.c @@ -76,7 +76,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t } if (get_bits_left(gb) < 28) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; s->targeted_system_display_maximum_luminance = (AVRational){get_bits_long(gb, 27), luminance_den}; @@ -85,7 +85,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t if (s->targeted_system_display_actual_peak_luminance_flag) { int rows, cols; if (get_bits_left(gb) < 10) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; rows = get_bits(gb, 5); cols = get_bits(gb, 5); if (((rows < 2) || (rows > 25)) || ((cols < 2) || (cols > 25))) { @@ -95,7 +95,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t s->num_cols_targeted_system_display_actual_peak_luminance = cols; if (get_bits_left(gb) < (rows * cols * 4)) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; for (int i = 0; i < rows; i++) { for (int j = 0; j < cols; j++) { @@ -107,7 +107,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t for (int w = 0; w < s->num_windows; w++) { AVHDRPlusColorTransformParams *params = &s->params[w]; if (get_bits_left(gb) < (3 * 17 + 17 + 4)) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; for (int i = 0; i < 3; i++) { params->maxscl[i] = @@ -119,7 +119,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t if (get_bits_left(gb) < (params->num_distribution_maxrgb_percentiles * 24)) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; for (int i = 0; i < params->num_distribution_maxrgb_percentiles; i++) { params->distribution_maxrgb[i].percentage = get_bits(gb, 7); @@ -128,17 +128,17 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t } if (get_bits_left(gb) < 10) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; params->fraction_bright_pixels = (AVRational){get_bits(gb, 10), fraction_pixel_den}; } if (get_bits_left(gb) < 1) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; s->mastering_display_actual_peak_luminance_flag = get_bits1(gb); if (s->mastering_display_actual_peak_luminance_flag) { int rows, cols; if (get_bits_left(gb) < 10) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; rows = get_bits(gb, 5); cols = get_bits(gb, 5); if (((rows < 2) || (rows > 25)) || ((cols < 2) || (cols > 25))) { @@ -148,7 +148,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t s->num_cols_mastering_display_actual_peak_luminance = cols; if (get_bits_left(gb) < (rows * cols * 4)) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; for (int i = 0; i < rows; i++) { for (int j = 0; j < cols; j++) { @@ -161,12 +161,12 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t for (int w = 0; w < s->num_windows; w++) { AVHDRPlusColorTransformParams *params = &s->params[w]; if (get_bits_left(gb) < 1) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; params->tone_mapping_flag = get_bits1(gb); if (params->tone_mapping_flag) { if (get_bits_left(gb) < 28) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; params->knee_point_x = (AVRational){get_bits(gb, 12), knee_point_den}; @@ -175,7 +175,7 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t params->num_bezier_curve_anchors = get_bits(gb, 4); if (get_bits_left(gb) < (params->num_bezier_curve_anchors * 10)) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; for (int i = 0; i < params->num_bezier_curve_anchors; i++) { params->bezier_curve_anchors[i] = @@ -184,11 +184,11 @@ int ff_parse_itu_t_t35_to_dynamic_hdr10_plus(AVDynamicHDRPlus *s, const uint8_t } if (get_bits_left(gb) < 1) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; params->color_saturation_mapping_flag = get_bits1(gb); if (params->color_saturation_mapping_flag) { if (get_bits_left(gb) < 6) - return AVERROR(EINVAL); + return AVERROR_INVALIDDATA; params->color_saturation_weight = (AVRational){get_bits(gb, 6), saturation_weight_den}; }