From patchwork Mon Apr 20 17:57:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wheatley X-Patchwork-Id: 19109 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 0838144A819 for ; Mon, 20 Apr 2020 20:58:41 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF70968B78C; Mon, 20 Apr 2020 20:58:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A58668B491 for ; Mon, 20 Apr 2020 20:58:35 +0300 (EEST) Received: by mail-wm1-f50.google.com with SMTP id x4so557689wmj.1 for ; Mon, 20 Apr 2020 10:58:35 -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=8NdIulyfCKorboPicfyMXSzRpKDon0Ip7+a0CIl3HHw=; b=TyDtGBD1DLXNKy/SWZ3W631TtVfkpCr1kK3cO6Fe5/X2VeAUM4K6f+yTxfSjcVepAi 3XGgTNvDVREeNH536LSx2L36XyI2InsE5+nIuhDdoF6byFDYlgxbpSP1DGwsNd9grGik Mnppl7citrcVigUs+GEbKbX/Yutg0kayHL5rXZoDfxry8rGQZbWHiwt74NrseCA/xl/M VAy8eJWDyqaDrrB0QGpKMKbiLBgPgPBtpMLXtPYEiMbkwEbzuVyx4d5PVrZXKefJSY+1 M8C3iikzK27CuQS18w5EtZsAgqI4QJex4ViMjzFHyVtwnVirpi/JirPmGxeDy5Xx4IAB Q7Cg== 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=8NdIulyfCKorboPicfyMXSzRpKDon0Ip7+a0CIl3HHw=; b=J0HmVagra38/t69Ob7+aa5Imcz5bAzkZ00MCqjiKGQgYYDdrx6LV4CcZQUfhf9BWd3 zRj40Dql4JJf7MGjdGWgEE45Llhv5QpIeCvpGppzTNDzxL92cWDmFxMUNylOaIxAr2EJ G5MVEd5uzbYHPH1lJNa4F2Z9t9YbBB4IImKR9KPabUDmB42JjBH4XfsoGpNg5u7Eh8TP BKcVz2ALc59hbaaWuMeIuun/4k0YFyedWDSrd1O9310ucWAhryvVAl30eQ3SFk0/RQyg UWXoQH6Fz/+MOyJvVMSVf+8Lyyv9rLKHZxK+brOBTvnC1OqNV4BHfHPkggGFjzbjKKW7 R7xA== X-Gm-Message-State: AGi0PuaXdQDV9euq4hgM/SiUUYMmVxNbIQL6WgSSlsalF7TkyVao+3k3 tkn+F3S6FpJ5788U8Su4dU4A+tMq4rE= X-Google-Smtp-Source: APiQypLmcJLMwMBXyo6HOxGgvoBFnXSEL5CFT+xsGXgYYHOrLzhfSjTekUxEohGAs0EJCsDOVsgMKA== X-Received: by 2002:a7b:c38b:: with SMTP id s11mr525468wmj.55.1587405514156; Mon, 20 Apr 2020 10:58:34 -0700 (PDT) Received: from derwent.ldn.framestore.com (ldndefault.framestore.com. [185.101.14.7]) by smtp.gmail.com with ESMTPSA id l5sm287930wrm.66.2020.04.20.10.58.33 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Apr 2020 10:58:33 -0700 (PDT) From: Kevin Wheatley To: ffmpeg-devel@ffmpeg.org Date: Mon, 20 Apr 2020 18:57:37 +0100 Message-Id: <1587405459-29001-2-git-send-email-kevin.j.wheatley@gmail.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1587405459-29001-1-git-send-email-kevin.j.wheatley@gmail.com> References: <1587405459-29001-1-git-send-email-kevin.j.wheatley@gmail.com> Subject: [FFmpeg-devel] [PATCH 1/3] avformat/movenc: Add command line option to set base mov file timescale 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: Kevin Wheatley MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Kevin Wheatley --- libavformat/movenc.c | 1 + libavformat/movenc.h | 1 + 2 files changed, 2 insertions(+) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 253cff8..7d79eca 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -91,6 +91,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}, + { "mov_timescale", "set timescale of mov container", offsetof(MOVMuxContext, mov_timescale), AV_OPT_TYPE_INT, {.i64 = MOV_TIMESCALE}, 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}, { "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}, diff --git a/libavformat/movenc.h b/libavformat/movenc.h index 997b2d6..322968c 100644 --- a/libavformat/movenc.h +++ b/libavformat/movenc.h @@ -205,6 +205,7 @@ typedef struct MOVMuxContext { AVIOContext *mdat_buf; int first_trun; + int mov_timescale; int video_track_timescale; int reserved_moov_size; ///< 0 for disabled, -1 for automatic, size otherwise