From patchwork Thu Jun 4 14:12:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 20147 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9BE76448E72 for ; Thu, 4 Jun 2020 17:39:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7669F68B035; Thu, 4 Jun 2020 17:39:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 923B36880DA for ; Thu, 4 Jun 2020 17:39:16 +0300 (EEST) Received: by mail-pf1-f194.google.com with SMTP id x207so3347449pfc.5 for ; Thu, 04 Jun 2020 07:39:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NE+A+9XgjX4uT17mS8PiEoubruI6ONPZueylvI0pzzc=; b=d1nDOf65qlpwa9O26VPzyyVzomNk5VxroF8yUqW8doGHFFVtAWdybpk9gQRFBT01Ln SoSzdB6l62CSj/9i0s1BkK0lEgWKRZORGKhlV/FadeKBvKO1efDvrX5yOxvVpolyH2Gy B1mkZOJPEDTw/TOqqZDwcOmZZe0/7eOImljm2Htu1qQvKLLOa/A1YAMmfsUu9pRV/ZnM Cp+/23kxTbOaeU5YYOeUZln/8/gUYIunhYSiyHX0LP1Mj/+/eTrrEPM2oBc43VtZXnDG RLSP0BVk/JKLQS26YuwXqgM7iuQDtGAGDIVpvxvZYpM4VJncrAZ11LeiYGpFIoMEoNA/ sQcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NE+A+9XgjX4uT17mS8PiEoubruI6ONPZueylvI0pzzc=; b=DP3Z4Y/1ZHQX2tClimDgga2glSmuaJXyzFCVxvDaM9y0FrCe+30V4OfB5TaBW1HenD Es4RhcZoIntm5g6bACmqG5Z7hzAm19HBx7Upi87pMxwjMluMW6sGQi2iS8Nl124+AUHv LEE5IF132oXfbVk/FQkwGE2Sqzs8RKx8oH7fgZmvRhCkTIMKnudYaFnCE753By8NtATR rd/FZDiGxA01+TpAUPr1bvDuv4glw1H054wNLIYVlPi4w6E8Un/bRCkogXEh5xDwbn6o NLX22g6zc8rhckkOoctOTIehqY8Q3+mT3Eg0gv8XQFX2EebnqHHAr4to/H9Vi1HmrKYC Dh8w== X-Gm-Message-State: AOAM533ZdA7aWpi7pm1IFTwDeVK4ZDdwmPo+2oYrfh/Fl7gktmdk079+ Aq6/rGAcz9sK667sbQYS4RtZuMXM X-Google-Smtp-Source: ABdhPJxNVh5cQ9JYi/3TKGSCB9JE5CGKROX2dEU2F/T6zQHfiKhw5Fri1lB4JtmJLa0B+KlSS5toaw== X-Received: by 2002:a62:7bd6:: with SMTP id w205mr4334860pfc.181.1591280008610; Thu, 04 Jun 2020 07:13:28 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id i10sm4812525pfa.166.2020.06.04.07.13.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jun 2020 07:13:27 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Jun 2020 22:12:54 +0800 Message-Id: <1591279975-31536-2-git-send-email-mypopydev@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> References: <1591279975-31536-1-git-send-email-mypopydev@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/3] lavf/hls: Add missed side data/disposition X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: vacingfang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: vacingfang hls demuxer get the strem info form sub-stream, but missed sida data/disposition part, e,g, missed the DOVI sida data when the stream is Dolby Vision streams. Signed-off-by: vacingfang --- libavformat/hls.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/libavformat/hls.c b/libavformat/hls.c index 3e35d15..c9b8fb7 100644 --- a/libavformat/hls.c +++ b/libavformat/hls.c @@ -1740,6 +1740,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;