From patchwork Wed Apr 29 10:03:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 19366 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 6629444B08F for ; Wed, 29 Apr 2020 13:28:58 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 221BD68A471; Wed, 29 Apr 2020 13:28:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B7EE68AEA8 for ; Wed, 29 Apr 2020 13:28:51 +0300 (EEST) Received: by mail-io1-f68.google.com with SMTP id e9so1611146iok.9 for ; Wed, 29 Apr 2020 03:28:51 -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=me00ozbAmgCY0QTANCvBA59M8IfCkpZqMcNNpGbijVs=; b=OJRncX9Xz608C1ylR29zb4muJI9I10Pw/9bEkasSnF+TtA7Inqupkh1jKrYG+Y/QDa SLaa93wnk+TVKOU2FQ+i3fZS9tb+xv/XVBUYM4jHmrnJ8Km9ektl8L23p0pTofqf5OUr Lfz7IDUXkTENBrFxbdEyWWzphIgspJV3pfw0rU8OPLJ2gwnHG89dpQ5qaKyQYC2UEIPs yga7nQE59WGp3KpV2Tso8MnipU83vPMpcv3HxTJuN6CUMe5U5cke0VcZVdrWD7J5Sg9X s8RJ3qNmo1KtnF6npwoWA5DHtnTUy8UzL4MFiXe5Sr97f2IY9yjKkopH389VJiX63ufV 0a/Q== 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=me00ozbAmgCY0QTANCvBA59M8IfCkpZqMcNNpGbijVs=; b=DoqNWGNWxF0B6qLJs765djDZB9qA3oDBSNAT7mWa/rQwBhUByX2ME5fe58QTI9EWjN NvBLXTfzmwRP2+0RqPZ4g2306q4Zq7DEwdAk0IbMMmVzUJdzvLMnVjmXgnLPrtAoiJlj c94PwVniL0qvwrYRjf74eBKYl4SF7lJtTgTKmgUD4mRgAlb7rnjY5mDWigyqDQ7/n0ZP c5vlFCoEbOiFfSCMphinC/+7yPuL3cz/5xFf8Wbq2SuxpTknYD9CpOGZAsMytQdnh/Uu OEfjPHQjH0AE2Rz/vCmeAiullDeeE7yU1aOA3dtF7iEeZ59rCS4nggasgXZetT5OtQPr Mh+A== X-Gm-Message-State: AGi0PuZY5k/kF3k+HxUecnaLDFSAJGZnj1rxYz0NdcTfZCjqxhuNuHJp QgyMTW8K3bb3P7OaUZQLT+ZuqoX9 X-Google-Smtp-Source: APiQypL8mbU6az6yCRrzfFMrG3Dqrm3yCezj1rdOPfa2i2Xqdf2zo628ENuZUrIHVHTr/G1s2N9OcQ== X-Received: by 2002:a63:1103:: with SMTP id g3mr32199318pgl.206.1588154605124; Wed, 29 Apr 2020 03:03:25 -0700 (PDT) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id i128sm747330pfc.149.2020.04.29.03.03.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Apr 2020 03:03:24 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 29 Apr 2020 18:03:20 +0800 Message-Id: <1588154600-11479-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588147332-10189-1-git-send-email-lance.lmwang@gmail.com> References: <1588147332-10189-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2] avformat/srtenc: split write time into function for better readability 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 --- libavformat/srtenc.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/libavformat/srtenc.c b/libavformat/srtenc.c index d811a4da0e..c53b227313 100644 --- a/libavformat/srtenc.c +++ b/libavformat/srtenc.c @@ -34,6 +34,20 @@ typedef struct SRTContext{ unsigned index; } SRTContext; +static void srt_write_time(AVIOContext *pb, int64_t millisec) +{ + int64_t sec = millisec / 1000; + int64_t min = sec / 60; + int64_t hour = min / 60; + + millisec -= 1000 * sec; + sec -= 60 * min; + min -= 60 * hour; + + avio_printf(pb, "%02"PRId64":%02"PRId64":%02"PRId64",%03"PRId64"", + hour, min, sec, millisec); +} + static int srt_write_header(AVFormatContext *avf) { SRTContext *srt = avf->priv_data; @@ -85,12 +99,10 @@ FF_ENABLE_DEPRECATION_WARNINGS return 0; } e = s + d; - avio_printf(avf->pb, "%d\n%02d:%02d:%02d,%03d --> %02d:%02d:%02d,%03d", - srt->index, - (int)(s / 3600000), (int)(s / 60000) % 60, - (int)(s / 1000) % 60, (int)(s % 1000), - (int)(e / 3600000), (int)(e / 60000) % 60, - (int)(e / 1000) % 60, (int)(e % 1000)); + avio_printf(avf->pb, "%d\n", srt->index); + srt_write_time(avf->pb, s); + avio_printf(avf->pb, " --> "); + srt_write_time(avf->pb, e); if (p) avio_printf(avf->pb, " X1:%03d X2:%03d Y1:%03d Y2:%03d", x1, x2, y1, y2);