From patchwork Sun Oct 29 15:10:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_Gro=C3=9Fe?= X-Patchwork-Id: 5746 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp1667821jah; Sun, 29 Oct 2017 08:11:07 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QX5XJXcbHtEFMIr8My98/oHrIY3Mw1gQrItek+0nhV8lbiMysBKvsTDM/FOKP3FYGHtLWy X-Received: by 10.223.167.65 with SMTP id e1mr5711757wrd.280.1509289867659; Sun, 29 Oct 2017 08:11:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509289867; cv=none; d=google.com; s=arc-20160816; b=aumZFASxj9yjB3xeFYVeie4fpHFa5ti1AAkT02g8kk48IIfFYHlb3lOyPzl+pHP/I/ 6xPGIbqnnWlBiVuMpFrIHVGJTPnq9WswbW0MHF6+VtaYaA9w7zI3VALi9R6JRXmIB+R1 3c9gdOg/P0PlciUhAgekjPtehqQ/tM5G0wWehAgKcSEL7Vz94WMWeR+GmKUig7HDyXDx oc/02ySId8C3e5L64bEVKvLqtYc0w4E8uRt/Ob4PgjRVH74jiy+pjyeEHdciqFPRs5j3 /g+MZ1N40WBxP4Ji+10u0NiwRvvPcLTL4vsAASRmh9OV12RpsWS+Dbeo++T5EQ36r+uz 5IIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=xXN6C8VFGI1U0J08xMMTV+pM5fTjLvfLh01RVdNAR2w=; b=jJ/anxACxo7hlmOdWjM622waVVwU09CLF44quYJU/sde3q7OOovCJDO0cUjD/+o9sU khM8ZuBVyZSIYnhmuBaAi5XTqedCMQea0a3ibATRcIrEONG0UCCF/Rm04o0Mu+6y9kDT 9zJIuj3Y06Uw8fF+k742xCc6MaHqWlPELfkitum7kDp/7xNGAXn8pDLBfQO6LwH+6yh3 FIP/cqFNRHFH9D1wWc3o3XzQrX5qa+yno8j0P97nlK4ehemspT4fJ3PuN1SEaPwvpYuG CfPUrP11plmjPvcY7P/YyyBbfBtAzBPxA7UIsX6VKAeFp9O7USu1fnw7xsxQnavV3EjA RM/Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y19si9180534wrc.40.2017.10.29.08.11.07; Sun, 29 Oct 2017 08:11:07 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8F5B9688369; Sun, 29 Oct 2017 17:10:43 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from james.theweblords.de (james.theweblords.de [217.11.55.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3D5226805C1 for ; Sun, 29 Oct 2017 17:10:34 +0200 (EET) Received: (qmail 11370 invoked by uid 210); 29 Oct 2017 15:10:43 -0000 X-Qmail-Scanner-Diagnostics: from x4d07d30c.dyn.telefonica.de (petronios@theweblords.de@x4d07d30c.dyn.telefonica.de) by james (envelope-from , uid 201) with qmail-scanner-2.10st (mhr: 1.0. spamassassin: 3.4.1. perlscan: 2.10st. Clear:RC:1(77.7.211.12):. Processed in 0.0452 secs); 29 Oct 2017 15:10:43 -0000 Received: from x4d07d30c.dyn.telefonica.de (HELO montepegro.fem.tu-ilmenau.de) (petronios@theweblords.de@77.7.211.12) by james.theweblords.de with ESMTPA; 29 Oct 2017 15:10:43 -0000 From: =?UTF-8?q?Peter=20Gro=C3=9Fe?= To: ffmpeg-devel@ffmpeg.org Date: Sun, 29 Oct 2017 16:10:36 +0100 Message-Id: <20171029151036.16579-3-pegro@friiks.de> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171029151036.16579-1-pegro@friiks.de> References: <20171029151036.16579-1-pegro@friiks.de> In-Reply-To: <20171026155840.16816-1-pegro@friiks.de> References: <20171026155840.16816-1-pegro@friiks.de> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/7] dashenc: set DASH related options for the subsequent matroska muxer when using webm 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: =?UTF-8?q?Peter=20Gro=C3=9Fe?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch is inspired by the ffmpeg webm_chunk muxer and fixes that all resulting tracks have the same track number. Signed-off-by: Peter Große --- v2: extended commit message libavformat/dashenc.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index e25a660fbe..0ca7cf5aa3 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -778,6 +778,9 @@ static int dash_init(AVFormatContext *s) } else { av_dict_set_int(&opts, "cluster_time_limit", c->min_seg_duration / 1000, 0); av_dict_set_int(&opts, "cluster_size_limit", 5 * 1024 * 1024, 0); // set a large cluster size limit + av_dict_set_int(&opts, "dash", 1, 0); + av_dict_set_int(&opts, "dash_track_number", i + 1, 0); + av_dict_set_int(&opts, "live", 1, 0); } if ((ret = avformat_write_header(ctx, &opts)) < 0) return ret;