From b7f3a7c439885945af697580a0c08c0573f8885b Mon Sep 17 00:00:00 2001 From: vacingfang Date: Thu, 4 Jun 2020 21:59:43 +0800 Subject: lavf/hls: Add missed side data/disposition hls demuxer get the stream info from sub-stream, but missed side data/disposition part, e,g, missed the DOVI side data when the stream is Dolby Vision streams. Reviewed-by Signed-off-by: vacingfang --- libavformat/hls.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'libavformat/hls.c') diff --git a/libavformat/hls.c b/libavformat/hls.c index 17b3dd545d..3798bdd5d1 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1768,6 +1768,20 @@ static int set_stream_info_from_input_stream(AVStream *st, struct playlist *pls, else avpriv_set_pts_info(st, ist->pts_wrap_bits, ist->time_base.num, ist->time_base.den); + // copy disposition + st->disposition = ist->disposition; + + // copy side data + for (int i = 0; i < ist->nb_side_data; i++) { + const AVPacketSideData *sd_src = &ist->side_data[i]; + uint8_t *dst_data; + + dst_data = av_stream_new_side_data(st, sd_src->type, sd_src->size); + if (!dst_data) + return AVERROR(ENOMEM); + memcpy(dst_data, sd_src->data, sd_src->size); + } + st->internal->need_context_update = 1; return 0; -- cgit v1.2.3