From patchwork Fri Apr 19 00:59:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Li X-Patchwork-Id: 12805 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 B1480447EB3 for ; Fri, 19 Apr 2019 03:59:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E14B68995F; Fri, 19 Apr 2019 03:59:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 912A468830E for ; Fri, 19 Apr 2019 03:59:36 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id y6so1896140pll.13 for ; Thu, 18 Apr 2019 17:59:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=GjnjjQ5N/Tthu/4nS/espbQQMVhSo13ZsermF8ThsYw=; b=Lyqv/pADtfIURWuHJFUH3tARb032F9fnlqGkrIDc8a6mAID+LBYQDeok9PNSYP8Ok1 iBRzTboIX94rkN3eS1B4725HuuSEwgbs3dZt557hZYiuGcCxuOpey92mEjLCPkDtj2bB RWNDDYJD9Wq0214mCURyrlJWM+VHW1CZNmMfmWrSuUaSQ2YcSONkg89lODvMGprGv7Ko JON68mzQ6LtS5bkBC0mOGmE2CEmTc083pQ0+NxR8ppzqKDLS7gsL6AhaHklRmofp9CBP bTBDyhq11orPMKnq6FGKcYGRB8ZOvHMYzhqbI4js3Wq/f8uLB6dZQh3fU2q30Ppy8JoF kRAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=GjnjjQ5N/Tthu/4nS/espbQQMVhSo13ZsermF8ThsYw=; b=LUYTNCY/2k9JgQLru08Q9ONaPttvoECESKpt5JRehDMpr/mlHcXCVFnllc7slSIAnj Von5BMkwkCcKY4KlRsOb0MuR6AI9MH9ol6mUf8AZ0Zbloqy9bAkKMGkPXeH7kBPe+oOZ 1DJ8UYJ9xWGzhj/gUq+mv6snLaguP//em5DDZVNTjOp0pLoxRYBlM/c/oxEffRR0LHoi L3GzCUhcI9IMaf9Wzz27fb5HuI7Itx9jkoILWv2KrTBBJ007w9lzNlToh1HnRo3wwh2l 2H/CbVbeCSUB1wL+zjy7duFHsnSl4252xlQ2nvJeoiifYsR2klE7gf5uOAHzh9YIidz4 ZTdA== X-Gm-Message-State: APjAAAU/ymmu10SMy+MXWCzBQks9CukQsosFMBYsRGFL4YLka4P3H7Ph vwpSyuhjGsN9bmAZBxKY9ed848PA X-Google-Smtp-Source: APXvYqyd0YCeyxpbPHQ4It/KydqPOInNnn4au+FZB7m+enT3QpsW05Ame1CbbJ8Cko9DnJRJAzE42Q== X-Received: by 2002:a17:902:bb84:: with SMTP id m4mr742370pls.302.1555635574444; Thu, 18 Apr 2019 17:59:34 -0700 (PDT) Received: from jun-ubuntu.corp.microsoft.com ([2001:4898:80e8:1:1ba5:d6a8:f90b:7112]) by smtp.googlemail.com with ESMTPSA id p2sm8501526pfi.73.2019.04.18.17.59.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Apr 2019 17:59:33 -0700 (PDT) From: Jun Li To: ffmpeg-devel@ffmpeg.org Date: Thu, 18 Apr 2019 17:59:27 -0700 Message-Id: <20190419005927.10715-1-junli1026@gmail.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH v2] lavf/img2enc: add support for option strftime_start_realtime 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Currently the strftime option generate timestamp based on generation time. The new option would calcualte timestamp from start_time_realtime and pkt->pts, based on output's timescale. --- doc/muxers.texi | 5 +++++ libavformat/img2enc.c | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/doc/muxers.texi b/doc/muxers.texi index 83ae017d6c..ee99ef621e 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -1193,6 +1193,11 @@ overwritten with new images. Default value is 0. @item strftime If set to 1, expand the filename with date and time information from @code{strftime()}. Default value is 0. + +@item strftime_start_realtime +If set to 1, expand the filename with date and time information from +@code{strftime()}, starting from start_time_realtime and calcualted +from pkt->pts in UTC time. Default value is 0. @end table The image muxer supports the .Y.U.V image file format. This format is diff --git a/libavformat/img2enc.c b/libavformat/img2enc.c index bec4bf81dd..0f27e5ceaf 100644 --- a/libavformat/img2enc.c +++ b/libavformat/img2enc.c @@ -26,6 +26,7 @@ #include "libavutil/log.h" #include "libavutil/opt.h" #include "libavutil/pixdesc.h" +#include "libavutil/time.h" #include "libavutil/time_internal.h" #include "avformat.h" #include "avio_internal.h" @@ -45,6 +46,7 @@ typedef struct VideoMuxData { int frame_pts; const char *muxer; int use_rename; + int strftime_start_realtime; } VideoMuxData; static int write_header(AVFormatContext *s) @@ -105,6 +107,37 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt) av_log(s, AV_LOG_ERROR, "Cannot write filename by pts of the frames."); return AVERROR(EINVAL); } + } else if (img->strftime_start_realtime) { + int64_t start_realtime = s->start_time_realtime; + int64_t timestamp = 0; + struct tm *tm; + time_t sec = 0; + + if (start_realtime == 0 || start_realtime == AV_NOPTS_VALUE) { + // the value is not set by either user or encoder, try use creation_time + if (ff_parse_creation_time_metadata(s, &start_realtime, 0) != 0) + av_log(s, AV_LOG_INFO, "Use creation_time as start_realtime.\n"); + + if (start_realtime == 0 || start_realtime == AV_NOPTS_VALUE) { + av_log(s, AV_LOG_WARNING, "Could not get start_time_realtime, set value to now.\n"); + timestamp = av_gettime(); + s->start_time_realtime = timestamp; + } else { + s->start_time_realtime = start_realtime; + } + } + + if (!timestamp) { + int64_t offset = av_rescale_q(pkt->pts, s->streams[0]->time_base, AV_TIME_BASE_Q); + timestamp = s->start_time_realtime + offset; + } + + sec = timestamp / AV_TIME_BASE; + tm = gmtime(&sec); + if (!strftime(filename, sizeof(filename), img->path, tm)) { + av_log(s, AV_LOG_ERROR, "Could not get frame filename with strftime\n"); + return AVERROR(EINVAL); + } } else if (av_get_frame_filename2(filename, sizeof(filename), img->path, img->img_number, AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0 && @@ -215,6 +248,7 @@ static const AVOption muxoptions[] = { { "strftime", "use strftime for filename", OFFSET(use_strftime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "frame_pts", "use current frame pts for filename", OFFSET(frame_pts), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { "atomic_writing", "write files atomically (using temporary files and renames)", OFFSET(use_rename), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, + { "strftime_start_realtime", "use strftime for filename and timestamp calculated from start_time_realtime", OFFSET(strftime_start_realtime), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, ENC }, { NULL }, };