From patchwork Wed Oct 11 18:10:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 44228 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4b22:b0:15d:8365:d4b8 with SMTP id fp34csp1081254pzb; Wed, 11 Oct 2023 11:10:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEFgS6F9IfurTaZL5aLhI3eTsBbDZRi+Hesx6UcusmxpXSso3OOQH9XWhPmDkCaOnnVzYAZ X-Received: by 2002:a05:6402:160c:b0:533:288e:a078 with SMTP id f12-20020a056402160c00b00533288ea078mr17527593edv.17.1697047848300; Wed, 11 Oct 2023 11:10:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697047848; cv=none; d=google.com; s=arc-20160816; b=vLDg9fghPIxHTyf/tgAD7efufScBEpRMBugB4MDcfRwCync4qDlIyn3zb5SXUkGx3i f5mgxHXFaPUF2HHBv4F/yw0bjWZ1Xt7bmpPb9U0VkNqs2i/HTQpCA6CZEoR1MIQUXJPy 17kJshrm6MoSZHdWxdX6ceDanNWDwpwr0OPA8/4ar5EoNu3pmby179zBHbgVmXAx3ycQ IWOQyY6/4xFfKjoSIupK7vZ4e5E2JkVA7Y1/LvcQtphLMOJMcrbEQo1rzC+n5aGNzH7e /EHcUvJ7LalmIx7cHsJAaO3uVlHAdZlcPcu5xSuDc2KDERjYUfITYc9QiG0ewtdWNK91 OITA== 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: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:delivered-to; bh=LZrLvPG6THdBxy0h5hIkeGlYlvDzxcDDcF/mDLg1ukk=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=RNJGHgouAXGYi/gTVrKXeuU3ifw+40TupZv0+PJb5u7I5iQ8iIh0bQkLPg+f2g+K7H G/5fLvJ3pi+E7SU0SBJjVmu2ffj1ZikFTKt/VRH0WZA1fLYW5rC/xy0EgtuPyykcBGDQ gdVd+j/FQtJljtcah4YkQsCH3pcvY88g1clmDwqEbeLpD0/jhbr4uW1LxoFSljIwEVJi qLKawkb5iw1Vj/IZlUQjvxuPmRRJx/NWVNFYWOcRzKp59XvUZrLBzqGtUdehWNzys6D5 W35kNuOgbiqa6jBoXZcHxYnrMpCIeeNpDR+XqVf1/kaPTXo7eeok6zh49cOWbeH88ZEK GlNg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id c26-20020a056402101a00b0053778302c33si7003910edu.647.2023.10.11.11.10.40; Wed, 11 Oct 2023 11:10:48 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 763E768C99B; Wed, 11 Oct 2023 21:10:26 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net [217.70.183.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A37E468C8E3 for ; Wed, 11 Oct 2023 21:10:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id E3D86E0005 for ; Wed, 11 Oct 2023 18:10:17 +0000 (UTC) From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Wed, 11 Oct 2023 20:10:14 +0200 Message-Id: <20231011181015.6433-2-michael@niedermayer.cc> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20231011181015.6433-1-michael@niedermayer.cc> References: <20231011181015.6433-1-michael@niedermayer.cc> X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 2/3] avformat/jacosubdec: clarify code 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Izmeh8o164a1 add comments, rename variables and indent things differently Is it clearer now ? Signed-off-by: Michael Niedermayer --- libavformat/jacosubdec.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index c6e5b4aa6d..60fe72d5d7 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -127,28 +127,28 @@ shift_and_ret: static int get_shift(unsigned timeres, const char *buf) { int sign = 1; - int a = 0, b = 0, c = 0, d = 0; + int h = 0, m = 0, s = 0, d = 0; int64_t ret; #define SSEP "%*1[.:]" - int n = sscanf(buf, "%d"SSEP"%d"SSEP"%d"SSEP"%d", &a, &b, &c, &d); + int n = sscanf(buf, "%d"SSEP"%d"SSEP"%d"SSEP"%d", &h, &m, &s, &d); #undef SSEP - if (a == INT_MIN) + if (h == INT_MIN) return 0; - if (*buf == '-' || a < 0) { + if (*buf == '-' || h < 0) { sign = -1; - a = FFABS(a); + h = FFABS(h); } ret = 0; switch (n) { - case 1: a = 0; - case 2: c = b; b = a; a = 0; - case 3: d = c; c = b; b = a; a = 0; + case 1: h = 0; //clear all in case of a single parameter + case 2: s = m; m = h; h = 0; //shift into second subsecondd + case 3: d = s; s = m; m = h; h = 0; //shift into minute second subsecond } - ret = (int64_t)a*3600 + (int64_t)b*60 + c; + ret = (int64_t)h*3600 + (int64_t)m*60 + s; if (FFABS(ret) > (INT64_MAX - FFABS(d)) / timeres) return 0; ret = sign * (ret * timeres + d);