From patchwork Sat Jun 23 04:47:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gyan X-Patchwork-Id: 9483 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:141:0:0:0:0:0 with SMTP id c62-v6csp1734990jad; Fri, 22 Jun 2018 21:48:05 -0700 (PDT) X-Google-Smtp-Source: AAOMgpck268cKXFGiSWso3roXS7i1yvlFn7qNp9b4AdZt5vlVamyVyEO90ZJp4jY+EU597Aa3LEc X-Received: by 2002:a1c:40d4:: with SMTP id n203-v6mr3410415wma.101.1529729284926; Fri, 22 Jun 2018 21:48:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529729284; cv=none; d=google.com; s=arc-20160816; b=wLxSXrunbadVnqEW1njDzbBNk5GvuLDSFJ60AZj+m9jTuIk+L4/wQ3GTbafnFC3FDQ BxFsiRinvLO6XYt/P0GzZ5ywLNGWpDyWwtuPTele0aazmKYIjvfz7OQ0vIFZZDCDdpYc 3Z5uLW0+EnpkmohVknH7EHIjyoMO1dJJvT/cWn2ZibfT10iMMtSCqkSTt2en6fBcBnyr X9v2nHLwfbLCM856mGVbvPZtP9Hfs/B8luRlevMpPBtPRSIvFn6U3V5Vc3BpzH/v/Il3 BoHU6UN19S7GW8OhfAigvIz0QDpZJQ85x8JRTieyaPKSS/tEI1TT3ZXvT3qZ14GiYTFw E6cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:in-reply-to:mime-version:user-agent:date :message-id:references:to:from:dkim-signature:delivered-to :arc-authentication-results; bh=2KKF9lSqJW7uMi1GoAnalF4pTBANoaZtJwp3xB3fzns=; b=mcxHkJKkA40Uw+7v2iID7FyCLnimh+B8CEbF2JCdst4CUFOrqZDblluQP02fwQ+CTB odxzwBOkE1c1C8/hdi1ecpYMehV2a412uHiaEZKqnki5cGPYnBe/KON58/VocWvu5oi6 pYXi6eI06oUy7T+pgXi+uJOEPKgT+rUwVpu8uibZNPfoPJbtTCtOEImVraaJ++fuGkKa kSsyYsZcMUUUQbPwIRm55lIrBO6V5p5NDBVUNZoZLPH/zahhxqxLMkXmHTlllrhk6bb6 gI3YHqD5Z77hnzg1+vrCu0U1gI2UtuF/j1Tu7OpbjK1T7zDPYZ9uoL+zSnl3PtW39yyS I+6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=XYkHnPXB; 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 e69-v6si615477wmc.68.2018.06.22.21.48.03; Fri, 22 Jun 2018 21:48:04 -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=20161025 header.b=XYkHnPXB; 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 BF58568A173; Sat, 23 Jun 2018 07:47:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5269068A064 for ; Sat, 23 Jun 2018 07:46:59 +0300 (EEST) Received: by mail-pf0-f193.google.com with SMTP id r11-v6so4089706pfl.6 for ; Fri, 22 Jun 2018 21:47:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:references:message-id:date:user-agent:mime-version :in-reply-to:content-language; bh=ROeQcqHw9gH8eVI3AYE0rMKR/hU/nrNTIl8fgygT80c=; b=XYkHnPXBhl0az7MR8yk018QGSS7UY0OkWYag4EX1uVfhFhJoacA6PRJTUdDQor7Ju5 FYyWTZsL1ickPKue2wgixNiGPBAbNQVNwvrdKchJAsuKuPqzLihiBUXtcs1CFC6VoeeC ck1h37jF0gfrFz8t/A4/qSAKMyRabK2j7VssEqwdeMUO0vYv+h1T27UXUuREwesBcbZo MtOFjb3rn+Jlk1jhm6xsakK+D6Zs2dEny5emMf3FP8QoK9tmHYR+UnqXvdiNHE0j/sSL NizqyrtCWKyB6E4SXinM9n5Ttr+G6lB7URDHBVAFr9n3qiZ2jkVFQwc7k+ZscdwM+wpa FwKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language; bh=ROeQcqHw9gH8eVI3AYE0rMKR/hU/nrNTIl8fgygT80c=; b=PLbieAfnnffp09zwr/bjYynPYLCP3qU3YiWlNFWW0l9XJzlwOBQ1L34eN7++isRYWq qh+ZwPx7Y7kmEjyMGgWlT6J02JMstBezUk21+/KbkaCpjuUJCWToe+wZgXo1Utug1V11 pqexYVYU/r8vM+M3QqCJHU6pXBOkTnMg3UGUYusCClyWxkIII97bkmsPYwOv2o1GPz2i OR5Dvu9pjityctvVGLdkLPL/6BTBrSYJfTzNXt3ICPp6v5qnaCUF6C8g2McRnwIT35gR cgIga/ij9UKBI/+keYgvt9U2veibicdMp2RnK10dbzjK0K7rtnZv0ZHzHKyqryAAw4yc bsOw== X-Gm-Message-State: APt69E3/qdEoXFKTiUlF4PCGBpqEVQysNnE4Tj8gjQSgXEDXqUV+6KAX M9c+f/p7IHlj74eldRsaBaUYRuJ0 X-Received: by 2002:a65:61d1:: with SMTP id j17-v6mr3726750pgv.447.1529729271620; Fri, 22 Jun 2018 21:47:51 -0700 (PDT) Received: from [192.168.1.225] ([103.206.133.246]) by smtp.gmail.com with ESMTPSA id 8-v6sm15825017pfk.132.2018.06.22.21.47.49 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 21:47:50 -0700 (PDT) From: Gyan Doshi To: ffmpeg-devel@ffmpeg.org References: <0fce1010-f31e-5d82-8304-dbb0fc326c64@gmail.com> Message-ID: <8918e57c-d14d-fac8-e76e-aa638501f1fd@gmail.com> Date: Sat, 23 Jun 2018 10:17:45 +0530 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <0fce1010-f31e-5d82-8304-dbb0fc326c64@gmail.com> Content-Language: en-US Subject: Re: [FFmpeg-devel] [PATCH] fftools/ffmpeg: check sseof value and clash with ss 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Added another check and corrected an oversight in a log message. From f013a502c438ef9940fc131cad9bf870853adb5f Mon Sep 17 00:00:00 2001 From: Gyan Doshi Date: Fri, 22 Jun 2018 22:02:16 +0530 Subject: [PATCH v2] fftools/ffmpeg: check sseof value and clash with ss Prioritize -ss --- fftools/ffmpeg_opt.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index a2ecddae71..c728c344a7 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -1103,12 +1103,26 @@ static int open_input_file(OptionsContext *o, const char *filename) } } + if (o->start_time != AV_NOPTS_VALUE && o->start_time_eof != AV_NOPTS_VALUE) { + av_log(NULL, AV_LOG_WARNING, "Cannot use -ss and -sseof both, using -ss for %s\n", filename); + o->start_time_eof = AV_NOPTS_VALUE; + } + if (o->start_time_eof != AV_NOPTS_VALUE) { - if (ic->duration>0) { + if (o->start_time_eof >= 0) { + av_log(NULL, "-sseof value must be negative; aborting\n"); + exit_program(1); + } + if (ic->duration > 0) { o->start_time = o->start_time_eof + ic->duration; + if (o->start_time < 0) { + av_log(NULL, AV_LOG_WARNING, "-sseof value seeks to before start of file %s; ignored\n", filename); + o->start_time = AV_NOPTS_VALUE; + } } else av_log(NULL, AV_LOG_WARNING, "Cannot use -sseof, duration of %s not known\n", filename); } + timestamp = (o->start_time == AV_NOPTS_VALUE) ? 0 : o->start_time; /* add the stream start time */ if (!o->seek_timestamp && ic->start_time != AV_NOPTS_VALUE)