Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVignesh Venkatasubramanian <vigneshv-at-google.com@ffmpeg.org>2017-04-12 07:33:28 +0300
committerJames Zern <jzern@google.com>2017-04-17 20:46:51 +0300
commit62c27fdba43def4cdc2fb6f2df60c7ac87918d6c (patch)
tree698d9805372a91a25b575493c2b21637da14c81b /libavformat/matroskadec.c
parente22d495538c1de6a13cf8f51e7448d3312365747 (diff)
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 <vigneshv@google.com> Signed-off-by: James Zern <jzern@google.com>
Diffstat (limited to 'libavformat/matroskadec.c')
-rw-r--r--libavformat/matroskadec.c19
1 files changed, 18 insertions, 1 deletions
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 3ec1636584..d42113be94 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 },
};