From patchwork Wed Mar 11 21:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Martin X-Patchwork-Id: 18127 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 BEF4544BD1C for ; Wed, 11 Mar 2020 23:12:26 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8E5CF68ABAC; Wed, 11 Mar 2020 23:12:26 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D70DF687F4F for ; Wed, 11 Mar 2020 23:12:19 +0200 (EET) Received: by mail-wr1-f46.google.com with SMTP id n15so4527737wrw.13 for ; Wed, 11 Mar 2020 14:12:19 -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:mime-version :content-transfer-encoding; bh=zMKZerBLXkkjFu47ImGzD9q4XB2i899gwgPCb0dFWA8=; b=LETLQ36cWq3MQbCIR23dxq1nKdJ32dDfEmixzhFxL1RDcrt/gLKBEWJMSqsklryOsw dmZ0YJMj6T1mICEthTDUxx09yt16DfoLIbQNcphXo0Gt9Gm+cwSaMmCakcI/Gef1ShI4 seRYogowyLjO2sfcWIaRjWNlRCyf9TwG5wQaLWv8jskN7m9nxxb1+Rn8CWKRYj+60d4U yXcswFC0oYsrHsh5MS3rAXoVODH1pXloNTsJJmubEP/6SUbamKN02hD2z5+z71BSbEIx 3q7o4B3C1jTDU1fQ9WsgxKIL9RS5NJ/WTOeIhDr8En3NWnh9S3OypPErUN4T2mcNXSRM RZoQ== 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:mime-version :content-transfer-encoding; bh=zMKZerBLXkkjFu47ImGzD9q4XB2i899gwgPCb0dFWA8=; b=Nv9uQe/78v2KqNMadF0BMoVFTs//oEeBIp6koBaEL8VyLsj8xsKoAaTW//HyTPoPyw TzHMq79Iz2Ups6kLzO61zj540tY4fbMvSYZ/HapT44DtGkfh08T8AnCKzvCkMeX84r7n KiSjtCwGnq7+a9qNlZypLC6wm5pgLCp+ufnNdxIHZ82SZJvv3UrGCtDlgR2nn0RCtZXC nwXDyYocJ9u0il+ZwRe3Bh7L5I4xvEQi+42VjCGAQaxuZd4pYKC9idgm9dFjlLitJHUQ Ln6RXM5PUMtY6yj+cfflkXyiRiFYHmVCDejNkZUIXwXc9AAvZSy723f69NgYtVvHwyqF POGg== X-Gm-Message-State: ANhLgQ0jX1OyzUiDliKHsYdcS4lxAtcNyWj09t8A06yJ8OrSv6n9iyUy OZAQXPdrLbtwfPhp+p1rmeBqItsp1G0= X-Google-Smtp-Source: ADFU+vuML+1fJCFBTKZym0G7L/VQ/LDjaVJgzsDgVx7MQ2wxLWaGFrM418VYeTte0GtXcCIuZr24ig== X-Received: by 2002:a5d:4a49:: with SMTP id v9mr6422326wrs.343.1583961138727; Wed, 11 Mar 2020 14:12:18 -0700 (PDT) Received: from fon.dmdo-fon (139.red-79-153-143.dynamicip.rima-tde.net. [79.153.143.139]) by smtp.gmail.com with ESMTPSA id a5sm9384253wmb.37.2020.03.11.14.12.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Mar 2020 14:12:17 -0700 (PDT) From: David Martin To: ffmpeg-devel@ffmpeg.org Date: Wed, 11 Mar 2020 22:12:14 +0100 Message-Id: <20200311211214.18192-1-davimdo@gmail.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] lavf/dashenc: add dash SegmentBase manifest generator 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: David Martin Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Support to generate dash SegmentBase manifests, by adding "use_segmentbase" option to dash muxer. SegmentBase manifest is defined in ISO DASH Specification section 5.3.9.2 and has as prerequisite the option "global_sidx" as players will use this box to have a reference to all fragments in the media. --- doc/muxers.texi | 5 +++++ libavformat/dashenc.c | 35 ++++++++++++++++++++++++++--------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index d304181671..fbaa357f2d 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -309,6 +309,11 @@ escaped. @item global_sidx @var{global_sidx} Write global SIDX atom. Applicable only for single file, mp4 output, non-streaming mode. +@item use_segmentbase @var{use_segmentbase} +Generates a dash SegmentBase manifest as defined in section 5.3.9.2 of the ISO +DASH specification. Only applicable when global sidx is enabled since the player +uses it to have a reference of all the segments in the media + @item dash_segment_type @var{dash_segment_type} Possible values: @table @option diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 94d463972a..e8b418e74c 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -193,6 +193,8 @@ typedef struct DASHContext { int profile; int64_t target_latency; int target_latency_refid; + int use_segmentbase; + int64_t sidx_size; } DASHContext; static struct codec_string { @@ -696,16 +698,23 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, AVFormatCont avio_printf(out, "\t\t\t\t\n"); } else if (c->single_file) { avio_printf(out, "\t\t\t\t%s\n", os->initfile); - avio_printf(out, "\t\t\t\t\n", AV_TIME_BASE, FFMIN(os->seg_duration, os->last_duration), start_number); - avio_printf(out, "\t\t\t\t\t\n", os->init_start_pos, os->init_start_pos + os->init_range_length - 1); - for (i = start_index; i < os->nb_segments; i++) { - Segment *seg = os->segments[i]; - avio_printf(out, "\t\t\t\t\tstart_pos, seg->start_pos + seg->range_length - 1); - if (seg->index_length) - avio_printf(out, "indexRange=\"%"PRId64"-%"PRId64"\" ", seg->start_pos, seg->start_pos + seg->index_length - 1); - avio_printf(out, "/>\n"); + int64_t init_segment_size = os->init_start_pos + os->init_range_length; + if (c->use_segmentbase && final) { + avio_printf(out, "\t\t\t\t\n", init_segment_size - c->sidx_size, init_segment_size - 1, AV_TIME_BASE); + avio_printf(out, "\t\t\t\t\t\n", os->init_start_pos, init_segment_size - c->sidx_size - 1); + avio_printf(out, "\t\t\t\t\n"); + } else { + avio_printf(out, "\t\t\t\t\n", AV_TIME_BASE, FFMIN(os->seg_duration, os->last_duration), start_number); + avio_printf(out, "\t\t\t\t\t\n", os->init_start_pos, init_segment_size - 1); + for (i = start_index; i < os->nb_segments; i++) { + Segment *seg = os->segments[i]; + avio_printf(out, "\t\t\t\t\tstart_pos, seg->start_pos + seg->range_length - 1); + if (seg->index_length) + avio_printf(out, "indexRange=\"%"PRId64"-%"PRId64"\" ", seg->start_pos, seg->start_pos + seg->index_length - 1); + avio_printf(out, "/>\n"); + } + avio_printf(out, "\t\t\t\t\n"); } - avio_printf(out, "\t\t\t\t\n"); } else { avio_printf(out, "\t\t\t\t\n", AV_TIME_BASE, FFMIN(os->seg_duration, os->last_duration), start_number); avio_printf(out, "\t\t\t\t\t\n", os->initfile); @@ -1389,6 +1398,12 @@ static int dash_init(AVFormatContext *s) av_log(s, AV_LOG_WARNING, "Global SIDX option will be ignored as streaming is enabled\n"); c->global_sidx = 0; } + + if (c->use_segmentbase && !c->global_sidx) { + av_log(s, AV_LOG_WARNING, "SegmentBase manifest signaling option will be ignored as global SIDX is not enabled\n"); + c->use_segmentbase = 0; + } + if (c->frag_type == FRAG_TYPE_NONE && c->streaming) { av_log(s, AV_LOG_VERBOSE, "Changing frag_type from none to every_frame as streaming is enabled\n"); c->frag_type = FRAG_TYPE_EVERY_FRAME; @@ -1981,6 +1996,7 @@ static int dash_flush(AVFormatContext *s, int final, int stream) if (c->global_sidx) { int j, start_index, start_number; int64_t sidx_size = avio_tell(os->ctx->pb) - file_size; + c->sidx_size = sidx_size; get_start_index_number(os, c, &start_index, &start_number); if (start_index >= os->nb_segments || os->segment_type != SEGMENT_TYPE_MP4) @@ -2350,6 +2366,7 @@ static const AVOption options[] = { { "index_correction", "Enable/Disable segment index correction logic", OFFSET(index_correction), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { "format_options","set list of options for the container format (mp4/webm) used for dash", OFFSET(format_options), AV_OPT_TYPE_DICT, {.str = NULL}, 0, 0, E}, { "global_sidx", "Write global SIDX atom. Applicable only for single file, mp4 output, non-streaming mode", OFFSET(global_sidx), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, + { "use_segmentbase", "Use SegmentBase in Representation", OFFSET(use_segmentbase), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, E }, { "dash_segment_type", "set dash segment files type", OFFSET(segment_type_option), AV_OPT_TYPE_INT, {.i64 = SEGMENT_TYPE_AUTO }, 0, SEGMENT_TYPE_NB - 1, E, "segment_type"}, { "auto", "select segment file format based on codec", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_TYPE_AUTO }, 0, UINT_MAX, E, "segment_type"}, { "mp4", "make segment file in ISOBMFF format", 0, AV_OPT_TYPE_CONST, {.i64 = SEGMENT_TYPE_MP4 }, 0, UINT_MAX, E, "segment_type"},