summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsfan5 <sfan5@live.de>2018-01-14 22:33:57 +0800
committerSteven Liu <lq@chinaffmpeg.org>2018-01-14 22:33:57 +0800
commit66e551eafb8d202f37ba5a2bbe03741966a9e241 (patch)
tree271cf37bcb0bde5de801de146368e69dbbad5dbf
parent96f94624e0a1a91134bd8e1e3127080b81716f6f (diff)
dashdec: Expose bandwidth and representation ID as metadata
The primary goal was making it viable to play YouTube/Vimeo/... videos using the native demuxer, since mpv currently uses a workaround in form of Edit Decision Lists (EDL). Implemented features: 1 Exposing id / bitrate as stream metadata (similar to the HLS demuxer) 2 Support for multiple video and audio streams 3 A few minor parts of the specification that are in use at YouTube Signed-off-by: Steven Liu <lq@chinaffmpeg.org>
-rw-r--r--libavformat/dashdec.c18
1 files changed, 16 insertions, 2 deletions
diff --git a/libavformat/dashdec.c b/libavformat/dashdec.c
index 0e3afd2a3b..1a18ab0214 100644
--- a/libavformat/dashdec.c
+++ b/libavformat/dashdec.c
@@ -84,6 +84,8 @@ struct representation {
int stream_index;
enum AVMediaType type;
+ char id[20];
+ int bandwidth;
int n_fragments;
struct fragment **fragments; /* VOD list of fragment for profile */
@@ -801,6 +803,8 @@ static int parse_manifest_representation(AVFormatContext *s, const char *url,
if (rep) {
if (rep->fragment_duration > 0 && !rep->fragment_timescale)
rep->fragment_timescale = 1;
+ rep->bandwidth = rep_bandwidth_val ? atoi(rep_bandwidth_val) : 0;
+ strncpy(rep->id, rep_id_val ? rep_id_val : "", sizeof(rep->id));
if (type == AVMEDIA_TYPE_VIDEO) {
rep->rep_idx = video_rep_idx;
c->cur_video = rep;
@@ -1650,10 +1654,20 @@ static int dash_read_header(AVFormatContext *s)
}
if (c->cur_video) {
- av_program_add_stream_index(s, 0, c->cur_video->stream_index);
+ int stream_index = c->cur_video->stream_index;
+ av_program_add_stream_index(s, 0, stream_index);
+ if (c->cur_video->bandwidth > 0)
+ av_dict_set_int(&s->streams[stream_index]->metadata, "variant_bitrate", c->cur_video->bandwidth, 0);
+ if (c->cur_video->id[0])
+ av_dict_set(&s->streams[stream_index]->metadata, "id", c->cur_video->id, 0);
}
if (c->cur_audio) {
- av_program_add_stream_index(s, 0, c->cur_audio->stream_index);
+ int stream_index = c->cur_audio->stream_index;
+ av_program_add_stream_index(s, 0, stream_index);
+ if (c->cur_audio->bandwidth > 0)
+ av_dict_set_int(&s->streams[stream_index]->metadata, "variant_bitrate", c->cur_audio->bandwidth, 0);
+ if (c->cur_audio->id[0])
+ av_dict_set(&s->streams[stream_index]->metadata, "id", c->cur_audio->id, 0);
}
}