From ca9bc9de690258d4761a19b0df6e9c9113b80115 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Gro=C3=9Fe?= <pegro@friiks.de>
Date: Sun, 29 Jan 2017 15:26:29 +0100
Subject: [PATCH] dashenc: default to one AdaptationSet per stream
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Previously all mapped streams of a media type (video, audio) where assigned
to a single AdaptationSet. Using the DASH live profile it is mandatory, that
the segments of all representations are aligned, which is currently not
enforced. This leads to problems when using video streams with different
key frame intervals. So to play safe, default to one AdaptationSet per stream,
unless overwritten by explicit assignment.
To get the old assignment scheme, use
-adaptation_sets "id=0,streams=v id=1,streams=a"
Signed-off-by: Peter Große <pegro@friiks.de>
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/dashenc.c | 23 ++++++-----------------
1 file changed, 6 insertions(+), 17 deletions(-)
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 12e6f9b5d97..286b24def38 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -524,26 +524,15 @@ static int parse_adaptation_sets(AVFormatContext *s)
enum { new_set, parse_id, parsing_streams } state;
AdaptationSet *as;
int i, n, ret;
- enum AVMediaType types[] = { AVMEDIA_TYPE_VIDEO, AVMEDIA_TYPE_AUDIO, AVMEDIA_TYPE_UNKNOWN };
- // default: one AdaptationSet for each media type
+ // default: one AdaptationSet for each stream
if (!p) {
- for (n = 0; types[n] != AVMEDIA_TYPE_UNKNOWN; n++) {
- int as_idx = 0;
-
- for (i = 0; i < s->nb_streams; i++) {
- if (s->streams[i]->codecpar->codec_type != types[n])
- continue;
-
- if (!as_idx) {
- if ((ret = add_adaptation_set(s, &as, types[n])) < 0)
- return ret;
- as_idx = c->nb_as;
+ for (i = 0; i < s->nb_streams; i++) {
+ if ((ret = add_adaptation_set(s, &as, s->streams[i]->codecpar->codec_type)) < 0)
+ return ret;
+ snprintf(as->id, sizeof(as->id), "%d", i);
- snprintf(as->id, sizeof(as->id), "%d", i);
- }
- c->streams[i].as_idx = as_idx;
- }
+ c->streams[i].as_idx = c->nb_as;
}
goto end;
}
--
GitLab