From 62c27fdba43def4cdc2fb6f2df60c7ac87918d6c Mon Sep 17 00:00:00 2001 From: Vignesh Venkatasubramanian Date: Tue, 11 Apr 2017 21:33:28 -0700 Subject: webm_dash_manifest: Add option to specify bandwidth Add an option to webm_dash_manifest demuxer to specify a value for "bandwidth" field in the DASH manifest. The value is then used by the muxer. Fixes an existing FIXME in the code. Signed-off-by: Vignesh Venkatasubramanian Signed-off-by: James Zern --- libavformat/matroskadec.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'libavformat/matroskadec.c') diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index 3ec1636..d42113b 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -364,6 +364,9 @@ typedef struct MatroskaDemuxContext { /* WebM DASH Manifest live flag/ */ int is_live; + + /* Bandwidth value for WebM DASH Manifest */ + int bandwidth; } MatroskaDemuxContext; typedef struct MatroskaBlock { @@ -3912,7 +3915,20 @@ static int webm_dash_manifest_read_header(AVFormatContext *s) av_dict_set_int(&s->streams[0]->metadata, TRACK_NUMBER, tracks[0].num, 0); // parse the cues and populate Cue related fields - return matroska->is_live ? 0 : webm_dash_manifest_cues(s); + if (!matroska->is_live) { + ret = webm_dash_manifest_cues(s); + if (ret < 0) { + av_log(s, AV_LOG_ERROR, "Error parsing Cues\n"); + return ret; + } + } + + // use the bandwidth from the command line if it was provided + if (matroska->bandwidth > 0) { + av_dict_set_int(&s->streams[0]->metadata, BANDWIDTH, + matroska->bandwidth, 0); + } + return 0; } static int webm_dash_manifest_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -3923,6 +3939,7 @@ static int webm_dash_manifest_read_packet(AVFormatContext *s, AVPacket *pkt) #define OFFSET(x) offsetof(MatroskaDemuxContext, x) static const AVOption options[] = { { "live", "flag indicating that the input is a live file that only has the headers.", OFFSET(is_live), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM }, + { "bandwidth", "bandwidth of this stream to be specified in the DASH manifest.", OFFSET(bandwidth), AV_OPT_TYPE_INT, {.i64 = 0}, 0, INT_MAX, AV_OPT_FLAG_DECODING_PARAM }, { NULL }, }; -- cgit v1.1