From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 71A964014B for ; Thu, 2 Feb 2023 07:11:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7DD4868BD86; Thu, 2 Feb 2023 09:11:13 +0200 (EET) Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 70E2C68BC6C for ; Thu, 2 Feb 2023 09:11:06 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1675321864; bh=qrTt0KgJ7zvhUUIDsOkrebqlUS4tGr6nhZTzjrW3vWU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HynW6aHPeskt+60QItQHrmiL9gE4+Mr8I8xmIH/ZdkCEi7jhCtM8v1PXrX5IVk1dc Y/Q5QJNjBcx/3W543bpkgoD9C+aSd08t7nS74TBdf+w+1HnKIce0oe5+QwQIcPgbyM CK7OzSFFCF3eu5EMJbKRF2vBsBNde4St9roovSu4= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 2C0380C4; Thu, 02 Feb 2023 15:11:00 +0800 X-QQ-mid: xmsmtpt1675321863tsi22qcbe Message-ID: X-QQ-XMAILINFO: NT7rUiK9Nffhwij0HQUUZdHU8Rh++CvZrg9Es/qR06hC0FiOe+hyRYIpOvfade 68fa8wGqa+guG3zcCglYFe36Ev5yhn52d7GIJS8RcF8fsZ8qYl3C1mRSdpfK5N9VGU3pJY/BET4c AmrGJpIJEfJyOT1MoaY0uQfQ3tLTnhSMSfR4RhG5sJCXu2Ft3xHZxRzsXe1ffCwAPaiivb7kRcs4 ry1qGjPwXaW/U7stQnlqU/nrpBdZ1k3TWUNSSziMj8wkOSoiL719Oo5lrw7V3k4gBzTbIExVE4Q9 9Y6Gyq+njZqjCOFebknGgN8GXWB1VuN/4I9niq0XJmc0y5OZcvihrZ8CVtb8xSt6KWOHe/Jf4Crs QTKANzOYQ8oXeAVYrp22q1071xibv7gKmroQVhF7AsTr34mJ0gTQvP7uXyIglfYMT0Ee9hRgVuzS jhg6mR+Bd8EvfiJ82yP2MPQpn0o9wowhpwcCYSMnFcJdcXF0KSkU1HUPq+E4M/fIzDlPcilHWDco FCP/GKgxcqFOAjjrD9D/M4pyrSv642INIL+pZ7BcCXhmigo8JtMGmbBxxmBVtUm+/5iEDf/gzJKc B+Ys2iNqhtwdOcOTcgnTfd0AfwXNnsgH9B/BC1ISrvs+dE6UNFbjV8oXceAbEAfQx80Oj6vG6al6 MOSwYYjKtNQbuSJRq79hHLKfeteKxtXxnTLSHWZgrsH1ywtWV0k90aFTuGKMQOWna+PBLVZST3Nd PsNpUizouDjrVLzVnO+We4OONOZ5JlizPlKHskO2guvmySwTTeaobGhVysJLkPt9Jjo9F2U/MCmk huIl6HXW3td7iA/RMK+scZHNCaZqbtJX6vl2XhyxTT9EsEoaFvMLS7c5j9OqFNldE1mm9Ebmw3tb MsUcMPwDbx0cjaJ3FymKlK//435ahu7bu+d6NkGocG62/OJ3hDWPG79TkmOMHjrSKuSNyCvZpN7N sY9rOHhkipOuMYDGP/ZzYD7fCB9+kSKRo8RtdmTqpMkYXolyDYPA== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Feb 2023 15:02:07 +0800 X-OQ-MSGID: <20230202070208.1962086-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230202070208.1962086-1-quinkblack@foxmail.com> References: <20230128135818.387953-1-leo.izen@gmail.com> <20230202070208.1962086-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH major bump 5/6] avcodec/dynamic_hdr_vivid: reindent after the previous commit 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: Zhao Zhili Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Zhao Zhili --- libavcodec/dynamic_hdr_vivid.c | 38 +++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavcodec/dynamic_hdr_vivid.c b/libavcodec/dynamic_hdr_vivid.c index 4ebcc3f4c1..710f9dd9c6 100644 --- a/libavcodec/dynamic_hdr_vivid.c +++ b/libavcodec/dynamic_hdr_vivid.c @@ -92,28 +92,28 @@ int ff_parse_itu_t_t35_to_dynamic_hdr_vivid(AVDynamicHDRVivid *s, const uint8_t tm_params->base_param_Delta_enable_mode = get_bits(gb, 3); tm_params->base_param_Delta = (AVRational){get_bits(gb, 7), base_param_Delta_den}; } - if (get_bits_left(gb) < 1) + if (get_bits_left(gb) < 1) + return AVERROR_INVALIDDATA; + tm_params->three_Spline_enable_flag = get_bits(gb, 1); + if (tm_params->three_Spline_enable_flag) { + if (get_bits_left(gb) < 1 + tm_params->three_Spline_num * (2 + 12 + 28 + 1)) + return AVERROR_INVALIDDATA; + tm_params->three_Spline_num = get_bits(gb, 1) + 1; + if (tm_params->three_Spline_num > FF_ARRAY_ELEMS(tm_params->three_Spline_TH_mode)) return AVERROR_INVALIDDATA; - tm_params->three_Spline_enable_flag = get_bits(gb, 1); - if (tm_params->three_Spline_enable_flag) { - if (get_bits_left(gb) < 1 + tm_params->three_Spline_num * (2 + 12 + 28 + 1)) - return AVERROR_INVALIDDATA; - tm_params->three_Spline_num = get_bits(gb, 1) + 1; - if (tm_params->three_Spline_num > FF_ARRAY_ELEMS(tm_params->three_Spline_TH_mode)) - return AVERROR_INVALIDDATA; - for (int j = 0; j < tm_params->three_Spline_num; j++) { - tm_params->three_Spline_TH_mode[j] = get_bits(gb, 2); - if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { - if (get_bits_left(gb) < 8) - return AVERROR_INVALIDDATA; - tm_params->three_Spline_TH_enable_MB[j] = (AVRational){get_bits(gb, 8), 255}; - } - tm_params->three_Spline_TH_enable[j] = (AVRational){get_bits(gb, 12), 4095}; - tm_params->three_Spline_TH_Delta1[j] = (AVRational){get_bits(gb, 10), 1023}; - tm_params->three_Spline_TH_Delta2[j] = (AVRational){get_bits(gb, 10), 1023}; - tm_params->three_Spline_enable_Strength[j] = (AVRational){get_bits(gb, 8), 255}; + for (int j = 0; j < tm_params->three_Spline_num; j++) { + tm_params->three_Spline_TH_mode[j] = get_bits(gb, 2); + if (tm_params->three_Spline_TH_mode[j] == 0 || tm_params->three_Spline_TH_mode[j] == 2) { + if (get_bits_left(gb) < 8) + return AVERROR_INVALIDDATA; + tm_params->three_Spline_TH_enable_MB[j] = (AVRational){get_bits(gb, 8), 255}; } + tm_params->three_Spline_TH_enable[j] = (AVRational){get_bits(gb, 12), 4095}; + tm_params->three_Spline_TH_Delta1[j] = (AVRational){get_bits(gb, 10), 1023}; + tm_params->three_Spline_TH_Delta2[j] = (AVRational){get_bits(gb, 10), 1023}; + tm_params->three_Spline_enable_Strength[j] = (AVRational){get_bits(gb, 8), 255}; } + } } } -- 2.25.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".