From patchwork Thu Apr 16 04:26:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 18991 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 6A1C344A808 for ; Thu, 16 Apr 2020 07:28:14 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4444168BBAA; Thu, 16 Apr 2020 07:28:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E2B2B68B5F2 for ; Thu, 16 Apr 2020 07:28:07 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id c16so9668209qtv.1 for ; Wed, 15 Apr 2020 21:28:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=F5bvZH+1r44j+GJZCFi+PXEAKBXXwlrIJaMgzQbiSVk=; b=BvJyGhrucC1HurHSuw8DQH9gMkCqmwdjFajUdRd/HlOPDo3At1ZGiVxkabnw6qiBmy 8KeL+wMDuOJXIu60sJM+y79+XWSKGxz11g6uvP21TFwyWaskk4CBpEyfd7SsvPQid7lJ +yznfoJsjxGKTpLleIET14i7jMvVO7M71DSQuGcjMJZL8fzbhuC+IG7LH6AIlzMgDtyE XAjnZ2iozWKue7XkeYFw/E7kLg0NBoe7eQoaxqxZKRMIb1KcWjnStdoYDJ5gheCxov0G rrgdrKxgUX2WYvPxTtkmslLV2h0+yXAFJaPoQIjfEqpHK0JLnkpJUa76FyRW/DpnQMmH /BKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=F5bvZH+1r44j+GJZCFi+PXEAKBXXwlrIJaMgzQbiSVk=; b=gC3tJf8qkMwuBXoSZTjB93B2dTaECS6/srJ/9tVkMnhvrx04Q2N8cTQCPh1rM+/fyV ixCFmYJkka9cC/Lcf5D28tpE6AcMH1mtb3S6TOLbOlMiYxANH3bxlafzr5va1cuQVNX0 irDQuefj63NoqlRorribuqDz48OeneGZhGWUIyd60+iq7IgZHJ7Zcukgt2+gPRRqt/D0 X+mTNoKA0moZ39Us0FkqtGClTB03siXgOPHSIWXPROuGj1zMowKSiUky+K++5ElBgCWc h2pWA6P9RBEQzswz5OVaM3tZacU+S8fgb4abB5Oyl9g/iAh6K3k1f19uhaDxJARb43zY 4VUA== X-Gm-Message-State: AGi0PuabLuflxR+EGgz1qDioHCsDysJ34jixQtd0JO8MWqsfjoeg6jFS J5b/lqmo8/xsugu/vqa9/eRCDNF1 X-Google-Smtp-Source: APiQypKTBLMcRgdH+b2dd0PBA+ycSpgdV8uRdm3lzCjSF1iW+gpxYU8VcCU1uzRPZBHvbHfwfyM/Lw== X-Received: by 2002:ac8:46d1:: with SMTP id h17mr21425070qto.72.1587011286152; Wed, 15 Apr 2020 21:28:06 -0700 (PDT) Received: from localhost.localdomain ([191.83.216.57]) by smtp.gmail.com with ESMTPSA id u24sm6198966qkk.84.2020.04.15.21.28.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 21:28:05 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Apr 2020 01:26:05 -0300 Message-Id: <20200416042608.9587-1-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] doc/muxers: fix some dashenc option names 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- doc/muxers.texi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index e5b8debcb3..856ed74e56 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -339,20 +339,20 @@ Enable Low-latency Dash by constraining the presence and values of some elements @item master_m3u8_publish_rate @var{master_m3u8_publish_rate} Publish master playlist repeatedly every after specified number of segment intervals. -@item -write_prft @var{write_prft} +@item write_prft @var{write_prft} Write Producer Reference Time elements on supported streams. This also enables writing prft boxes in the underlying muxer. Applicable only when the @var{utc_url} option is enabled. It's set to auto by default, in which case the muxer will attempt to enable it only in modes that require it. -@item -mpd_profile @var{mpd_profile} +@item mpd_profile @var{mpd_profile} Set one or more manifest profiles. -@item -http_opts @var{http_opts} +@item http_opts @var{http_opts} A :-separated list of key=value options to pass to the underlying HTTP protocol. Applicable only for HTTP output. -@item -target_latency @var{target_latency} +@item target_latency @var{target_latency} Set an intended target latency in seconds (fractional value can be set) for serving. Applicable only when @var{streaming} and @var{write_prft} options are enabled. This is an informative fields clients can use to measure the latency of the service. From patchwork Thu Apr 16 04:26:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 18992 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 4B84744A808 for ; Thu, 16 Apr 2020 07:28:15 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3008068BBAE; Thu, 16 Apr 2020 07:28:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f193.google.com (mail-qt1-f193.google.com [209.85.160.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B5DC568B5F2 for ; Thu, 16 Apr 2020 07:28:08 +0300 (EEST) Received: by mail-qt1-f193.google.com with SMTP id f13so15293814qti.5 for ; Wed, 15 Apr 2020 21:28:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=RJxDmcglzAAg6LPzABtfeuZWKE18qJ8BFMhW1WHtvmA=; b=OW0Dq9euQMejikdeDkYRdSesWSUm9IEtVjwKGq6/hAjoaw9lZRvzu33gSQ+oYTrwSE sPIAe3FSpL38HKD64FSzefl/SWrQ8RyBsUC9rVfLQThcGG/wAS5yxg1gHlDUE6PTHnhb AU55F7YnQzxF1PRPUQJolDkZhxPCCTdmFrOZlR/vYXe68hcBQbP5HR42pPYClygAZnXi omNkWA0OtSBe+VkblAaSBpW2g8JYu6voL3eQiXZW8/OD6hcm7rvwqXBhB5iUU0De7ZuT hI2RiY7cM91JYrndzwBOp2MiqYy5yxxJfcO+ktdnU/HpyYJJM13gU11ru0n7rwUngVWr DkMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RJxDmcglzAAg6LPzABtfeuZWKE18qJ8BFMhW1WHtvmA=; b=Kmgf4vpLv/LoQpBTtO9ZQ1u/39+m7Bzc1a8fkKzREvNeOJXChS25RoAjdwATB3ukVu azk/9lro611NRKg8rBETg0aI1uQwIO2D6mpHWdyf+zmlh3uk6O5P+Gwto5mOEFLiYsW9 58oVTJI0swCR94NAoZhourzA12Yu+aRCUsVoN+tYocQ0eby9A5or9lzejVB1qHn7I0+m 54jNuyE8YXovO0NHYBQX4xMz+C2EjW2mN9tq5pGXMrR9xf+5LMPFN3jKFLgB2L8SFhhB F9m+lAGx0IEfDcuQ7l5bLzMFzPlIFWRGu1KxTD6V855ZtpeUfeP2ZBPWzyN+61AM0Ki0 ua8w== X-Gm-Message-State: AGi0PuaJnYdvVeqSfoah1GYObsEbGBf56aG37jVHAofF91HwuUic1LBh P7YAyg/Z4nSe6x60htfqwXYEFk8B X-Google-Smtp-Source: APiQypL1XT23FmYuOsbv+BnAMXZY+mdJMMNlCxAZ1qOqZrZl+/TZ5FUv+TwLhB8eYCW27gt1tx6tzw== X-Received: by 2002:ac8:1a8a:: with SMTP id x10mr24114365qtj.154.1587011287201; Wed, 15 Apr 2020 21:28:07 -0700 (PDT) Received: from localhost.localdomain ([191.83.216.57]) by smtp.gmail.com with ESMTPSA id u24sm6198966qkk.84.2020.04.15.21.28.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 21:28:06 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Apr 2020 01:26:06 -0300 Message-Id: <20200416042608.9587-2-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200416042608.9587-1-jamrial@gmail.com> References: <20200416042608.9587-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avformat/dashenc: add a maxSegmentDuration attribute to the Manifest 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/dashenc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 5a8cff4034..ef1bedd18d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -190,6 +190,7 @@ typedef struct DASHContext { int frag_type; int write_prft; int64_t max_gop_size; + int64_t max_segment_duration; int profile; int64_t target_latency; int target_latency_refid; @@ -1189,6 +1190,9 @@ static int write_manifest(AVFormatContext *s, int final) avio_printf(out, "\"\n"); } } + avio_printf(out, "\tmaxSegmentDuration=\""); + write_time(out, c->max_segment_duration); + avio_printf(out, "\"\n"); avio_printf(out, "\tminBufferTime=\""); write_time(out, c->ldash && c->max_gop_size ? c->max_gop_size : c->last_duration * 2); avio_printf(out, "\">\n"); @@ -1564,6 +1568,8 @@ static int dash_init(AVFormatContext *s) os->frag_duration = as->frag_duration; os->frag_type = as->frag_type; + c->max_segment_duration = FFMAX(c->max_segment_duration, as->seg_duration); + if (c->profile & MPD_PROFILE_DVB && (os->seg_duration > 15000000 || os->seg_duration < 960000)) { av_log(s, AV_LOG_ERROR, "Segment duration %"PRId64" is outside the allowed range for DVB-DASH profile\n", os->seg_duration); return AVERROR(EINVAL); From patchwork Thu Apr 16 04:26:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 18993 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 CF52844A808 for ; Thu, 16 Apr 2020 07:28:18 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5A36068BBB3; Thu, 16 Apr 2020 07:28:18 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E817A68BBAC for ; Thu, 16 Apr 2020 07:28:09 +0300 (EEST) Received: by mail-qk1-f172.google.com with SMTP id v7so20112085qkc.0 for ; Wed, 15 Apr 2020 21:28:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=0gcDMUV6hG64gx6V3hkjGDyJPOi1bMP2A++bGO2OOZA=; b=dVDwk+D/lYkEr6aUsJXuN3XvBjQMQ2wKqLv1qXYbDPPoysV1IQ79jFW4nYBRvcNRo5 03/U0MpVIbyHD4wygqz4akaAxcPyld21Dza0DTKypaiYhSNP6aX3DMFP8L0bQQf9vKlN Qx7U6ilO1d14ONzJBj5XBZH1l/g5IxAhJrTs7J02mvKy/L3iYbF3WjMM5oJmIuPUICXI 67U5WCaAFZY+kJbsz8il/oplFnzPPNXfVqgWGu+kgWiGC9SaZD8cVA/99IHi9u2BUEbn ns/BEKfAEKzmH92E9Un11YjjXv9bojCli10Po+ZsLanhv1TYsOVl9U2SfYQBMDHc4cdR OmkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0gcDMUV6hG64gx6V3hkjGDyJPOi1bMP2A++bGO2OOZA=; b=T2kFEb0Mk11Mlps5eUzT/s+HtT6N2ua+cXcknqMvvGjiJwfw+xsmo1g/7JkN5Kwscf zTbvoDPpPUplg1SNmq/zU77QwyfCJnIwIKZZ2f17FOhDqu/vITJ38N+5kj5ecWYkKQy9 LQigP7zfhrSv9lZU7hQE6aN1IBWAbHh+WrS2AszVpCOM/YEkhZ5/GjTSbClE3ggpH1Db KlyT5y4ETunJIVPNIXcCdEPVL42A6GM4IQU0qUuDrD42SWjHgAc9Wjsa3u896QzY41NN GvqJzrERhbtrp12fJ6kUs6y9B8v35ei7eer8Ztrsxmi9HphrD5WqccUduwLVuGfD5zN9 KQSQ== X-Gm-Message-State: AGi0PuYSYBPfo+oL3g/G0l4wusRl9tVJJGKVsC62ao4a6gQjkFZ/YAxJ BhNYuGi45lFCJfcyQDd1II5vhCi4 X-Google-Smtp-Source: APiQypLnIkNE+wEkoUNRfV/8SaXf4d2OnhDeAZWA9KtWa5aCDwgrAI7aarVB4lLISAodn0BI/WhODA== X-Received: by 2002:a37:a9c7:: with SMTP id s190mr15157083qke.435.1587011288222; Wed, 15 Apr 2020 21:28:08 -0700 (PDT) Received: from localhost.localdomain ([191.83.216.57]) by smtp.gmail.com with ESMTPSA id u24sm6198966qkk.84.2020.04.15.21.28.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 21:28:07 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Apr 2020 01:26:07 -0300 Message-Id: <20200416042608.9587-3-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200416042608.9587-1-jamrial@gmail.com> References: <20200416042608.9587-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] avformat/dashenc: add a PlaybackRate element 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- doc/muxers.texi | 8 ++++++++ libavformat/dashenc.c | 18 ++++++++++++++++-- libavformat/version.h | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 856ed74e56..d341827a86 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -356,6 +356,14 @@ protocol. Applicable only for HTTP output. Set an intended target latency in seconds (fractional value can be set) for serving. Applicable only when @var{streaming} and @var{write_prft} options are enabled. This is an informative fields clients can use to measure the latency of the service. +@item min_playback_rate @var{min_playback_rate} +Set the minimum playback rate indicated as appropriate for the purposes of automatically +adjusting playback latency and buffer occupancy during normal playback by clients. + +@item max_playback_rate @var{max_playback_rate} +Set the maximum playback rate indicated as appropriate for the purposes of automatically +adjusting playback latency and buffer occupancy during normal playback by clients. + @end table @anchor{framecrc} diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index ef1bedd18d..86329b7f9a 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -194,6 +194,8 @@ typedef struct DASHContext { int profile; int64_t target_latency; int target_latency_refid; + AVRational min_playback_rate; + AVRational max_playback_rate; } DASHContext; static struct codec_string { @@ -1203,14 +1205,19 @@ static int write_manifest(AVFormatContext *s, int final) av_free(escaped); } avio_printf(out, "\t\n"); + + avio_printf(out, "\t\n"); if (!final && c->target_latency && c->target_latency_refid >= 0) { - avio_printf(out, "\t\n"); avio_printf(out, "\t\ttarget_latency / 1000); if (s->nb_streams > 1) avio_printf(out, " referenceId=\"%d\"", c->target_latency_refid); avio_printf(out, "/>\n"); - avio_printf(out, "\t\n"); } + if (av_cmp_q(c->min_playback_rate, (AVRational) {1, 1}) || + av_cmp_q(c->max_playback_rate, (AVRational) {1, 1})) + avio_printf(out, "\t\t\n", + av_q2d(c->min_playback_rate), av_q2d(c->max_playback_rate)); + avio_printf(out, "\t\n"); if (c->window_size && s->nb_streams > 0 && c->streams[0].nb_segments > 0 && !c->use_template) { OutputStream *os = &c->streams[0]; @@ -1423,6 +1430,11 @@ static int dash_init(AVFormatContext *s) c->target_latency = 0; } + if (av_cmp_q(c->max_playback_rate, c->min_playback_rate) < 0) { + av_log(s, AV_LOG_WARNING, "Minimum playback rate value is higer than the Maximum. Both will be ignored\n"); + c->min_playback_rate = c->max_playback_rate = (AVRational) {1, 1}; + } + av_strlcpy(c->dirname, s->url, sizeof(c->dirname)); ptr = strrchr(c->dirname, '/'); if (ptr) { @@ -2370,6 +2382,8 @@ static const AVOption options[] = { { "dvb_dash", "DVB-DASH profile", 0, AV_OPT_TYPE_CONST, {.i64 = MPD_PROFILE_DVB }, 0, UINT_MAX, E, "mpd_profile"}, { "http_opts", "HTTP protocol options", OFFSET(http_opts), AV_OPT_TYPE_DICT, { .str = NULL }, 0, 0, E }, { "target_latency", "Set desired target latency for Low-latency dash", OFFSET(target_latency), AV_OPT_TYPE_DURATION, { .i64 = 0 }, 0, INT_MAX, E }, + { "min_playback_rate", "Set desired minimum playback rate", OFFSET(min_playback_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 1.0 }, 0.5, 1.5, E }, + { "max_playback_rate", "Set desired maximum playback rate", OFFSET(max_playback_rate), AV_OPT_TYPE_RATIONAL, { .dbl = 1.0 }, 0.5, 1.5, E }, { NULL }, }; diff --git a/libavformat/version.h b/libavformat/version.h index 18c2f5fec2..719cda6b98 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 58 #define LIBAVFORMAT_VERSION_MINOR 42 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \ From patchwork Thu Apr 16 04:26:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 18994 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 33E1944A808 for ; Thu, 16 Apr 2020 07:28:20 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 17D7D68BBB4; Thu, 16 Apr 2020 07:28:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f195.google.com (mail-qt1-f195.google.com [209.85.160.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9B7F068BBB1 for ; Thu, 16 Apr 2020 07:28:10 +0300 (EEST) Received: by mail-qt1-f195.google.com with SMTP id b10so15381508qtt.9 for ; Wed, 15 Apr 2020 21:28:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=AQr0YNxeQZaodyxwY4Jt+zW/5g+HYKXoGLqpn+GbPy8=; b=duGwtUx+0LeNJybb/lyupMktiu1WM5L2pTAlCFm2I50s7u18Tc1LRs4JO8wnWKPain xqkYLcJHtFFNdF4nvf6GK7BGjzTfAjvf4mpMMvhuIsvSxoJLGLOYlq+oOzSrlQxC0xD1 LMW7WwIv9x9RoSRi4x2oXuK1eaTerRYIEOcNv+I9D72cY/rO3kza5voO++5tz1YG2/DR /eyTzryix3FLcwwGoPXZ58X67teq7NW9fTo4eoDVGoXz6pkaQXWRNaSWjMdq5/5GcCOP k0MqfsT8vbwX+w0m9vB8B6FEX/6VlYmHUl5fze1YGL48y2juzlzVz2lRo6ChuyaOsp2V fyCg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AQr0YNxeQZaodyxwY4Jt+zW/5g+HYKXoGLqpn+GbPy8=; b=oaEKWlCRupjYbFBGL2Knta20ejeKPUIMZlYJ3M58tNV8n8o1srHzZ+H015+59i9goy /dJXTXjbF1WFTyiMVRjz/D+m0EnCoznQJRGheWmFSQYvBmHnGfkm2AFWAPgFtFiVxprN mYtMkzPFavlnHe4S0+Yq35sn2/GiEJ4HIPSaLtFEHu3oNuEfGrzzWMZA8p+fLYVBRCg5 vFruhvjS3j/OgvHREgrFq6kMJmi2qz4doAzKCXDKwJsa1EWtd0CqATVcSa823ILpg78O Y6uTZsIFE3ApploY3QIrdW7sleB6wxOskq1VHLq2r5O6QXdM9IexPdaEo7JsDu1RzgX9 j+pg== X-Gm-Message-State: AGi0PubRXOogFguCfgEf/5hlC/Vp7cBgoJiO/1T6ji8CYiOUnVmQcZu7 YM1TxCY16uSsjBM3IQDpCSuCGvNb X-Google-Smtp-Source: APiQypKyjhUVHgCTbmbIH3KyljfN6zlTBhziSEtltNOHp2corJhQKld3cQTsxYTG1q9yRMals+VExw== X-Received: by 2002:aed:250c:: with SMTP id v12mr23456126qtc.351.1587011289254; Wed, 15 Apr 2020 21:28:09 -0700 (PDT) Received: from localhost.localdomain ([191.83.216.57]) by smtp.gmail.com with ESMTPSA id u24sm6198966qkk.84.2020.04.15.21.28.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2020 21:28:08 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Apr 2020 01:26:08 -0300 Message-Id: <20200416042608.9587-4-jamrial@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200416042608.9587-1-jamrial@gmail.com> References: <20200416042608.9587-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/dashenc: add missing startWithSap attribute to AdaptationSet elements 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/dashenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 86329b7f9a..b08253618d 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -806,7 +806,7 @@ static int write_adaptation_set(AVFormatContext *s, AVIOContext *out, int as_ind AVDictionaryEntry *lang, *role; int i; - avio_printf(out, "\t\tid, as->media_type == AVMEDIA_TYPE_VIDEO ? "video" : "audio"); if (as->media_type == AVMEDIA_TYPE_VIDEO && as->max_frame_rate.num && !as->ambiguous_frame_rate && av_cmp_q(as->min_frame_rate, as->max_frame_rate) < 0) avio_printf(out, " maxFrameRate=\"%d/%d\"", as->max_frame_rate.num, as->max_frame_rate.den);