From patchwork Tue May 5 14:45:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 19512 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 610A5448588 for ; Tue, 5 May 2020 17:45:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 47DAF68BF97; Tue, 5 May 2020 17:45:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 094C368BF50 for ; Tue, 5 May 2020 17:45:27 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id h4so2599924wmb.4 for ; Tue, 05 May 2020 07:45:27 -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 :mime-version:content-transfer-encoding; bh=VCXAPicfZjcY0sWvkpdhExsgUlnOP/tv/VwDt8p1Gck=; b=FRJxYM39AsPaFyYsJioneBoyqk6uBTcwArVcrz6OvR0q9Y8s0BtB5vl8dfLyAcvja9 +ywtzhN42FpbH9+tqvtmq1MRAktirp/SpfKgtz0cLetTDbeCI2nq2Uwk81JD3G55//3m b1giJAdt9/B5PCBkku7D61xMow1O/OPTPLi1wp3rxiuP6xDHaNqvLfxl/EcdZJT1KjnV /5fDX6O+cXkO9HAJrSH2UwlOywJsecgtwvAUz0gIwb2ugVqAT9EBBFBm3K8YnqC4FvIw flNfclgTyTQHjRXGvsHGKlN/3LqFMEAYn5ul4SU4Bx72GtZ33gqcF3IW0c4sEdZ77lU8 zolQ== 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:mime-version:content-transfer-encoding; bh=VCXAPicfZjcY0sWvkpdhExsgUlnOP/tv/VwDt8p1Gck=; b=Cd1nlL5l+Ldjm3v4UlrXAnqlewR/ed0/YoAkgUOiMDWCHCsZz3HeLB2xCEonbg97gd jV8sqmQoVh6KYPyn47fWVeAI9ke46powltjfrQxTcBMji9aV/Tow0BLX7a5nthiXJmhQ 9ltEZpciTPHsKQryDZ2xI94Afnd4rTD6L3HtWBp0z5IwLRSrCh+EpBAeFnRMGMbaBfeU 5NzadV0e1Hq4dKtVz2E4dYocMbEkXkUM8ZDVeeeqNu9QpJrBSmSDYD3CL62fhfGy29r5 yekrxs+/RBStsit6xSIWV8PSASNbt9ChSMknqlleobaiO59Wdemv0fIV0QZk/kevmx0a jS+Q== X-Gm-Message-State: AGi0Pua7YPkwsrUTK4EVEvk/63noxCZWeec4U/HCC2gS0vlXufaFumB/ N1Ll624IHv1iS57qGd//aZHFyF6qW4I= X-Google-Smtp-Source: APiQypJzPJ9K6UvMqQWbw2Vh9cXIJjg1swkIfk+5iYZr2qkDA/LEDHpavKxG4t/jN3nxiD9LiMWRHw== X-Received: by 2002:a05:600c:2210:: with SMTP id z16mr3848839wml.151.1588689923195; Tue, 05 May 2020 07:45:23 -0700 (PDT) Received: from mechagodzilla.chapatronic.net (cpc76904-dals22-2-0-cust471.20-2.cable.virginm.net. [81.106.45.216]) by smtp.gmail.com with ESMTPSA id h6sm4289016wmf.31.2020.05.05.07.45.21 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 May 2020 07:45:22 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 May 2020 15:45:15 +0100 Message-Id: <20200505144516.6458-2-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) In-Reply-To: <20200505144516.6458-1-hello.vectronic@gmail.com> References: <20200505144516.6458-1-hello.vectronic@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 1/2] avformat movenc extend video_track_timescale flag range to allow use of video stream timescale for track 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: vectronic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Extend range of video_track_timescale flag value to -1 to indicate video stream timescale should be used for track timebase. Add debug message if video_track_timescale is not specified and the video stream timescale is clamped to greater than 10000. Signed-off-by: vectronic --- libavformat/movenc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 32e8109268..bcc0ab4377 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -92,7 +92,7 @@ static const AVOption options[] = { { "min_frag_duration", "Minimum fragment duration", offsetof(MOVMuxContext, min_fragment_duration), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "frag_size", "Maximum fragment size", offsetof(MOVMuxContext, max_fragment_size), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "ism_lookahead", "Number of lookahead entries for ISM files", offsetof(MOVMuxContext, ism_lookahead), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, - { "video_track_timescale", "set timescale of all video tracks", offsetof(MOVMuxContext, video_track_timescale), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, + { "video_track_timescale", "set timescale of all video tracks, -1 to use existing stream timescale", offsetof(MOVMuxContext, video_track_timescale), AV_OPT_TYPE_INT, {.i64 = 0}, -1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, { "brand", "Override major brand", offsetof(MOVMuxContext, major_brand), AV_OPT_TYPE_STRING, {.str = NULL}, .flags = AV_OPT_FLAG_ENCODING_PARAM }, { "use_editlist", "use edit list", offsetof(MOVMuxContext, use_editlist), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, AV_OPT_FLAG_ENCODING_PARAM}, { "fragment_index", "Fragment number of the next fragment", offsetof(MOVMuxContext, fragments), AV_OPT_TYPE_INT, {.i64 = 1}, 1, INT_MAX, AV_OPT_FLAG_ENCODING_PARAM}, @@ -6454,14 +6454,19 @@ static int mov_init(AVFormatContext *s) } track->height = track->tag >> 24 == 'n' ? 486 : 576; } - if (mov->video_track_timescale) { + if (mov->video_track_timescale > 0) { track->timescale = mov->video_track_timescale; if (mov->mode == MODE_ISM && mov->video_track_timescale != 10000000) av_log(s, AV_LOG_WARNING, "Warning: some tools, like mp4split, assume a timescale of 10000000 for ISMV.\n"); } else { track->timescale = st->time_base.den; + if (mov->video_track_timescale != -1) { while(track->timescale < 10000) track->timescale *= 2; + if (track->timescale != st->time_base.den) + av_log(s, AV_LOG_DEBUG, "Stream timescale was low (%d), the track timescale has been forced to %d.\n" + "Specify -video_track_timescale -1 to prevent this.\n", st->time_base.den, track->timescale); + } } if (st->codecpar->width > 65535 || st->codecpar->height > 65535) { av_log(s, AV_LOG_ERROR, "Resolution %dx%d too large for mov/mp4\n", st->codecpar->width, st->codecpar->height); From patchwork Tue May 5 14:45:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vectronic X-Patchwork-Id: 19511 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 50911448588 for ; Tue, 5 May 2020 17:45:32 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3922268BF91; Tue, 5 May 2020 17:45:32 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4540168BEA9 for ; Tue, 5 May 2020 17:45:25 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id k12so2596769wmj.3 for ; Tue, 05 May 2020 07:45:25 -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 :mime-version:content-transfer-encoding; bh=0AlzN6oL3M7f5HxaddE0iqQf9wLUXU2rEpvaXm8R6tw=; b=lI8fUDtjV/TfGSAmOwvwUndwqZ7pD6j+ZGgbcjeY7iI1fPsTQmBTmEftXJ9JRGmm9Z WEPV5xIDSHHCefHQPWtxe7tnDdorYHo7FTBqHB1GRpB2I2GqSRrjXihGIOO7SlrVLQst bj71uxTxFfHfwWd3ZuPzzKh58wNs+tsjlH/1CnVqCysN/ETXD/elx0bfgmBumGUrTaTJ lEllLZBN8O7oEv/w51rIbJMEJXj7AhIZ+hTRqBPlzMY2BDzosIgXHrn1hPqd4cyEHZ8U 2CMyff7Gfvxu5C7klBWvk5wGRsEXIwATAEdcIo4ELTy/ysdWHia5vPO67S+egVXX419f j2dA== 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:mime-version:content-transfer-encoding; bh=0AlzN6oL3M7f5HxaddE0iqQf9wLUXU2rEpvaXm8R6tw=; b=qKXAJczJBvf1F6/dS7l7hDSHykNzDgKtK7pZZolTUj9uXyxH7MxqxyBsF+XYOGPBlf 4tEu9ryq6Ncy9dwuNp16m5xra0m5cmLWZUO8lwP7N4bD9VfXgYpa4IzEKwTGWq3w7Aoi BHHdihqJfhgIMkvmsb9APMvrJPxURUpwoRYPMy0eMlbG//oSTjDbKN7ixyXwMt14hfMo iLag6q+TL3Om+6oie9oZaPfcbBAowQnQGdpt9pbVWTjgs4xvAdqrpWNplgA40P7RwfFE zM1JRndhxTN3rgSTNKVKd9e6EodFNhaS4YSLDipJK+duo953yDZ31lOFxc649WRIdSDB zijw== X-Gm-Message-State: AGi0PuYXnvL9IqknaQecrmMN6upERVTnrO0NQO9M46vgKSP8oksRbKnP O2iLLd3MpYy9fRmVVYq/YVGgu4GdNu0= X-Google-Smtp-Source: APiQypJY5HRytEh44bQFJTFV7Qzu5XASSn2VZnfzoYXH1Ymd8RxlVkOordqE+pgoJjVi5/gCZ58ELA== X-Received: by 2002:a05:600c:20f:: with SMTP id 15mr3862575wmi.71.1588689924409; Tue, 05 May 2020 07:45:24 -0700 (PDT) Received: from mechagodzilla.chapatronic.net (cpc76904-dals22-2-0-cust471.20-2.cable.virginm.net. [81.106.45.216]) by smtp.gmail.com with ESMTPSA id h6sm4289016wmf.31.2020.05.05.07.45.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 05 May 2020 07:45:23 -0700 (PDT) From: vectronic To: ffmpeg-devel@ffmpeg.org Date: Tue, 5 May 2020 15:45:16 +0100 Message-Id: <20200505144516.6458-3-hello.vectronic@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) In-Reply-To: <20200505144516.6458-1-hello.vectronic@gmail.com> References: <20200505144516.6458-1-hello.vectronic@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 2/2] avformat movenc extend video_track_timescale flag range to allow use of video stream timescale for track 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: vectronic Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" indent Signed-off-by: vectronic --- libavformat/movenc.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index bcc0ab4377..989ba5b857 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -6461,11 +6461,11 @@ static int mov_init(AVFormatContext *s) } else { track->timescale = st->time_base.den; if (mov->video_track_timescale != -1) { - while(track->timescale < 10000) - track->timescale *= 2; - if (track->timescale != st->time_base.den) - av_log(s, AV_LOG_DEBUG, "Stream timescale was low (%d), the track timescale has been forced to %d.\n" - "Specify -video_track_timescale -1 to prevent this.\n", st->time_base.den, track->timescale); + while(track->timescale < 10000) + track->timescale *= 2; + if (track->timescale != st->time_base.den) + av_log(s, AV_LOG_DEBUG, "Stream timescale was low (%d), the track timescale has been forced to %d.\n" + "Specify -video_track_timescale -1 to prevent this.\n", st->time_base.den, track->timescale); } } if (st->codecpar->width > 65535 || st->codecpar->height > 65535) {