From patchwork Sat Nov 4 07:02:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vi0oss@gmail.com X-Patchwork-Id: 5860 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1341141jah; Sat, 4 Nov 2017 14:25:37 -0700 (PDT) X-Google-Smtp-Source: ABhQp+SguFNYUO3J2zjcvpQX4/Y9zXCH3WD4m9PDQcE9mciHciQ6bazqvf8pGczso/1UC6rcM1VY X-Received: by 10.28.166.199 with SMTP id p190mr1931450wme.63.1509830737343; Sat, 04 Nov 2017 14:25:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509830737; cv=none; d=google.com; s=arc-20160816; b=fM4+4ZzbTRQ3vFSXF6ORMOg9y4OWiLNRIM/4Has9Wc3vu53JSZTmPKsl71XPhwB/4Z NyQ8UkwkTgYVIT1YXcSNCWKLpMhudXDJjITWL2OXysNFGNgnDB6nJlzKs+fZNnHqplKl lPJHnizsA3YleyEkCdWt5UOi7yyGYfCOey7Ii9fvSgybiZp24gsNx+FomDG/t/VtAnFH /NIGPAcmSzR28y9nRzoz8ayhcQx2OZ9X7ImGa2i/RYV7ek/L4T/QPS9AnA5g44ofxOB3 RaM8iZpfxvHMpcK1qx03mdRp5xHoH/vo/aK0efX3bSXlLZzkXN+WIRyCCf2fAOY+SMKO Sqqg== 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:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=iBlI70nTEGSgZTaOh2kD12M5IkejkTDIgemFT0g928s=; b=Ri4Tc6xtV50XY/1BtSBNCPrVeAB9C5j5bOAsghsns6mZaeAv5eSj5e7tYqGyl7l6dn wyrlbTTZlvO3na+Yo/s5pE6OkciK2Y4GSgM2oflf8cQPh/6XtxSKR/AJ0GKkimC7Pmsb Y4FW2MT7svYMXW6PHJMDOUY2uhlQcmLa53qnAjfCBRwBcSO78+4bmDLxtxdHEqPNnq9v sF7S9vX39LgBLtfghCsH5JF5Nys8Mvds+FmNQqzsr/PJN6xpAlmXNOhJEdePQQxURj0/ 0McRSb93o79y6oZMwrYSFIoIXXiN8HZOLA2cj3aari5MhT0dpM2yWyfl6cdupBSSefsT 2XpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VsjtJaHG; 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=NONE 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 g22si4347124wmi.67.2017.11.04.14.25.36; Sat, 04 Nov 2017 14:25:37 -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=VsjtJaHG; 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=NONE 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 9AB3C689B7A; Sat, 4 Nov 2017 23:25:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f196.google.com (mail-qk0-f196.google.com [209.85.220.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0FD58689D6B for ; Sat, 4 Nov 2017 09:08:10 +0200 (EET) Received: by mail-qk0-f196.google.com with SMTP id y23so5684633qkb.10 for ; Sat, 04 Nov 2017 00:08:21 -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; bh=gTbaeTwoRvREqOqDF/rNJUIrfAZCO/PISBab5cLSBG4=; b=VsjtJaHGRLBlbw70CZIoNmweoUItnXHOmK4UZDNEhPBgUwvkcqkV5OGzChRJJnGL3e fUeoh4gubzj5AZaKZiXyeEU+0v2faj7wCFV9nEp9bDPVZnpTyeIox6Fvs9KMohXkRaKL 4TVPgMk0TVL0k+UU+CPIAsL8OqawtVCUsVfIpaD8iy9gcxxNhwKPSNhtFVlWa41grMsM +IOma3lp0ZCJF+I4JbUuUZRW7qLEZrVxc0z2HrcpHRLTtMxvswhV3NyIELc4k2T4zV2J IGgD8PW0VdE/QD0Rfpzcnl6lVLzeZ/YcEeiNXRwk4ZE50lnu+AbqH5xiRIVSe7wLwp4J BC6w== 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; bh=gTbaeTwoRvREqOqDF/rNJUIrfAZCO/PISBab5cLSBG4=; b=LghrvMeVZMoyIUOSR1kTalmOxNm0N+26G5CJZ4Jl2e9uw+LAXS/BpU/VTwqFVtxZD+ 0nPsOk7Gi3M6q0TdssV3uo1LsxicbCjF/BgWVeFyUrtrERq4rCFOAGIz4HDurG9u80N6 a7vgfqcpvFDDFFSNVDexMs9EY6DKAclQc11WQunh/0+6bUz/hk7mU0qrazACMrOjjWfY ie3PPYICJIvqKq48xabUjan/1tAVfLDn19vclVNF3PtmjbAJtXu+BYUeRkeDcJKoRh/L 3b/bsTl1lN8s9dnib1CHOihVpccr2FCO3fLkQXGQFE/Fh85U3H6KHHWwqlcgd3B0OH7H iu+A== X-Gm-Message-State: AMCzsaXyKdpm4SN10jWqWnOIq7JT8KCfWW1kOA3wrPbtGxJ4315Tot7j kOMiWcnJj/hSq/xKFyjaKWfN6Q== X-Received: by 10.55.118.7 with SMTP id r7mr13478595qkc.241.1509778963779; Sat, 04 Nov 2017 00:02:43 -0700 (PDT) Received: from localhost.localdomain ([2001:470:7bd6:1000::2]) by smtp.gmail.com with ESMTPSA id y192sm5177325qky.62.2017.11.04.00.02.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 04 Nov 2017 00:02:43 -0700 (PDT) From: vi0oss@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 4 Nov 2017 10:02:04 +0300 Message-Id: <20171104070205.24898-1-vi0oss@gmail.com> X-Mailer: git-send-email 2.11.0 X-Mailman-Approved-At: Sat, 04 Nov 2017 23:25:22 +0200 Subject: [FFmpeg-devel] [PATCH 1/2] Allow -to on input files as well 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: vi0oss@gmail.com MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Vitaly _Vi Shukela Why only output files can have both -t and -to? Signed-off-by: Vitaly "_Vi" Shukela --- fftools/ffmpeg_opt.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index ca6f10d5ca..e453cb34c5 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -972,6 +972,21 @@ static int open_input_file(OptionsContext *o, const char *filename) char * data_codec_name = NULL; int scan_all_pmts_set = 0; + if (o->stop_time != INT64_MAX && o->recording_time != INT64_MAX) { + o->stop_time = INT64_MAX; + av_log(NULL, AV_LOG_WARNING, "-t and -to cannot be used together; using -t.\n"); + } + + if (o->stop_time != INT64_MAX && o->recording_time == INT64_MAX) { + int64_t start_time = o->start_time == AV_NOPTS_VALUE ? 0 : o->start_time; + if (o->stop_time <= start_time) { + av_log(NULL, AV_LOG_ERROR, "-to value smaller than -ss; aborting.\n"); + exit_program(1); + } else { + o->recording_time = o->stop_time - start_time; + } + } + if (o->format) { if (!(file_iformat = av_find_input_format(o->format))) { av_log(NULL, AV_LOG_FATAL, "Unknown input format: '%s'\n", o->format); @@ -3403,7 +3418,7 @@ const OptionDef options[] = { OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(recording_time) }, "record or transcode \"duration\" seconds of audio/video", "duration" }, - { "to", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(stop_time) }, + { "to", HAS_ARG | OPT_TIME | OPT_OFFSET | OPT_INPUT | OPT_OUTPUT, { .off = OFFSET(stop_time) }, "record or transcode stop time", "time_stop" }, { "fs", HAS_ARG | OPT_INT64 | OPT_OFFSET | OPT_OUTPUT, { .off = OFFSET(limit_filesize) }, "set the limit file size in bytes", "limit_size" },